31 files changed, 355 insertions, 261 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index 9f579143fcf5..f15ebff47656 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -50,19 +50,19 @@
 </pre></td></tr>
             <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 5.15M
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 5.16M
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 20.64K
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 20.65K
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 5.72M
 </pre></td></tr>
             <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 20.64K bytes  received 5.72M bytes  1.64M bytes/sec
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 20.65K bytes  received 5.72M bytes  1.64M bytes/sec
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 183.95M  speedup is 32.06
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 81b0ece4c624..d934fffaddf3 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 183.95M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 5.15M
+File list size: 5.16M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 20.64K
+Total bytes sent: 20.65K
 Total bytes received: 5.72M
 
-sent 20.64K bytes  received 5.72M bytes  1.64M bytes/sec
+sent 20.65K bytes  received 5.72M bytes  1.64M bytes/sec
 total size is 183.95M  speedup is 32.06
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/gentoo.html b/gentoo.html
index 0c2ed57c794d..4943c1cf1ac1 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -38,127 +38,223 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>You are not currently on a branch.
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>   663f2319190..5dda1812d83  master     -&gt; origin/master
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Please specify which branch you want to merge with.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Updating 663f2319190..5dda1812d83
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>See git-pull(1) for details.
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> app-admin/sudo/sudo-1.8.31.ebuild                  |  2 +-
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>    git pull &lt;remote&gt; &lt;branch&gt;
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> app-misc/screen/screen-4.8.0.ebuild                |  2 +-
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> dev-libs/check/check-0.14.0.ebuild                 |  2 +-
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> dev-libs/icu/icu-65.1-r1.ebuild                    |  2 +-
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>!!! failed syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> dev-libs/libmodbus/Manifest                        |  1 +
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync failed with 1
+</pre></td><td>[FATAL]</td></tr>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Will try to re-create
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> dev-libs/libmodbus/libmodbus-3.1.6.ebuild          | 33 ++++++++++
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint sync gentoo
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> .../ipython_genutils-0.2.0-r1.ebuild               | 29 +++++++++
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> .../pandocfilters/pandocfilters-1.4.2-r2.ebuild    | 17 +++++
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Updating files:  17% (15629/90731)
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> dev-python/pycurl/Manifest                         |  1 +
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating files:  18% (16332/90731)
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> dev-python/pycurl/pycurl-7.43.0.5.ebuild           | 76 ++++++++++++++++++++++
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating files:  19% (17239/90731)
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> dev-python/snowballstemmer/Manifest                |  2 +-
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating files:  20% (18147/90731)
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> .../snowballstemmer/snowballstemmer-1.2.0.ebuild   | 17 -----
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating files:  21% (19054/90731)
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> .../snowballstemmer/snowballstemmer-2.0.0.ebuild   | 17 +++++
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating files:  22% (19961/90731)
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-python/sphinxcontrib-applehelp/Manifest        |  1 +
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating files:  23% (20869/90731)
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../sphinxcontrib-applehelp-1.0.2.ebuild           | 30 +++++++++
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Updating files:  24% (21776/90731)
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-python/sphinxcontrib-devhelp/Manifest          |  1 +
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Updating files:  25% (22683/90731)
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> .../sphinxcontrib-devhelp-1.0.2.ebuild             | 30 +++++++++
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Updating files:  26% (23591/90731)
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-python/sphinxcontrib-htmlhelp/Manifest         |  1 +
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Updating files:  27% (24498/90731)
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> .../sphinxcontrib-htmlhelp-1.0.3.ebuild            | 30 +++++++++
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Updating files:  28% (25405/90731)
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> .../sphinxcontrib-jsmath-1.0.1-r1.ebuild           | 30 +++++++++
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Updating files:  29% (26312/90731)
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-python/sphinxcontrib-qthelp/Manifest           |  1 +
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Updating files:  30% (27220/90731)
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> .../sphinxcontrib-qthelp-1.0.3.ebuild              | 30 +++++++++
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Updating files:  31% (28127/90731)
 </pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-python/sphinxcontrib-serializinghtml/Manifest  |  1 +
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Updating files:  32% (29034/90731)
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> .../sphinxcontrib-serializinghtml-1.1.4.ebuild     | 30 +++++++++
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Updating files:  33% (29942/90731)
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-python/terminado/Manifest                      |  1 +
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating files:  34% (30849/90731)
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-python/terminado/terminado-0.8.3.ebuild        | 28 ++++++++
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files:  35% (31756/90731)
 </pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> mail-mta/exim/exim-4.92.3.ebuild                   |  2 +-
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files:  35% (31762/90731)
 </pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> net-mail/mailutils/mailutils-3.8.ebuild            |  2 +-
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files:  36% (32664/90731)
 </pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> sys-auth/elogind/elogind-243.4.ebuild              |  2 +-
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files:  37% (33571/90731)
 </pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> sys-devel/binutils/binutils-2.33.1-r1.ebuild       |  2 +-
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files:  38% (34478/90731)
 </pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> .../binutils-libs/binutils-libs-2.33.1-r1.ebuild   |  2 +-
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files:  39% (35386/90731)
 </pre></td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> www-servers/tornado/Manifest                       |  1 +
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files:  40% (36293/90731)
 </pre></td></tr>
-            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> www-servers/tornado/tornado-5.1-r1.ebuild          | 63 ++++++++++++++++++
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files:  41% (37200/90731)
 </pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> www-servers/tornado/tornado-6.0.3.ebuild           | 62 ++++++++++++++++++
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files:  42% (38108/90731)
 </pre></td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> 34 files changed, 524 insertions(+), 27 deletions(-)
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files:  43% (39015/90731)
 </pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> create mode 100644 dev-libs/libmodbus/libmodbus-3.1.6.ebuild
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files:  44% (39922/90731)
 </pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Updating files:  45% (40829/90731)
 </pre></td></tr>
-            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> create mode 100644 dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Updating files:  46% (41737/90731)
 </pre></td></tr>
-            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> create mode 100644 dev-python/pycurl/pycurl-7.43.0.5.ebuild
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Updating files:  47% (42644/90731)
 </pre></td></tr>
-            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> delete mode 100644 dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Updating files:  48% (43551/90731)
 </pre></td></tr>
-            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> create mode 100644 dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Updating files:  49% (44459/90731)
 </pre></td></tr>
-            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> create mode 100644 dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Updating files:  50% (45366/90731)
 </pre></td></tr>
-            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> create mode 100644 dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Updating files:  51% (46273/90731)
 </pre></td></tr>
-            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> create mode 100644 dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Updating files:  52% (47181/90731)
 </pre></td></tr>
-            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> create mode 100644 dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Updating files:  52% (47709/90731)
 </pre></td></tr>
-            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> create mode 100644 dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Updating files:  53% (48088/90731)
 </pre></td></tr>
-            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> create mode 100644 dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Updating files:  54% (48995/90731)
 </pre></td></tr>
-            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> create mode 100644 dev-python/terminado/terminado-0.8.3.ebuild
+            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Updating files:  55% (49903/90731)
 </pre></td></tr>
-            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> create mode 100644 www-servers/tornado/tornado-5.1-r1.ebuild
+            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Updating files:  56% (50810/90731)
 </pre></td></tr>
-            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> create mode 100644 www-servers/tornado/tornado-6.0.3.ebuild
+            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Updating files:  57% (51717/90731)
 </pre></td></tr>
-            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>*** syncing gentoo
+            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Updating files:  58% (52624/90731)
 </pre></td></tr>
-            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>*** synced gentoo
+            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Updating files:  59% (53532/90731)
 </pre></td></tr>
-            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Updating files:  60% (54439/90731)
 </pre></td></tr>
-            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Updating files:  61% (55346/90731)
 </pre></td></tr>
-            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Updating files:  62% (56254/90731)
 </pre></td></tr>
-            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
+            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Updating files:  63% (57161/90731)
 </pre></td></tr>
-            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files:  64% (58068/90731)
+</pre></td></tr>
+            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files:  65% (58976/90731)
+</pre></td></tr>
+            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files:  66% (59883/90731)
+</pre></td></tr>
+            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files:  67% (60790/90731)
+</pre></td></tr>
+            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files:  68% (61698/90731)
+</pre></td></tr>
+            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files:  69% (62605/90731)
+</pre></td></tr>
+            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files:  69% (62825/90731)
+</pre></td></tr>
+            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files:  70% (63512/90731)
+</pre></td></tr>
+            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files:  71% (64420/90731)
+</pre></td></tr>
+            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files:  72% (65327/90731)
+</pre></td></tr>
+            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files:  73% (66234/90731)
+</pre></td></tr>
+            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files:  74% (67141/90731)
+</pre></td></tr>
+            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files:  75% (68049/90731)
+</pre></td></tr>
+            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files:  76% (68956/90731)
+</pre></td></tr>
+            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files:  77% (69863/90731)
+</pre></td></tr>
+            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files:  78% (70771/90731)
+</pre></td></tr>
+            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files:  79% (71678/90731)
+</pre></td></tr>
+            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files:  80% (72585/90731)
+</pre></td></tr>
+            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files:  81% (73493/90731)
+</pre></td></tr>
+            <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files:  82% (74400/90731)
+</pre></td></tr>
+            <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files:  82% (75146/90731)
+</pre></td></tr>
+            <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files:  83% (75307/90731)
+</pre></td></tr>
+            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files:  84% (76215/90731)
+</pre></td></tr>
+            <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files:  85% (77122/90731)
+</pre></td></tr>
+            <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files:  86% (78029/90731)
+</pre></td></tr>
+            <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files:  87% (78936/90731)
+</pre></td></tr>
+            <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files:  88% (79844/90731)
+</pre></td></tr>
+            <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files:  89% (80751/90731)
+</pre></td></tr>
+            <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files:  90% (81658/90731)
+</pre></td></tr>
+            <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files:  91% (82566/90731)
+</pre></td></tr>
+            <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Updating files:  92% (83473/90731)
+</pre></td></tr>
+            <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Updating files:  93% (84380/90731)
+</pre></td></tr>
+            <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Updating files:  94% (85288/90731)
+</pre></td></tr>
+            <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>Updating files:  95% (86195/90731)
+</pre></td></tr>
+            <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>Updating files:  96% (87102/90731)
+</pre></td></tr>
+            <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Updating files:  97% (88010/90731)
+</pre></td></tr>
+            <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Updating files:  98% (88917/90731)
+</pre></td></tr>
+            <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Updating files:  99% (89824/90731)
+</pre></td></tr>
+            <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Updating files:  99% (90624/90731)
+</pre></td></tr>
+            <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Updating files: 100% (90731/90731)
+</pre></td></tr>
+            <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>Updating files: 100% (90731/90731), done.
+</pre></td></tr>
+            <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre>*** syncing gentoo
+</pre></td></tr>
+            <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>*** synced gentoo
+</pre></td></tr>
+            <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> * Sync succeeded after re-adding
+</pre></td></tr>
+            <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+            <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+            <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
+</pre></td></tr>
+            <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo.txt b/gentoo.txt
index 16403339909a..e26f2e31f488 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,63 +12,22 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
  'status': 'official'}
 $ pmaint sync gentoo
-From https://anongit.gentoo.org/git/repo/gentoo
-   663f2319190..5dda1812d83  master     -> origin/master
-Updating 663f2319190..5dda1812d83
-Fast-forward
- app-admin/sudo/sudo-1.8.31.ebuild                  |  2 +-
- app-misc/screen/screen-4.8.0.ebuild                |  2 +-
- dev-libs/check/check-0.14.0.ebuild                 |  2 +-
- dev-libs/icu/icu-65.1-r1.ebuild                    |  2 +-
- dev-libs/libmodbus/Manifest                        |  1 +
- dev-libs/libmodbus/libmodbus-3.1.6.ebuild          | 33 ++++++++++
- .../ipython_genutils-0.2.0-r1.ebuild               | 29 +++++++++
- .../pandocfilters/pandocfilters-1.4.2-r2.ebuild    | 17 +++++
- dev-python/pycurl/Manifest                         |  1 +
- dev-python/pycurl/pycurl-7.43.0.5.ebuild           | 76 ++++++++++++++++++++++
- dev-python/snowballstemmer/Manifest                |  2 +-
- .../snowballstemmer/snowballstemmer-1.2.0.ebuild   | 17 -----
- .../snowballstemmer/snowballstemmer-2.0.0.ebuild   | 17 +++++
- dev-python/sphinxcontrib-applehelp/Manifest        |  1 +
- .../sphinxcontrib-applehelp-1.0.2.ebuild           | 30 +++++++++
- dev-python/sphinxcontrib-devhelp/Manifest          |  1 +
- .../sphinxcontrib-devhelp-1.0.2.ebuild             | 30 +++++++++
- dev-python/sphinxcontrib-htmlhelp/Manifest         |  1 +
- .../sphinxcontrib-htmlhelp-1.0.3.ebuild            | 30 +++++++++
- .../sphinxcontrib-jsmath-1.0.1-r1.ebuild           | 30 +++++++++
- dev-python/sphinxcontrib-qthelp/Manifest           |  1 +
- .../sphinxcontrib-qthelp-1.0.3.ebuild              | 30 +++++++++
- dev-python/sphinxcontrib-serializinghtml/Manifest  |  1 +
- .../sphinxcontrib-serializinghtml-1.1.4.ebuild     | 30 +++++++++
- dev-python/terminado/Manifest                      |  1 +
- dev-python/terminado/terminado-0.8.3.ebuild        | 28 ++++++++
- mail-mta/exim/exim-4.92.3.ebuild                   |  2 +-
- net-mail/mailutils/mailutils-3.8.ebuild            |  2 +-
- sys-auth/elogind/elogind-243.4.ebuild              |  2 +-
- sys-devel/binutils/binutils-2.33.1-r1.ebuild       |  2 +-
- .../binutils-libs/binutils-libs-2.33.1-r1.ebuild   |  2 +-
- www-servers/tornado/Manifest                       |  1 +
- www-servers/tornado/tornado-5.1-r1.ebuild          | 63 ++++++++++++++++++
- www-servers/tornado/tornado-6.0.3.ebuild           | 62 ++++++++++++++++++
- 34 files changed, 524 insertions(+), 27 deletions(-)
- create mode 100644 dev-libs/libmodbus/libmodbus-3.1.6.ebuild
- create mode 100644 dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
- create mode 100644 dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
- create mode 100644 dev-python/pycurl/pycurl-7.43.0.5.ebuild
- delete mode 100644 dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
- create mode 100644 dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
- create mode 100644 dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
- create mode 100644 dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
- create mode 100644 dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
- create mode 100644 dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
- create mode 100644 dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
- create mode 100644 dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
- create mode 100644 dev-python/terminado/terminado-0.8.3.ebuild
- create mode 100644 www-servers/tornado/tornado-5.1-r1.ebuild
- create mode 100644 www-servers/tornado/tornado-6.0.3.ebuild
+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>
+
+*** syncing gentoo
+!!! failed syncing gentoo
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint sync gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files:  17% (15629/90731)
+Updating files:  18% (16332/90731)
+Updating files:  19% (17239/90731)
+Updating files:  20% (18147/90731)
+Updating files:  21% (19054/90731)
+Updating files:  22% (19961/90731)
+Updating files:  23% (20869/90731)
+Updating files:  24% (21776/90731)
+Updating files:  25% (22683/90731)
+Updating files:  26% (23591/90731)
+Updating files:  27% (24498/90731)
+Updating files:  28% (25405/90731)
+Updating files:  29% (26312/90731)
+Updating files:  30% (27220/90731)
+Updating files:  31% (28127/90731)
+Updating files:  32% (29034/90731)
+Updating files:  33% (29942/90731)
+Updating files:  34% (30849/90731)
+Updating files:  35% (31756/90731)
+Updating files:  35% (31762/90731)
+Updating files:  36% (32664/90731)
+Updating files:  37% (33571/90731)
+Updating files:  38% (34478/90731)
+Updating files:  39% (35386/90731)
+Updating files:  40% (36293/90731)
+Updating files:  41% (37200/90731)
+Updating files:  42% (38108/90731)
+Updating files:  43% (39015/90731)
+Updating files:  44% (39922/90731)
+Updating files:  45% (40829/90731)
+Updating files:  46% (41737/90731)
+Updating files:  47% (42644/90731)
+Updating files:  48% (43551/90731)
+Updating files:  49% (44459/90731)
+Updating files:  50% (45366/90731)
+Updating files:  51% (46273/90731)
+Updating files:  52% (47181/90731)
+Updating files:  52% (47709/90731)
+Updating files:  53% (48088/90731)
+Updating files:  54% (48995/90731)
+Updating files:  55% (49903/90731)
+Updating files:  56% (50810/90731)
+Updating files:  57% (51717/90731)
+Updating files:  58% (52624/90731)
+Updating files:  59% (53532/90731)
+Updating files:  60% (54439/90731)
+Updating files:  61% (55346/90731)
+Updating files:  62% (56254/90731)
+Updating files:  63% (57161/90731)
+Updating files:  64% (58068/90731)
+Updating files:  65% (58976/90731)
+Updating files:  66% (59883/90731)
+Updating files:  67% (60790/90731)
+Updating files:  68% (61698/90731)
+Updating files:  69% (62605/90731)
+Updating files:  69% (62825/90731)
+Updating files:  70% (63512/90731)
+Updating files:  71% (64420/90731)
+Updating files:  72% (65327/90731)
+Updating files:  73% (66234/90731)
+Updating files:  74% (67141/90731)
+Updating files:  75% (68049/90731)
+Updating files:  76% (68956/90731)
+Updating files:  77% (69863/90731)
+Updating files:  78% (70771/90731)
+Updating files:  79% (71678/90731)
+Updating files:  80% (72585/90731)
+Updating files:  81% (73493/90731)
+Updating files:  82% (74400/90731)
+Updating files:  82% (75146/90731)
+Updating files:  83% (75307/90731)
+Updating files:  84% (76215/90731)
+Updating files:  85% (77122/90731)
+Updating files:  86% (78029/90731)
+Updating files:  87% (78936/90731)
+Updating files:  88% (79844/90731)
+Updating files:  89% (80751/90731)
+Updating files:  90% (81658/90731)
+Updating files:  91% (82566/90731)
+Updating files:  92% (83473/90731)
+Updating files:  93% (84380/90731)
+Updating files:  94% (85288/90731)
+Updating files:  95% (86195/90731)
+Updating files:  96% (87102/90731)
+Updating files:  97% (88010/90731)
+Updating files:  98% (88917/90731)
+Updating files:  99% (89824/90731)
+Updating files:  99% (90624/90731)
+Updating files: 100% (90731/90731)
+Updating files: 100% (90731/90731), done.
 *** syncing gentoo
 *** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
diff --git a/index.html b/index.html
index f23bca9c0452..96e63b57c51f 100644
--- a/index.html
+++ b/index.html
@@ -862,7 +862,7 @@
 
         </table>
 
-        <address>Generated based on results from 2020-03-02 15:35:16 UTC</address>
+        <address>Generated based on results from 2020-03-02 16:10:07 UTC</address>
     </body>
 </html>
         
 \ No newline at end of file
diff --git a/k_f.html b/k_f.html
index da891d0f8190..a8b68860c073 100644
--- a/k_f.html
+++ b/k_f.html
@@ -34,37 +34,35 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync k_f
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing k_f
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing k_f
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced k_f
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced k_f
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 k_f
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 k_f
-</pre></td></tr>
-            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-crypt/gnupg-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * app-crypt/gnupg-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-crypt/keyart-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-crypt/keyart-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * dev-libs/libgcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * dev-libs/libgcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * dev-libs/libgpg-error-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * dev-libs/libgpg-error-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-libs/libksba-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * dev-libs/libksba-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-libs/npth-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-libs/npth-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-python/pyGPG-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-python/pyGPG-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/k_f.txt b/k_f.txt
index acdc78bf8314..060ab0025e05 100644
--- a/k_f.txt
+++ b/k_f.txt
@@ -10,7 +10,6 @@
              'uri': 'git://git.sumptuouscapital.com/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync k_f
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing k_f
 *** synced k_f
diff --git a/kaa.html b/kaa.html
index bdaa622ec146..009f5cdb7cf8 100644
--- a/kaa.html
+++ b/kaa.html
@@ -32,23 +32,21 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync kaa
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing kaa
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing kaa
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** synced kaa
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced kaa
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kaa
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kaa
-</pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/kaa.txt b/kaa.txt
index 1ab4b0d02708..ef68a35813fd 100644
--- a/kaa.txt
+++ b/kaa.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/Oleh-Kravchenko/kaa-layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync kaa
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing kaa
 *** synced kaa
diff --git a/keepbot-overlay.html b/keepbot-overlay.html
index d359b565be62..a8d682baac00 100644
--- a/keepbot-overlay.html
+++ b/keepbot-overlay.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <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>*** syncing keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing keepbot-overlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced keepbot-overlay
+            <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 regen --use-local-desc --pkg-desc-index -t 1 keepbot-overlay
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 keepbot-overlay
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/keepbot-overlay.txt b/keepbot-overlay.txt
index d17a7f32404f..244dcb153db0 100644
--- a/keepbot-overlay.txt
+++ b/keepbot-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync keepbot-overlay
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing keepbot-overlay
 *** synced keepbot-overlay
diff --git a/khoverlay.html b/khoverlay.html
index 60826c80f80d..bc3d37a2818a 100644
--- a/khoverlay.html
+++ b/khoverlay.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync khoverlay
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing khoverlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing khoverlay
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced khoverlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced khoverlay
+            <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 regen --use-local-desc --pkg-desc-index -t 1 khoverlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 khoverlay
-</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/khoverlay.txt b/khoverlay.txt
index 17ee221c3b0f..11f3db2fab45 100644
--- a/khoverlay.txt
+++ b/khoverlay.txt
@@ -11,7 +11,6 @@
              'uri': 'git+ssh://git@gitlab.com/khumba/khoverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync khoverlay
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing khoverlay
 *** synced khoverlay
diff --git a/klondike.html b/klondike.html
index 4db4ab7a4552..4f159d9b399b 100644
--- a/klondike.html
+++ b/klondike.html
@@ -44,23 +44,21 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync klondike
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <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>*** syncing klondike
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing klondike
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced klondike
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced klondike
+            <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 regen --use-local-desc --pkg-desc-index -t 1 klondike
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 klondike
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <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/klondike.txt b/klondike.txt
index ce8d69af5f59..d9cfefe25f33 100644
--- a/klondike.txt
+++ b/klondike.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/klondike.git'}],
  'status': 'unofficial'}
 $ pmaint sync klondike
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing klondike
 *** synced klondike
diff --git a/konsolebox.html b/konsolebox.html
index f08cc947f5ce..4c42f5be5bfd 100644
--- a/konsolebox.html
+++ b/konsolebox.html
@@ -34,23 +34,21 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync konsolebox
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing konsolebox
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing konsolebox
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced konsolebox
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced konsolebox
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 konsolebox
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 konsolebox
-</pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/konsolebox.txt b/konsolebox.txt
index 6b3227fd01fc..760127990c7d 100644
--- a/konsolebox.txt
+++ b/konsolebox.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/konsolebox/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync konsolebox
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing konsolebox
 *** synced konsolebox
diff --git a/kryptus.html b/kryptus.html
index d566d9c2085c..9a333e70de27 100644
--- a/kryptus.html
+++ b/kryptus.html
@@ -34,23 +34,21 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync kryptus
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing kryptus
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing kryptus
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced kryptus
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced kryptus
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kryptus
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kryptus
-</pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/kryptus.txt b/kryptus.txt
index a3c1400d8b55..9425e3b1be15 100644
--- a/kryptus.txt
+++ b/kryptus.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/kryptuss/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync kryptus
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing kryptus
 *** synced kryptus
diff --git a/lacimarsik-overlay.html b/lacimarsik-overlay.html
index f33622bede8c..7054d5146087 100644
--- a/lacimarsik-overlay.html
+++ b/lacimarsik-overlay.html
@@ -36,25 +36,23 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync lacimarsik-overlay
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing lacimarsik-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing lacimarsik-overlay
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced lacimarsik-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced lacimarsik-overlay
+            <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 regen --use-local-desc --pkg-desc-index -t 1 lacimarsik-overlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lacimarsik-overlay
-</pre></td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * media-sound/ladish-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * media-sound/ladish-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/lacimarsik-overlay.txt b/lacimarsik-overlay.txt
index 15acc6dfb8b2..b2880b726287 100644
--- a/lacimarsik-overlay.txt
+++ b/lacimarsik-overlay.txt
@@ -11,7 +11,6 @@
              'uri': 'https://github.com/lacimarsik/lacimarsik-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lacimarsik-overlay
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing lacimarsik-overlay
 *** synced lacimarsik-overlay
diff --git a/lanodanOverlay.html b/lanodanOverlay.html
index 5b47b9b43151..c4a30970f297 100644
--- a/lanodanOverlay.html
+++ b/lanodanOverlay.html
@@ -44,23 +44,21 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <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>*** syncing lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing lanodanOverlay
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced lanodanOverlay
+            <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 regen --use-local-desc --pkg-desc-index -t 1 lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lanodanOverlay
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <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/lanodanOverlay.txt b/lanodanOverlay.txt
index 81c2c97d3298..1e0fb1780b5e 100644
--- a/lanodanOverlay.txt
+++ b/lanodanOverlay.txt
@@ -15,7 +15,6 @@
             {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lanodanOverlay
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing lanodanOverlay
 *** synced lanodanOverlay
diff --git a/laurentb.html b/laurentb.html
index 65b3259d786e..986fd88100a3 100644
--- a/laurentb.html
+++ b/laurentb.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync laurentb
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <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>*** syncing laurentb
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing laurentb
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced laurentb
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced laurentb
+            <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 regen --use-local-desc --pkg-desc-index -t 1 laurentb
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 laurentb
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/laurentb.txt b/laurentb.txt
index 8cf00f46d375..87733734a478 100644
--- a/laurentb.txt
+++ b/laurentb.txt
@@ -12,7 +12,6 @@
              'uri': 'https://github.com/laurentb/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync laurentb
-WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Already up to date.
 *** syncing laurentb
 *** synced laurentb
diff --git a/swegener.html b/swegener.html
index 37e084204e91..44cb514c36d5 100644
--- a/swegener.html
+++ b/swegener.html
@@ -94,15 +94,15 @@
 </pre></td></tr>
             <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total bytes sent: 139
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Total bytes sent: 135
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Total bytes received: 4.96K
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Total bytes received: 4.95K
 </pre></td></tr>
             <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 139 bytes  received 4.96K bytes  2.04K bytes/sec
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 135 bytes  received 4.95K bytes  3.39K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 94.48K  speedup is 18.54
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 94.48K  speedup is 18.57
 </pre></td></tr>
             <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing swegener
 </pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index abfa95a29f5e..49b54d0035ff 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -40,11 +40,11 @@ Matched data: 0 bytes
 File list size: 4.87K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 139
-Total bytes received: 4.96K
+Total bytes sent: 135
+Total bytes received: 4.95K
 
-sent 139 bytes  received 4.96K bytes  2.04K bytes/sec
-total size is 94.48K  speedup is 18.54
+sent 135 bytes  received 4.95K bytes  3.39K bytes/sec
+total size is 94.48K  speedup is 18.57
 *** syncing swegener
 *** synced swegener
  * Sync succeeded
diff --git a/xwing.html b/xwing.html
index 5d05216a6de0..aec52acfa1f2 100644
--- a/xwing.html
+++ b/xwing.html
@@ -86,17 +86,63 @@
 </pre></td></tr>
             <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing xwing
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced xwing
+            <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> * Sync succeeded
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Server Address : 91.134.139.206
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ stat --format=%y .
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Contact Name   : webmaster@xwing.info
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Hardware       : VPS 2016 SSD 3
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of files: 138 (reg: 98, dir: 40)
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of created files: 0
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Number of deleted files: 0
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Number of regular files transferred: 21
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total file size: 107.73K bytes
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Total transferred file size: 29.48K bytes
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Literal data: 29.48K bytes
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Matched data: 0 bytes
+</pre></td></tr>
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list size: 4.47K
+</pre></td></tr>
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>File list generation time: 0.001 seconds
+</pre></td></tr>
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>File list transfer time: 0.000 seconds
+</pre></td></tr>
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Total bytes sent: 532
+</pre></td></tr>
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Total bytes received: 18.98K
+</pre></td></tr>
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>sent 532 bytes  received 18.98K bytes  7.81K bytes/sec
+</pre></td></tr>
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>total size is 107.73K  speedup is 5.52
+</pre></td></tr>
+            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing xwing
+</pre></td></tr>
+            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced xwing
+</pre></td></tr>
+            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ stat --format=%y .
+</pre></td></tr>
+            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+</pre></td></tr>
+            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/xwing.txt b/xwing.txt
index b553e2d87d6b..e497c96da27a 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -36,6 +36,29 @@ Total bytes received: 133
 
 sent 85 bytes  received 133 bytes  87.20 bytes/sec
 total size is 32  speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Server Address : 91.134.139.206
+Contact Name   : webmaster@xwing.info
+Hardware       : VPS 2016 SSD 3
+
+
+Number of files: 138 (reg: 98, dir: 40)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 21
+Total file size: 107.73K bytes
+Total transferred file size: 29.48K bytes
+Literal data: 29.48K bytes
+Matched data: 0 bytes
+File list size: 4.47K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 532
+Total bytes received: 18.98K
+
+sent 532 bytes  received 18.98K bytes  7.81K bytes/sec
+total size is 107.73K  speedup is 5.52
 *** syncing xwing
 *** synced xwing
  * Sync succeeded
diff --git a/zugaina.html b/zugaina.html
index 93697b20241a..41b145718cb5 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -48,19 +48,19 @@
 </pre></td></tr>
             <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 44.20K
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 44.04K
 </pre></td></tr>
             <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 487
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 491
 </pre></td></tr>
             <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes received: 47.20K
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 487 bytes  received 47.20K bytes  19.07K bytes/sec
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 491 bytes  received 47.20K bytes  13.62K bytes/sec
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.19M  speedup is 45.93
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 4234d6610690..b61a5db1cd65 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -17,13 +17,13 @@ Total file size: 2.19M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 44.20K
+File list size: 44.04K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 487
+Total bytes sent: 491
 Total bytes received: 47.20K
 
-sent 487 bytes  received 47.20K bytes  19.07K bytes/sec
+sent 491 bytes  received 47.20K bytes  13.62K bytes/sec
 total size is 2.19M  speedup is 45.93
 *** syncing zugaina
 *** synced zugaina