31 files changed, 329 insertions, 181 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index b6f23de6fe08..275f5da208c3 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -56,19 +56,19 @@
 </pre></td></tr>
             <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 2.55M
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 2.52M
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 18.66K
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 18.65K
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 3.06M
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 18.66K bytes  received 3.06M bytes  1.23M bytes/sec
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 18.65K bytes  received 3.06M bytes  2.05M bytes/sec
 </pre></td></tr>
             <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 77.38M  speedup is 25.17
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 4bfc290e8601..ead48b13d69d 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -21,13 +21,13 @@ Total file size: 77.38M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.55M
+File list size: 2.52M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 18.66K
+Total bytes sent: 18.65K
 Total bytes received: 3.06M
 
-sent 18.66K bytes  received 3.06M bytes  1.23M bytes/sec
+sent 18.65K bytes  received 3.06M bytes  2.05M bytes/sec
 total size is 77.38M  speedup is 25.17
 *** synced R_Overlay
  * Sync succeeded
diff --git a/fidonet.html b/fidonet.html
index 9553eb5465be..bdeef3a9ef76 100644
--- a/fidonet.html
+++ b/fidonet.html
@@ -70,7 +70,7 @@
 </pre></td></tr>
             <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>sent 85 bytes  received 133 bytes  87.20 bytes/sec
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>sent 85 bytes  received 133 bytes  62.29 bytes/sec
 </pre></td></tr>
             <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/fidonet.txt b/fidonet.txt
index 19947da25198..21c07b771c01 100644
--- a/fidonet.txt
+++ b/fidonet.txt
@@ -28,7 +28,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 133
 
-sent 85 bytes  received 133 bytes  87.20 bytes/sec
+sent 85 bytes  received 133 bytes  62.29 bytes/sec
 total size is 32  speedup is 0.15
 *** synced fidonet
  * Sync succeeded
diff --git a/gentoo.html b/gentoo.html
index cb28266dfa08..741e1a1c03e7 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -44,39 +44,215 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You are not currently on a branch.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>   8e92e65d78e..04a5ce23ec9  master     -&gt; origin/master
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Please specify which branch you want to merge with.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 8e92e65d78e..04a5ce23ec9
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>See git-pull(1) for details.
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> dev-util/roctracer/Manifest                        |  2 +
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>    git pull &lt;remote&gt; &lt;branch&gt;
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> dev-util/roctracer/roctracer-4.2.0.ebuild          | 61 ++++++++++++++++++++++
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> sys-devel/bmake/Manifest                           |  2 +-
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>!!! failed syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> ...bmake-20210803.ebuild =&gt; bmake-20210808.ebuild} |  0
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Sync failed with 1
+</pre></td><td>[FATAL]</td></tr>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Will try to re-create
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> 4 files changed, 64 insertions(+), 1 deletion(-)
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> create mode 100644 dev-util/roctracer/roctracer-4.2.0.ebuild
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> rename sys-devel/bmake/{bmake-20210803.ebuild =&gt; bmake-20210808.ebuild} (100%)
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoo&#x27;...
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced gentoo
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating files:  19% (16517/86275)
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating files:  20% (17255/86275)
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating files:  21% (18118/86275)
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating files:  22% (18981/86275)
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Updating files:  23% (19844/86275)
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Updating files:  24% (20706/86275)
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Updating files:  25% (21569/86275)
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Updating files:  26% (22432/86275)
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Updating files:  27% (23295/86275)
+</pre></td></tr>
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Updating files:  28% (24157/86275)
+</pre></td></tr>
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Updating files:  29% (25020/86275)
+</pre></td></tr>
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Updating files:  30% (25883/86275)
+</pre></td></tr>
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Updating files:  31% (26746/86275)
+</pre></td></tr>
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Updating files:  32% (27608/86275)
+</pre></td></tr>
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating files:  33% (28471/86275)
+</pre></td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files:  34% (29334/86275)
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files:  35% (30197/86275)
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files:  36% (31059/86275)
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files:  37% (31922/86275)
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files:  38% (32785/86275)
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files:  39% (33648/86275)
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files:  40% (34510/86275)
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files:  40% (35353/86275)
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files:  41% (35373/86275)
+</pre></td></tr>
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files:  42% (36236/86275)
+</pre></td></tr>
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files:  43% (37099/86275)
+</pre></td></tr>
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Updating files:  44% (37961/86275)
+</pre></td></tr>
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Updating files:  45% (38824/86275)
+</pre></td></tr>
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Updating files:  46% (39687/86275)
+</pre></td></tr>
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Updating files:  47% (40550/86275)
+</pre></td></tr>
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Updating files:  48% (41412/86275)
+</pre></td></tr>
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Updating files:  49% (42275/86275)
+</pre></td></tr>
+            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Updating files:  50% (43138/86275)
+</pre></td></tr>
+            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Updating files:  51% (44001/86275)
+</pre></td></tr>
+            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Updating files:  52% (44863/86275)
+</pre></td></tr>
+            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Updating files:  53% (45726/86275)
+</pre></td></tr>
+            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Updating files:  54% (46589/86275)
+</pre></td></tr>
+            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Updating files:  55% (47452/86275)
+</pre></td></tr>
+            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Updating files:  56% (48314/86275)
+</pre></td></tr>
+            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Updating files:  57% (49177/86275)
+</pre></td></tr>
+            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Updating files:  58% (50040/86275)
+</pre></td></tr>
+            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Updating files:  59% (50903/86275)
+</pre></td></tr>
+            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Updating files:  60% (51765/86275)
+</pre></td></tr>
+            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Updating files:  60% (52168/86275)
+</pre></td></tr>
+            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Updating files:  61% (52628/86275)
+</pre></td></tr>
+            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Updating files:  62% (53491/86275)
+</pre></td></tr>
+            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files:  63% (54354/86275)
+</pre></td></tr>
+            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files:  64% (55216/86275)
+</pre></td></tr>
+            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files:  65% (56079/86275)
+</pre></td></tr>
+            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files:  66% (56942/86275)
+</pre></td></tr>
+            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files:  67% (57805/86275)
+</pre></td></tr>
+            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files:  68% (58667/86275)
+</pre></td></tr>
+            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files:  69% (59530/86275)
+</pre></td></tr>
+            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files:  70% (60393/86275)
+</pre></td></tr>
+            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files:  71% (61256/86275)
+</pre></td></tr>
+            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files:  72% (62118/86275)
+</pre></td></tr>
+            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files:  73% (62981/86275)
+</pre></td></tr>
+            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files:  74% (63844/86275)
+</pre></td></tr>
+            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files:  75% (64707/86275)
+</pre></td></tr>
+            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files:  76% (65569/86275)
+</pre></td></tr>
+            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files:  77% (66432/86275)
+</pre></td></tr>
+            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files:  78% (67295/86275)
+</pre></td></tr>
+            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files:  79% (68158/86275)
+</pre></td></tr>
+            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files:  80% (69020/86275)
+</pre></td></tr>
+            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files:  80% (69861/86275)
+</pre></td></tr>
+            <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files:  81% (69883/86275)
+</pre></td></tr>
+            <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files:  82% (70746/86275)
+</pre></td></tr>
+            <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files:  83% (71609/86275)
+</pre></td></tr>
+            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files:  84% (72471/86275)
+</pre></td></tr>
+            <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files:  85% (73334/86275)
+</pre></td></tr>
+            <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files:  86% (74197/86275)
+</pre></td></tr>
+            <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files:  87% (75060/86275)
+</pre></td></tr>
+            <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files:  88% (75922/86275)
+</pre></td></tr>
+            <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files:  89% (76785/86275)
+</pre></td></tr>
+            <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files:  90% (77648/86275)
+</pre></td></tr>
+            <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files:  91% (78511/86275)
+</pre></td></tr>
+            <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Updating files:  92% (79373/86275)
+</pre></td></tr>
+            <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Updating files:  93% (80236/86275)
+</pre></td></tr>
+            <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Updating files:  94% (81099/86275)
+</pre></td></tr>
+            <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>Updating files:  94% (81399/86275)
+</pre></td></tr>
+            <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>Updating files:  95% (81962/86275)
+</pre></td></tr>
+            <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Updating files:  96% (82824/86275)
+</pre></td></tr>
+            <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Updating files:  97% (83687/86275)
+</pre></td></tr>
+            <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Updating files:  98% (84550/86275)
+</pre></td></tr>
+            <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Updating files:  99% (85413/86275)
+</pre></td></tr>
+            <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Updating files: 100% (86275/86275)
+</pre></td></tr>
+            <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>Updating files: 100% (86275/86275), done.
+</pre></td></tr>
+            <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre>*** synced gentoo
+</pre></td></tr>
+            <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> * Sync succeeded after re-adding
+</pre></td></tr>
+            <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+            <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+            <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo
+</pre></td></tr>
+            <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo.txt b/gentoo.txt
index c8778d8521f6..104af4a0083d 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,19 +15,21 @@ pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
 *** syncing gentoo
-From https://anongit.gentoo.org/git/repo/gentoo
-   8e92e65d78e..04a5ce23ec9  master     -> origin/master
-Updating 8e92e65d78e..04a5ce23ec9
-Fast-forward
- dev-util/roctracer/Manifest                        |  2 +
- dev-util/roctracer/roctracer-4.2.0.ebuild          | 61 ++++++++++++++++++++++
- sys-devel/bmake/Manifest                           |  2 +-
- ...bmake-20210803.ebuild => bmake-20210808.ebuild} |  0
- 4 files changed, 64 insertions(+), 1 deletion(-)
- create mode 100644 dev-util/roctracer/roctracer-4.2.0.ebuild
- rename sys-devel/bmake/{bmake-20210803.ebuild => bmake-20210808.ebuild} (100%)
+You are not currently on a branch.
+Please specify which branch you want to merge with.
+See git-pull(1) for details.
+
+    git pull <remote> <branch>
+
+!!! failed syncing gentoo
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
+*** syncing gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files:  19% (16517/86275)
+Updating files:  20% (17255/86275)
+Updating files:  21% (18118/86275)
+Updating files:  22% (18981/86275)
+Updating files:  23% (19844/86275)
+Updating files:  24% (20706/86275)
+Updating files:  25% (21569/86275)
+Updating files:  26% (22432/86275)
+Updating files:  27% (23295/86275)
+Updating files:  28% (24157/86275)
+Updating files:  29% (25020/86275)
+Updating files:  30% (25883/86275)
+Updating files:  31% (26746/86275)
+Updating files:  32% (27608/86275)
+Updating files:  33% (28471/86275)
+Updating files:  34% (29334/86275)
+Updating files:  35% (30197/86275)
+Updating files:  36% (31059/86275)
+Updating files:  37% (31922/86275)
+Updating files:  38% (32785/86275)
+Updating files:  39% (33648/86275)
+Updating files:  40% (34510/86275)
+Updating files:  40% (35353/86275)
+Updating files:  41% (35373/86275)
+Updating files:  42% (36236/86275)
+Updating files:  43% (37099/86275)
+Updating files:  44% (37961/86275)
+Updating files:  45% (38824/86275)
+Updating files:  46% (39687/86275)
+Updating files:  47% (40550/86275)
+Updating files:  48% (41412/86275)
+Updating files:  49% (42275/86275)
+Updating files:  50% (43138/86275)
+Updating files:  51% (44001/86275)
+Updating files:  52% (44863/86275)
+Updating files:  53% (45726/86275)
+Updating files:  54% (46589/86275)
+Updating files:  55% (47452/86275)
+Updating files:  56% (48314/86275)
+Updating files:  57% (49177/86275)
+Updating files:  58% (50040/86275)
+Updating files:  59% (50903/86275)
+Updating files:  60% (51765/86275)
+Updating files:  60% (52168/86275)
+Updating files:  61% (52628/86275)
+Updating files:  62% (53491/86275)
+Updating files:  63% (54354/86275)
+Updating files:  64% (55216/86275)
+Updating files:  65% (56079/86275)
+Updating files:  66% (56942/86275)
+Updating files:  67% (57805/86275)
+Updating files:  68% (58667/86275)
+Updating files:  69% (59530/86275)
+Updating files:  70% (60393/86275)
+Updating files:  71% (61256/86275)
+Updating files:  72% (62118/86275)
+Updating files:  73% (62981/86275)
+Updating files:  74% (63844/86275)
+Updating files:  75% (64707/86275)
+Updating files:  76% (65569/86275)
+Updating files:  77% (66432/86275)
+Updating files:  78% (67295/86275)
+Updating files:  79% (68158/86275)
+Updating files:  80% (69020/86275)
+Updating files:  80% (69861/86275)
+Updating files:  81% (69883/86275)
+Updating files:  82% (70746/86275)
+Updating files:  83% (71609/86275)
+Updating files:  84% (72471/86275)
+Updating files:  85% (73334/86275)
+Updating files:  86% (74197/86275)
+Updating files:  87% (75060/86275)
+Updating files:  88% (75922/86275)
+Updating files:  89% (76785/86275)
+Updating files:  90% (77648/86275)
+Updating files:  91% (78511/86275)
+Updating files:  92% (79373/86275)
+Updating files:  93% (80236/86275)
+Updating files:  94% (81099/86275)
+Updating files:  94% (81399/86275)
+Updating files:  95% (81962/86275)
+Updating files:  96% (82824/86275)
+Updating files:  97% (83687/86275)
+Updating files:  98% (84550/86275)
+Updating files:  99% (85413/86275)
+Updating files: 100% (86275/86275)
+Updating files: 100% (86275/86275), done.
 *** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo
diff --git a/index.html b/index.html
index 8327cdc92310..30042f216093 100644
--- a/index.html
+++ b/index.html
@@ -797,7 +797,7 @@
 
         </table>
 
-        <address>Generated based on results from 2021-08-13 08:21:42 UTC</address>
+        <address>Generated based on results from 2021-08-13 08:44:06 UTC</address>
     </body>
 </html>
         
 \ No newline at end of file
diff --git a/jmbsvicetto.html b/jmbsvicetto.html
index 230d615c7b54..7d4bd19d3218 100644
--- a/jmbsvicetto.html
+++ b/jmbsvicetto.html
@@ -46,23 +46,21 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing jmbsvicetto
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced jmbsvicetto
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt
index 8f93766809ed..f1046356f18d 100644
--- a/jmbsvicetto.txt
+++ b/jmbsvicetto.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jmbsvicetto
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jmbsvicetto
 Already up to date.
 *** synced jmbsvicetto
diff --git a/johnmh.html b/johnmh.html
index 948aaaa7e033..b615d1dc2f2e 100644
--- a/johnmh.html
+++ b/johnmh.html
@@ -44,25 +44,23 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync johnmh
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing johnmh
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing johnmh
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced johnmh
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced johnmh
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 johnmh
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 johnmh
-</pre></td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * games-strategy/freeorion-0.4.6: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * games-strategy/freeorion-0.4.6: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/johnmh.txt b/johnmh.txt
index a093fa780b2b..7be8676a68a3 100644
--- a/johnmh.txt
+++ b/johnmh.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync johnmh
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing johnmh
 Already up to date.
 *** synced johnmh
diff --git a/johu.html b/johu.html
index af9483939459..6b4456bcb74e 100644
--- a/johu.html
+++ b/johu.html
@@ -44,25 +44,23 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync johu
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing johu
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing johu
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced johu
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced johu
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 johu
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 johu
-</pre></td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-admin/calamares-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-admin/calamares-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/johu.txt b/johu.txt
index 50e3385c548a..ad8633923e2e 100644
--- a/johu.txt
+++ b/johu.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync johu
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing johu
 Already up to date.
 *** synced johu
diff --git a/jorgicio.html b/jorgicio.html
index 68274b7e3479..3407f6e15575 100644
--- a/jorgicio.html
+++ b/jorgicio.html
@@ -46,63 +46,61 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jorgicio
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing jorgicio
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing jorgicio
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced jorgicio
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced jorgicio
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 jorgicio
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 jorgicio
-</pre></td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-python/HTML-0.04: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-python/HTML-0.04: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * dev-python/pushbullet-commons-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-python/pushbullet-commons-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-python/pyNFFT-1.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * dev-python/pyNFFT-1.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * dev-python/pyNFFT-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-python/pyNFFT-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * media-gfx/noteshrink-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * media-gfx/noteshrink-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-gfx/noteshrink-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * media-gfx/noteshrink-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-gfx/noteshrink-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-gfx/noteshrink-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-tv/xawtv-3.107: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-tv/xawtv-3.107: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-video/minitube-2.9: failed sourcing ebuild: inherit requires unknown eclass: l10n.eclass
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-video/minitube-2.9: failed sourcing ebuild: inherit requires unknown eclass: l10n.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-video/minitube-9999: failed sourcing ebuild: inherit requires unknown eclass: l10n.eclass
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-video/minitube-9999: failed sourcing ebuild: inherit requires unknown eclass: l10n.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-misc/mininet-2.2.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-misc/mininet-2.2.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-misc/mininet-2.3.0_pre6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-misc/mininet-2.3.0_pre6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-misc/mininet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-misc/mininet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-wireless/kickthemout-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-wireless/kickthemout-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-wireless/kickthemout-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-wireless/kickthemout-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * sci-astronomy/eht-imaging-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * sci-astronomy/eht-imaging-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * sci-astronomy/eht-imaging-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * sci-astronomy/eht-imaging-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * x11-misc/glipper-2.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * x11-misc/glipper-2.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * x11-misc/nightshift-0.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * x11-misc/nightshift-0.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * x11-misc/nightshift-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * x11-misc/nightshift-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 159:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/jorgicio.txt b/jorgicio.txt
index 37b7d6d93555..27490ad0bb13 100644
--- a/jorgicio.txt
+++ b/jorgicio.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jorgicio
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jorgicio
 Already up to date.
 *** synced jorgicio
diff --git a/jsteward.html b/jsteward.html
index a5d59254f02f..c535a865c1df 100644
--- a/jsteward.html
+++ b/jsteward.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jsteward
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing jsteward
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jsteward
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced jsteward
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced jsteward
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 jsteward
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 jsteward
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/jsteward.txt b/jsteward.txt
index c91d71fa570e..16c0483d21ab 100644
--- a/jsteward.txt
+++ b/jsteward.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jsteward
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jsteward
 Already up to date.
 *** synced jsteward
diff --git a/junkdrawer.html b/junkdrawer.html
index 44f87784ea06..4213c3881652 100644
--- a/junkdrawer.html
+++ b/junkdrawer.html
@@ -38,29 +38,27 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync junkdrawer
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing junkdrawer
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing junkdrawer
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced junkdrawer
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced junkdrawer
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 junkdrawer
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 junkdrawer
-</pre></td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * sci-libs/dlib-19.7: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cuda, (cuda.eclass, line   6:  called die)
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * sci-libs/dlib-19.7: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cuda, (cuda.eclass, line   6:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * sci-libs/dlib-19.10-r1: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cuda, (cuda.eclass, line   6:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * sci-libs/dlib-19.10-r1: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cuda, (cuda.eclass, line   6:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * sci-libs/dlib-19.11: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cuda, (cuda.eclass, line   6:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * sci-libs/dlib-19.11: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cuda, (cuda.eclass, line   6:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/junkdrawer.txt b/junkdrawer.txt
index ef8a0c789ae8..22aff3706e6e 100644
--- a/junkdrawer.txt
+++ b/junkdrawer.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync junkdrawer
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing junkdrawer
 Already up to date.
 *** synced junkdrawer
diff --git a/kaa.html b/kaa.html
index 344c7e35434b..af9320e7a371 100644
--- a/kaa.html
+++ b/kaa.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync kaa
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing kaa
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing kaa
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced kaa
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced kaa
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 kaa
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 kaa
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/kaa.txt b/kaa.txt
index 19a392c1cf00..e1d4a467e0d2 100644
--- a/kaa.txt
+++ b/kaa.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync kaa
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing kaa
 Already up to date.
 *** synced kaa
diff --git a/kde.html b/kde.html
index 8d6cda30c7b4..6f96e9e0fdf6 100644
--- a/kde.html
+++ b/kde.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync kde
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing kde
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing kde
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced kde
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced kde
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 kde
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 kde
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/kde.txt b/kde.txt
index 52f2d701eabb..48865f2fb5ca 100644
--- a/kde.txt
+++ b/kde.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync kde
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing kde
 Already up to date.
 *** synced kde
diff --git a/keepbot-overlay.html b/keepbot-overlay.html
index 4c46052303ea..2879a3eb0800 100644
--- a/keepbot-overlay.html
+++ b/keepbot-overlay.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing keepbot-overlay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced keepbot-overlay
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 keepbot-overlay
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/keepbot-overlay.txt b/keepbot-overlay.txt
index b5d15a830b16..d04c9c648744 100644
--- a/keepbot-overlay.txt
+++ b/keepbot-overlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync keepbot-overlay
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing keepbot-overlay
 Already up to date.
 *** synced keepbot-overlay
diff --git a/khoverlay.html b/khoverlay.html
index 3d50761de33e..616adce73abe 100644
--- a/khoverlay.html
+++ b/khoverlay.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync khoverlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing khoverlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing khoverlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced khoverlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced khoverlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 khoverlay
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 khoverlay
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/khoverlay.txt b/khoverlay.txt
index 697d384f4b17..e346255a36bb 100644
--- a/khoverlay.txt
+++ b/khoverlay.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.1
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync khoverlay
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing khoverlay
 Already up to date.
 *** synced khoverlay
diff --git a/poly-c.html b/poly-c.html
index 321fabb3080b..735244908f43 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -118,7 +118,7 @@
 </pre></td></tr>
             <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 85 bytes  received 132 bytes  86.80 bytes/sec
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 85 bytes  received 132 bytes  62.00 bytes/sec
 </pre></td></tr>
             <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/poly-c.txt b/poly-c.txt
index c52e2a25023d..1faf1f5305d8 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -52,7 +52,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 132
 
-sent 85 bytes  received 132 bytes  86.80 bytes/sec
+sent 85 bytes  received 132 bytes  62.00 bytes/sec
 total size is 32  speedup is 0.15
 *** synced poly-c
  * Sync succeeded
diff --git a/zugaina.html b/zugaina.html
index e3a2da23dc53..8702ab9c6b27 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -54,19 +54,19 @@
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list size: 36.64K
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list size: 36.63K
 </pre></td></tr>
             <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes sent: 453
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes sent: 457
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes received: 38.31K
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 453 bytes  received 38.31K bytes  15.50K bytes/sec
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 457 bytes  received 38.31K bytes  15.51K bytes/sec
 </pre></td></tr>
             <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>total size is 1.71M  speedup is 44.21
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 9d4242d67468..ef5c7e5d87a7 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -20,13 +20,13 @@ Total file size: 1.71M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 36.64K
+File list size: 36.63K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 453
+Total bytes sent: 457
 Total bytes received: 38.31K
 
-sent 453 bytes  received 38.31K bytes  15.50K bytes/sec
+sent 457 bytes  received 38.31K bytes  15.51K bytes/sec
 total size is 1.71M  speedup is 44.21
 *** synced zugaina
  * Sync succeeded