summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-01-13 19:34:54 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-01-13 19:34:54 +0000
commita4e4bcfb78fcf2617e1c8de19fb8f76197c93d48 (patch)
treed9bfb758a1b72a15e4253d907dcb2c0490623f40 /spikyatlinux.html
parent2021-01-13T19:00:01Z (diff)
downloadrepos-a4e4bcfb78fcf2617e1c8de19fb8f76197c93d48.tar.gz
repos-a4e4bcfb78fcf2617e1c8de19fb8f76197c93d48.tar.bz2
repos-a4e4bcfb78fcf2617e1c8de19fb8f76197c93d48.zip
2021-01-13T19:30:01Z
Diffstat (limited to 'spikyatlinux.html')
-rw-r--r--spikyatlinux.html224
1 files changed, 21 insertions, 203 deletions
diff --git a/spikyatlinux.html b/spikyatlinux.html
index dcd194c3dc1f..1410408eefd2 100644
--- a/spikyatlinux.html
+++ b/spikyatlinux.html
@@ -34,229 +34,47 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync spikyatlinux
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing spikyatlinux
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://github.com/spikyatlinux/ebuilds_for_gentoo
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced spikyatlinux
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> d7e0cf0..5d0ead9 master -&gt; origin/master
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating d7e0cf0..5d0ead9
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> app-benchmarks/s-tui/ChangeLog | 2 +-
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-benchmarks/s-tui/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> app-office/hibiscus/ChangeLog | 5 +-
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> app-office/hibiscus/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> app-portage/logclean/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> app-portage/logclean/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> app-portage/portconf/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> app-portage/portconf/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> app-portage/remerge/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> app-portage/remerge/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> app-portage/showbuild/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> app-text/ascii-design/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> app-text/ascii-design/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> dev-java/jameica/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> dev-java/jameica/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> dev-util/apktool-bin/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> dev-util/apktool-bin/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> dev-util/bluegriffon/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> dev-util/bluegriffon/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> dev-util/platform-tools/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> dev-util/platform-tools/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> kde-misc/ksmoothdock/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> kde-misc/ksmoothdock/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> kde-misc/latte-dock/Manifest | 1 +
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> kde-misc/latte-dock/latte-dock-9999.ebuild | 58 ++++++++++++++++++++++
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> media-gfx/photocollage/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> media-gfx/photocollage/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> media-gfx/posterazor/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> media-gfx/posterazor/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> media-video/mystiq/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> media-video/mystiq/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> metadata/md5-cache/app-benchmarks/s-tui-1.0.2 | 2 +-
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> metadata/md5-cache/app-benchmarks/s-tui-9999 | 2 +-
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> metadata/md5-cache/app-office/hibiscus-2.10.0 | 11 ++++
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> metadata/md5-cache/app-office/hibiscus-2.8.24 | 11 ----
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> metadata/md5-cache/app-portage/logclean-18.4.1 | 2 +-
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> metadata/md5-cache/app-portage/portconf-1.6.9 | 2 +-
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> metadata/md5-cache/app-portage/remerge-0.0.4 | 2 +-
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> metadata/md5-cache/app-text/ascii-design-1.1.1 | 12 -----
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> metadata/md5-cache/app-text/ascii-design-1.1.1-r1 | 13 +++++
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> .../dev-java/{jameica-2.8.6 =&gt; jameica-2.10.0} | 6 +--
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> metadata/md5-cache/dev-util/apktool-bin-2.4.1 | 2 +-
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> metadata/md5-cache/dev-util/bluegriffon-3.1 | 2 +-
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> metadata/md5-cache/dev-util/platform-tools-30.0.4 | 2 +-
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> metadata/md5-cache/dev-util/platform-tools-9999 | 2 +-
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> metadata/md5-cache/kde-misc/ksmoothdock-6.2 | 4 +-
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> metadata/md5-cache/media-gfx/photocollage-1.4.4 | 2 +-
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> metadata/md5-cache/media-gfx/posterazor-1.5.1 | 2 +-
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> metadata/md5-cache/media-video/mystiq-20200323 | 2 +-
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> .../sys-kernel/asus-wmi-sensors-0_pre20190611 | 8 +--
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> .../md5-cache/sys-kernel/asus-wmi-sensors-9999 | 8 +--
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> metadata/md5-cache/sys-kernel/zenpower-0.1.12 | 8 +--
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> metadata/md5-cache/www-client/badwolf-1.0.3 | 2 +-
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> metadata/md5-cache/x11-themes/arcbreeze-9999 | 4 +-
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> .../x11-themes/nx-plasma-look-and-feel-1.6.52 | 4 +-
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> .../x11-themes/nx-plasma-look-and-feel-9999 | 4 +-
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> metadata/md5-cache/x11-themes/qtstyleplugins-5.0.0 | 2 +-
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> metadata/md5-cache/x11-themes/qtstyleplugins-9999 | 2 +-
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> metadata/md5-cache/x11-themes/sierrabreeze-9999 | 4 +-
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> metadata/pkg_desc_index | 1 +
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> net-print/epson-inkjet-printer-escpr/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> net-print/epson-inkjet-printer-escpr/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> sys-kernel/asus-wmi-sensors/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> sys-kernel/asus-wmi-sensors/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> sys-kernel/zenpower/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> sys-kernel/zenpower/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> www-apps/rutorrent/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> www-apps/rutorrent/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> www-client/badwolf/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> www-client/badwolf/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> x11-themes/arcbreeze/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> x11-themes/arcbreeze/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> x11-themes/nx-plasma-look-and-feel/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> x11-themes/nx-plasma-look-and-feel/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> x11-themes/qtstyleplugins/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> x11-themes/qtstyleplugins/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> x11-themes/sierrabreeze/ChangeLog | 2 +-
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> x11-themes/sierrabreeze/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> 78 files changed, 174 insertions(+), 110 deletions(-)
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> create mode 100644 kde-misc/latte-dock/Manifest
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> create mode 100644 kde-misc/latte-dock/latte-dock-9999.ebuild
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> create mode 100644 metadata/md5-cache/app-office/hibiscus-2.10.0
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> delete mode 100644 metadata/md5-cache/app-office/hibiscus-2.8.24
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> delete mode 100644 metadata/md5-cache/app-text/ascii-design-1.1.1
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> create mode 100644 metadata/md5-cache/app-text/ascii-design-1.1.1-r1
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> rename metadata/md5-cache/dev-java/{jameica-2.8.6 =&gt; jameica-2.10.0} (60%)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>*** syncing spikyatlinux
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>*** synced spikyatlinux
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>