25 files changed, 350 insertions, 127 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index 855c5a950603..b5fdb66f5996 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.60M
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 2.74M
 </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: 20.07K
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 20.00K
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 3.22M
 </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 20.07K bytes  received 3.22M bytes  1.30M bytes/sec
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 20.00K bytes  received 3.22M bytes  1.30M bytes/sec
 </pre></td></tr>
             <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 80.08M  speedup is 24.68
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index b59649d131e8..9fa7128cc6ae 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -21,13 +21,13 @@ Total file size: 80.08M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.60M
+File list size: 2.74M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 20.07K
+Total bytes sent: 20.00K
 Total bytes received: 3.22M
 
-sent 20.07K bytes  received 3.22M bytes  1.30M bytes/sec
+sent 20.00K bytes  received 3.22M bytes  1.30M bytes/sec
 total size is 80.08M  speedup is 24.68
 *** synced R_Overlay
  * Sync succeeded
diff --git a/fidonet.html b/fidonet.html
index 2295050d2116..6937e9d27841 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 134 bytes  87.60 bytes/sec
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>sent 85 bytes  received 134 bytes  62.57 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 8fc131b5d3c4..872c5c30adfa 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: 134
 
-sent 85 bytes  received 134 bytes  87.60 bytes/sec
+sent 85 bytes  received 134 bytes  62.57 bytes/sec
 total size is 32  speedup is 0.15
 *** synced fidonet
  * Sync succeeded
diff --git a/gentoo.html b/gentoo.html
index 2b4551a31629..6aab24258198 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -44,37 +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>   eac48bd29fd..b314e503a26  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 eac48bd29fd..b314e503a26
+            <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/gitlab-runner/metadata.xml                |  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> .../vulkan-layers/vulkan-layers-1.3.204.ebuild     |  1 -
+            <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> media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  1 -
+            <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> .../files/twelf-1.7.1-doc-guide-Makefile.patch     |  8 ++------
+            <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> ...f-1.7.1-emacs-fix-old-style-backquotes-p3.patch | 23 ++++++++++++++++++----
+            <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> 5 files changed, 22 insertions(+), 13 deletions(-)
+            <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>*** synced gentoo
+            <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> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating files:  19% (16656/87538)
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating files:  20% (17508/87538)
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating files:  21% (18383/87538)
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</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="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating files:  22% (19259/87538)
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Updating files:  23% (20134/87538)
+</pre></td></tr>
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Updating files:  24% (21010/87538)
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Updating files:  25% (21885/87538)
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Updating files:  26% (22760/87538)
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Updating files:  27% (23636/87538)
+</pre></td></tr>
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Updating files:  28% (24511/87538)
+</pre></td></tr>
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Updating files:  29% (25387/87538)
+</pre></td></tr>
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Updating files:  30% (26262/87538)
+</pre></td></tr>
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Updating files:  31% (27137/87538)
+</pre></td></tr>
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Updating files:  32% (28013/87538)
+</pre></td></tr>
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating files:  33% (28888/87538)
+</pre></td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files:  34% (29763/87538)
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files:  35% (30639/87538)
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files:  36% (31514/87538)
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files:  37% (32390/87538)
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files:  38% (33265/87538)
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files:  39% (34140/87538)
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files:  39% (34910/87538)
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files:  40% (35016/87538)
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files:  41% (35891/87538)
+</pre></td></tr>
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files:  42% (36766/87538)
+</pre></td></tr>
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files:  43% (37642/87538)
+</pre></td></tr>
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Updating files:  44% (38517/87538)
+</pre></td></tr>
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Updating files:  45% (39393/87538)
+</pre></td></tr>
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Updating files:  46% (40268/87538)
+</pre></td></tr>
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Updating files:  47% (41143/87538)
+</pre></td></tr>
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Updating files:  48% (42019/87538)
+</pre></td></tr>
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Updating files:  49% (42894/87538)
+</pre></td></tr>
+            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Updating files:  50% (43769/87538)
+</pre></td></tr>
+            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Updating files:  51% (44645/87538)
+</pre></td></tr>
+            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Updating files:  52% (45520/87538)
+</pre></td></tr>
+            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Updating files:  53% (46396/87538)
+</pre></td></tr>
+            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Updating files:  54% (47271/87538)
+</pre></td></tr>
+            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Updating files:  55% (48146/87538)
+</pre></td></tr>
+            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Updating files:  56% (49022/87538)
+</pre></td></tr>
+            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Updating files:  57% (49897/87538)
+</pre></td></tr>
+            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Updating files:  58% (50773/87538)
+</pre></td></tr>
+            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Updating files:  59% (51648/87538)
+</pre></td></tr>
+            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Updating files:  59% (51876/87538)
+</pre></td></tr>
+            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Updating files:  60% (52523/87538)
+</pre></td></tr>
+            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Updating files:  61% (53399/87538)
+</pre></td></tr>
+            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Updating files:  62% (54274/87538)
+</pre></td></tr>
+            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files:  63% (55149/87538)
+</pre></td></tr>
+            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files:  64% (56025/87538)
+</pre></td></tr>
+            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files:  65% (56900/87538)
+</pre></td></tr>
+            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files:  66% (57776/87538)
+</pre></td></tr>
+            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files:  67% (58651/87538)
+</pre></td></tr>
+            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files:  68% (59526/87538)
+</pre></td></tr>
+            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files:  69% (60402/87538)
+</pre></td></tr>
+            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files:  70% (61277/87538)
+</pre></td></tr>
+            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files:  71% (62152/87538)
+</pre></td></tr>
+            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files:  72% (63028/87538)
+</pre></td></tr>
+            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files:  73% (63903/87538)
+</pre></td></tr>
+            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files:  74% (64779/87538)
+</pre></td></tr>
+            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files:  75% (65654/87538)
+</pre></td></tr>
+            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files:  76% (66529/87538)
+</pre></td></tr>
+            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files:  77% (67405/87538)
+</pre></td></tr>
+            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files:  78% (68280/87538)
+</pre></td></tr>
+            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files:  78% (68919/87538)
+</pre></td></tr>
+            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files:  79% (69156/87538)
+</pre></td></tr>
+            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files:  80% (70031/87538)
+</pre></td></tr>
+            <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files:  81% (70906/87538)
+</pre></td></tr>
+            <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files:  82% (71782/87538)
+</pre></td></tr>
+            <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files:  83% (72657/87538)
+</pre></td></tr>
+            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files:  84% (73532/87538)
+</pre></td></tr>
+            <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files:  85% (74408/87538)
+</pre></td></tr>
+            <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files:  86% (75283/87538)
+</pre></td></tr>
+            <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files:  87% (76159/87538)
+</pre></td></tr>
+            <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files:  88% (77034/87538)
+</pre></td></tr>
+            <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files:  89% (77909/87538)
+</pre></td></tr>
+            <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files:  90% (78785/87538)
+</pre></td></tr>
+            <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files:  91% (79660/87538)
+</pre></td></tr>
+            <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Updating files:  92% (80535/87538)
+</pre></td></tr>
+            <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Updating files:  93% (81411/87538)
+</pre></td></tr>
+            <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Updating files:  93% (81953/87538)
+</pre></td></tr>
+            <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>Updating files:  94% (82286/87538)
+</pre></td></tr>
+            <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>Updating files:  95% (83162/87538)
+</pre></td></tr>
+            <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Updating files:  96% (84037/87538)
+</pre></td></tr>
+            <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Updating files:  97% (84912/87538)
+</pre></td></tr>
+            <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Updating files:  98% (85788/87538)
+</pre></td></tr>
+            <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Updating files:  99% (86663/87538)
+</pre></td></tr>
+            <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Updating files: 100% (87538/87538)
+</pre></td></tr>
+            <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>Updating files: 100% (87538/87538), 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 b0223edef832..da4839a387ee 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,18 +15,21 @@ pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
 *** syncing gentoo
-From https://anongit.gentoo.org/git/repo/gentoo
-   eac48bd29fd..b314e503a26  master     -> origin/master
-Updating eac48bd29fd..b314e503a26
-Fast-forward
- dev-util/gitlab-runner/metadata.xml                |  2 +-
- .../vulkan-layers/vulkan-layers-1.3.204.ebuild     |  1 -
- media-libs/vulkan-layers/vulkan-layers-9999.ebuild |  1 -
- .../files/twelf-1.7.1-doc-guide-Makefile.patch     |  8 ++------
- ...f-1.7.1-emacs-fix-old-style-backquotes-p3.patch | 23 ++++++++++++++++++----
- 5 files changed, 22 insertions(+), 13 deletions(-)
+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% (16656/87538)
+Updating files:  20% (17508/87538)
+Updating files:  21% (18383/87538)
+Updating files:  22% (19259/87538)
+Updating files:  23% (20134/87538)
+Updating files:  24% (21010/87538)
+Updating files:  25% (21885/87538)
+Updating files:  26% (22760/87538)
+Updating files:  27% (23636/87538)
+Updating files:  28% (24511/87538)
+Updating files:  29% (25387/87538)
+Updating files:  30% (26262/87538)
+Updating files:  31% (27137/87538)
+Updating files:  32% (28013/87538)
+Updating files:  33% (28888/87538)
+Updating files:  34% (29763/87538)
+Updating files:  35% (30639/87538)
+Updating files:  36% (31514/87538)
+Updating files:  37% (32390/87538)
+Updating files:  38% (33265/87538)
+Updating files:  39% (34140/87538)
+Updating files:  39% (34910/87538)
+Updating files:  40% (35016/87538)
+Updating files:  41% (35891/87538)
+Updating files:  42% (36766/87538)
+Updating files:  43% (37642/87538)
+Updating files:  44% (38517/87538)
+Updating files:  45% (39393/87538)
+Updating files:  46% (40268/87538)
+Updating files:  47% (41143/87538)
+Updating files:  48% (42019/87538)
+Updating files:  49% (42894/87538)
+Updating files:  50% (43769/87538)
+Updating files:  51% (44645/87538)
+Updating files:  52% (45520/87538)
+Updating files:  53% (46396/87538)
+Updating files:  54% (47271/87538)
+Updating files:  55% (48146/87538)
+Updating files:  56% (49022/87538)
+Updating files:  57% (49897/87538)
+Updating files:  58% (50773/87538)
+Updating files:  59% (51648/87538)
+Updating files:  59% (51876/87538)
+Updating files:  60% (52523/87538)
+Updating files:  61% (53399/87538)
+Updating files:  62% (54274/87538)
+Updating files:  63% (55149/87538)
+Updating files:  64% (56025/87538)
+Updating files:  65% (56900/87538)
+Updating files:  66% (57776/87538)
+Updating files:  67% (58651/87538)
+Updating files:  68% (59526/87538)
+Updating files:  69% (60402/87538)
+Updating files:  70% (61277/87538)
+Updating files:  71% (62152/87538)
+Updating files:  72% (63028/87538)
+Updating files:  73% (63903/87538)
+Updating files:  74% (64779/87538)
+Updating files:  75% (65654/87538)
+Updating files:  76% (66529/87538)
+Updating files:  77% (67405/87538)
+Updating files:  78% (68280/87538)
+Updating files:  78% (68919/87538)
+Updating files:  79% (69156/87538)
+Updating files:  80% (70031/87538)
+Updating files:  81% (70906/87538)
+Updating files:  82% (71782/87538)
+Updating files:  83% (72657/87538)
+Updating files:  84% (73532/87538)
+Updating files:  85% (74408/87538)
+Updating files:  86% (75283/87538)
+Updating files:  87% (76159/87538)
+Updating files:  88% (77034/87538)
+Updating files:  89% (77909/87538)
+Updating files:  90% (78785/87538)
+Updating files:  91% (79660/87538)
+Updating files:  92% (80535/87538)
+Updating files:  93% (81411/87538)
+Updating files:  93% (81953/87538)
+Updating files:  94% (82286/87538)
+Updating files:  95% (83162/87538)
+Updating files:  96% (84037/87538)
+Updating files:  97% (84912/87538)
+Updating files:  98% (85788/87538)
+Updating files:  99% (86663/87538)
+Updating files: 100% (87538/87538)
+Updating files: 100% (87538/87538), 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/guru.html b/guru.html
index 69e74b864f9f..570152f3b342 100644
--- a/guru.html
+++ b/guru.html
@@ -42,19 +42,23 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing guru
 </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>From https://anongit.gentoo.org/git/repo/proj/guru
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced guru
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>   362eb9a0..b22e9770  dev        -&gt; origin/dev
 </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>Already up to date.
 </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>*** synced guru
 </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> * Sync succeeded
 </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 guru
+            <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> * Cache regenerated successfully
+            <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>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 guru
+</pre></td></tr>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/guru.txt b/guru.txt
index e751c224165f..2c59519a61ad 100644
--- a/guru.txt
+++ b/guru.txt
@@ -14,6 +14,8 @@ pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync guru
 *** syncing guru
+From https://anongit.gentoo.org/git/repo/proj/guru
+   362eb9a0..b22e9770  dev        -> origin/dev
 Already up to date.
 *** synced guru
  * Sync succeeded
diff --git a/index.html b/index.html
index 4f8977f98b24..75814d57334e 100644
--- a/index.html
+++ b/index.html
@@ -819,7 +819,7 @@
 
         </table>
 
-        <address>Generated based on results from 2022-03-28 13:49:07 UTC</address>
+        <address>Generated based on results from 2022-03-28 14:10:53 UTC</address>
     </body>
 </html>
         
 \ No newline at end of file
diff --git a/nordvpn.html b/nordvpn.html
index 0930016dde03..990d0c676bef 100644
--- a/nordvpn.html
+++ b/nordvpn.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 nordvpn
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:molese repo at &#x27;/var/lib/repo-mirror-ci/sync/molese&#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 nordvpn
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing nordvpn
+            <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 nordvpn
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced nordvpn
+            <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 nordvpn
 </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 nordvpn
-</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/nordvpn.txt b/nordvpn.txt
index f79940185ca1..18b8e827989d 100644
--- a/nordvpn.txt
+++ b/nordvpn.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nordvpn
-WARNING:pkgcore:molese repo at '/var/lib/repo-mirror-ci/sync/molese', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nordvpn
 Already up to date.
 *** synced nordvpn
diff --git a/nx.html b/nx.html
index 6ea664648aa6..9d728b459868 100644
--- a/nx.html
+++ b/nx.html
@@ -38,25 +38,23 @@
 </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 nx
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:molese repo at &#x27;/var/lib/repo-mirror-ci/sync/molese&#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 nx
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing nx
+            <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 nx
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced nx
+            <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 nx
 </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 nx
-</pre></td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * net-misc/nxserver-freenx-0.7.3_p104-r7: failed sourcing ebuild: user: EAPI 5 not supported, (user.eclass, line  26:  called die)
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * net-misc/nxserver-freenx-0.7.3_p104-r7: failed sourcing ebuild: user: EAPI 5 not supported, (user.eclass, line  26:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/nx.txt b/nx.txt
index 61898520441d..260df0ea9d2f 100644
--- a/nx.txt
+++ b/nx.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nx
-WARNING:pkgcore:molese repo at '/var/lib/repo-mirror-ci/sync/molese', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nx
 Already up to date.
 *** synced nx
diff --git a/nymphos.html b/nymphos.html
index ebd0fbc473d2..fb7ad96cd377 100644
--- a/nymphos.html
+++ b/nymphos.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 nymphos
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:molese repo at &#x27;/var/lib/repo-mirror-ci/sync/molese&#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 nymphos
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing nymphos
+            <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 nymphos
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced nymphos
+            <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 nymphos
 </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 nymphos
-</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/nymphos.txt b/nymphos.txt
index 6f19fbab97f2..d975b8b070c4 100644
--- a/nymphos.txt
+++ b/nymphos.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos
-WARNING:pkgcore:molese repo at '/var/lib/repo-mirror-ci/sync/molese', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nymphos
 Already up to date.
 *** synced nymphos
diff --git a/octopus.html b/octopus.html
index 54c53158719d..bc67e3852489 100644
--- a/octopus.html
+++ b/octopus.html
@@ -36,29 +36,27 @@
 </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 octopus
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:molese repo at &#x27;/var/lib/repo-mirror-ci/sync/molese&#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 octopus
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing octopus
+            <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 octopus
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced octopus
+            <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 octopus
 </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 octopus
-</pre></td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-misc/rmlint-9999: failed sourcing ebuild: inherit requires unknown eclass: l10n.eclass
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-misc/rmlint-9999: failed sourcing ebuild: inherit requires unknown eclass: l10n.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * net-p2p/opendchub-0.8.3: failed sourcing ebuild: eutils: EAPI 4 not supported, (eutils.eclass, line  32:  called die)
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * net-p2p/opendchub-0.8.3: failed sourcing ebuild: eutils: EAPI 4 not supported, (eutils.eclass, line  32:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * sys-apps/paludis-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 179:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * sys-apps/paludis-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 179:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/octopus.txt b/octopus.txt
index 35f42932b2a9..fd31c2e0bcaa 100644
--- a/octopus.txt
+++ b/octopus.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync octopus
-WARNING:pkgcore:molese repo at '/var/lib/repo-mirror-ci/sync/molese', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing octopus
 Already up to date.
 *** synced octopus
diff --git a/pf4public.html b/pf4public.html
index 34b94c44963e..e25b98eb86f9 100644
--- a/pf4public.html
+++ b/pf4public.html
@@ -44,29 +44,19 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing pf4public
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/PF4Public/gentoo-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>   88fbf07..8891c53  master     -&gt; origin/master
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced pf4public
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 88fbf07..8891c53
+            <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>Fast-forward
+            <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> www-client/ungoogled-chromium/ungoogled-chromium-100.0.4896.56-r1.ebuild | 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> 1 file changed, 1 insertion(+)
+            <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 pf4public
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced pf4public
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 pf4public
-</pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</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/pf4public.txt b/pf4public.txt
index 44d944156197..91b28ddeb33e 100644
--- a/pf4public.txt
+++ b/pf4public.txt
@@ -15,12 +15,7 @@ pkgcore 0.12.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync pf4public
 *** syncing pf4public
-From https://github.com/PF4Public/gentoo-overlay
-   88fbf07..8891c53  master     -> origin/master
-Updating 88fbf07..8891c53
-Fast-forward
- www-client/ungoogled-chromium/ungoogled-chromium-100.0.4896.56-r1.ebuild | 1 +
- 1 file changed, 1 insertion(+)
+Already up to date.
 *** synced pf4public
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/swegener.html b/swegener.html
index ae5038c8fdf3..3f3f77f1b76c 100644
--- a/swegener.html
+++ b/swegener.html
@@ -106,7 +106,7 @@
 </pre></td></tr>
             <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 142 bytes  received 5.03K bytes  1.48K bytes/sec
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 142 bytes  received 5.03K bytes  2.07K bytes/sec
 </pre></td></tr>
             <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>total size is 97.19K  speedup is 18.78
 </pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index 6f1680006c0c..96fe79675a16 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -46,7 +46,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 142
 Total bytes received: 5.03K
 
-sent 142 bytes  received 5.03K bytes  1.48K bytes/sec
+sent 142 bytes  received 5.03K bytes  2.07K bytes/sec
 total size is 97.19K  speedup is 18.78
 *** synced swegener
  * Sync succeeded
diff --git a/xwing.html b/xwing.html
index 2d742686f176..2ffd087d46d8 100644
--- a/xwing.html
+++ b/xwing.html
@@ -80,15 +80,57 @@
 </pre></td></tr>
             <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced xwing
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ stat --format=%y .
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Contact Name   : webmaster@xwing.info
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 xwing
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Number of files: 108 (reg: 71, dir: 37)
+</pre></td></tr>
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Number of created files: 0
+</pre></td></tr>
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of deleted files: 0
+</pre></td></tr>
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of regular files transferred: 15
+</pre></td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total file size: 65.75K bytes
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total transferred file size: 11.27K bytes
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Literal data: 11.27K bytes
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Matched data: 0 bytes
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>File list size: 3.54K
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>File list generation time: 0.001 seconds
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list transfer time: 0.000 seconds
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Total bytes sent: 430
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Total bytes received: 11.33K
+</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 430 bytes  received 11.33K bytes  4.70K bytes/sec
+</pre></td></tr>
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>total size is 65.75K  speedup is 5.59
+</pre></td></tr>
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced xwing
+</pre></td></tr>
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ stat --format=%y .
+</pre></td></tr>
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 xwing
+</pre></td></tr>
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/xwing.txt b/xwing.txt
index 98ab944a81a3..2ed26f4bdbb2 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -33,6 +33,27 @@ Total bytes received: 134
 
 sent 85 bytes  received 134 bytes  87.60 bytes/sec
 total size is 32  speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Contact Name   : webmaster@xwing.info
+
+
+Number of files: 108 (reg: 71, dir: 37)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 15
+Total file size: 65.75K bytes
+Total transferred file size: 11.27K bytes
+Literal data: 11.27K bytes
+Matched data: 0 bytes
+File list size: 3.54K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 430
+Total bytes received: 11.33K
+
+sent 430 bytes  received 11.33K bytes  4.70K bytes/sec
+total size is 65.75K  speedup is 5.59
 *** synced xwing
  * Sync succeeded
 $ stat --format=%y .
diff --git a/zugaina.html b/zugaina.html
index b93d7ac9c925..f18a70e2c10f 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -60,15 +60,15 @@
 </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: 205
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes sent: 209
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes received: 12.97K
 </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 205 bytes  received 12.97K bytes  8.78K bytes/sec
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 209 bytes  received 12.97K bytes  5.27K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>total size is 358.21K  speedup is 27.19
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>total size is 358.21K  speedup is 27.18
 </pre></td></tr>
             <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced zugaina
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 013915ce0a42..f7b6f89ca3cd 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -23,11 +23,11 @@ Matched data: 0 bytes
 File list size: 12.81K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 205
+Total bytes sent: 209
 Total bytes received: 12.97K
 
-sent 205 bytes  received 12.97K bytes  8.78K bytes/sec
-total size is 358.21K  speedup is 27.19
+sent 209 bytes  received 12.97K bytes  5.27K bytes/sec
+total size is 358.21K  speedup is 27.18
 *** synced zugaina
  * Sync succeeded
 $ stat --format=%y .