2021-03-13T01:30:02Z

23 files changed, 169 insertions, 196 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index 85927db26016..eae84be73689 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: 2.22M
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.26M
 </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: 17.68K
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.69K
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 2.65M
 </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 17.68K bytes  received 2.65M bytes  1.78M bytes/sec
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.69K bytes  received 2.65M bytes  1.78M bytes/sec
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 62.30M  speedup is 23.34
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index d051f74ef19d..36f67521e2b2 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 62.30M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.22M
+File list size: 2.26M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 17.68K
+Total bytes sent: 17.69K
 Total bytes received: 2.65M
 
-sent 17.68K bytes  received 2.65M bytes  1.78M bytes/sec
+sent 17.69K bytes  received 2.65M bytes  1.78M bytes/sec
 total size is 62.30M  speedup is 23.34
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/gentoo.html b/gentoo.html
index 9f8322999c50..ac6f7bf766b1 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -64,39 +64,21 @@
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>   eb23f8e2e69..b63428c9173  master     -&gt; origin/master
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating eb23f8e2e69..b63428c9173
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gentoo
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-lang/go/Manifest         |   2 -
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> dev-lang/go/go-1.15.8.ebuild | 197 -------------------------------------------
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-lang/go/go-1.16.ebuild   | 197 -------------------------------------------
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> 3 files changed, 396 deletions(-)
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> delete mode 100644 dev-lang/go/go-1.15.8.ebuild
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> delete mode 100644 dev-lang/go/go-1.16.ebuild
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing gentoo
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</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 32 gentoo
-</pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo.txt b/gentoo.txt
index 5615303c64e2..8058c350aba2 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -25,16 +25,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://anongit.gentoo.org/git/repo/gentoo
-   eb23f8e2e69..b63428c9173  master     -> origin/master
-Updating eb23f8e2e69..b63428c9173
-Fast-forward
- dev-lang/go/Manifest         |   2 -
- dev-lang/go/go-1.15.8.ebuild | 197 -------------------------------------------
- dev-lang/go/go-1.16.ebuild   | 197 -------------------------------------------
- 3 files changed, 396 deletions(-)
- delete mode 100644 dev-lang/go/go-1.15.8.ebuild
- delete mode 100644 dev-lang/go/go-1.16.ebuild
+Already up to date.
 *** syncing gentoo
 *** synced gentoo
  * Sync succeeded
diff --git a/index.html b/index.html
index ffb78becf15a..4a89d0e9f7c2 100644
--- a/index.html
+++ b/index.html
@@ -853,7 +853,7 @@
 
         </table>
 
-        <address>Generated based on results from 2021-03-13 01:20:50 UTC</address>
+        <address>Generated based on results from 2021-03-13 01:35:50 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/jkolo.html b/jkolo.html
index 9e06037ee925..eec4aab9bd0a 100644
--- a/jkolo.html
+++ b/jkolo.html
@@ -32,51 +32,53 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync jkolo
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
+            <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>*** syncing jkolo
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced jkolo
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing jkolo
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jkolo
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
+</pre></td></tr>
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/jkolo.txt b/jkolo.txt
index 72ad6d77556e..786e6a693cbe 100644
--- a/jkolo.txt
+++ b/jkolo.txt
@@ -9,6 +9,7 @@
              'uri': 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jkolo
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/jm-overlay.html b/jm-overlay.html
index 4ba6560255c3..bd085aa9bce6 100644
--- a/jm-overlay.html
+++ b/jm-overlay.html
@@ -32,55 +32,57 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync jm-overlay
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
+            <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>*** syncing jm-overlay
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced jm-overlay
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing jm-overlay
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jm-overlay
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * dev-cpp/gtest-1.8.0: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
+</pre></td></tr>
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-cpp/gtest-1.8.0: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-video/nordlicht-0.4.3-r1: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-video/nordlicht-0.4.3-r1: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-video/nordlicht-0.4.4-r1: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-video/nordlicht-0.4.4-r1: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-video/nordlicht-0.4.5-r1: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-video/nordlicht-0.4.5-r1: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/jm-overlay.txt b/jm-overlay.txt
index 9c170bba025b..3b108c105461 100644
--- a/jm-overlay.txt
+++ b/jm-overlay.txt
@@ -9,6 +9,7 @@
              'uri': 'https://github.com/Jannis234/jm-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jm-overlay
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/jmbsvicetto.html b/jmbsvicetto.html
index 78146b6a9cd1..8aa1d1dfc4ab 100644
--- a/jmbsvicetto.html
+++ b/jmbsvicetto.html
@@ -42,55 +42,57 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+            <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>*** syncing jmbsvicetto
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced jmbsvicetto
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-backup/bacula-9.0.8: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
+</pre></td></tr>
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-backup/bacula-9.0.8: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-backup/bacula-9.2.1: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-backup/bacula-9.2.1: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-misc/gramps-3.4.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-misc/gramps-3.4.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-misc/gramps-4.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-misc/gramps-4.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt
index 155a71321231..694792f5d5e6 100644
--- a/jmbsvicetto.txt
+++ b/jmbsvicetto.txt
@@ -14,6 +14,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git'}],
  'status': 'official'}
 $ pmaint sync jmbsvicetto
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/johnmh.html b/johnmh.html
index 50c71e8e1a53..04ba12a1beff 100644
--- a/johnmh.html
+++ b/johnmh.html
@@ -40,47 +40,49 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync johnmh
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <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>*** syncing johnmh
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced johnmh
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing johnmh
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced johnmh
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/johnmh.txt b/johnmh.txt
index f98506ac4062..de4c03dbe257 100644
--- a/johnmh.txt
+++ b/johnmh.txt
@@ -13,6 +13,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/johnmh.git'}],
  'status': 'unofficial'}
 $ pmaint sync johnmh
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/johu.html b/johu.html
index 175615391a32..52bceb662c86 100644
--- a/johu.html
+++ b/johu.html
@@ -40,47 +40,49 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync johu
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <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>*** syncing johu
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced johu
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing johu
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced johu
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johu
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johu
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/johu.txt b/johu.txt
index 429b9849276e..7259bef5be08 100644
--- a/johu.txt
+++ b/johu.txt
@@ -13,6 +13,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/johu.git'}],
  'status': 'official'}
 $ pmaint sync johu
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/lanodanOverlay.html b/lanodanOverlay.html
index 57a505bf8e57..8bbaa31facc7 100644
--- a/lanodanOverlay.html
+++ b/lanodanOverlay.html
@@ -72,31 +72,21 @@
 </pre></td></tr>
             <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>From https://hacktivis.me/git/overlay
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>   70ba5ece9..80054a8ef  master     -&gt; origin/master
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Updating 70ba5ece9..80054a8ef
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> profiles/base/package.mask | 5 -----
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> 1 file changed, 5 deletions(-)
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing lanodanOverlay
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lanodanOverlay
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced lanodanOverlay
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</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 32 lanodanOverlay
-</pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt
index 7084acb7646f..e6a43da429b1 100644
--- a/lanodanOverlay.txt
+++ b/lanodanOverlay.txt
@@ -29,12 +29,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://hacktivis.me/git/overlay
-   70ba5ece9..80054a8ef  master     -> origin/master
-Updating 70ba5ece9..80054a8ef
-Fast-forward
- profiles/base/package.mask | 5 -----
- 1 file changed, 5 deletions(-)
+Already up to date.
 *** syncing lanodanOverlay
 *** synced lanodanOverlay
  * Sync succeeded
diff --git a/swegener.html b/swegener.html
index 63c8e52396d9..0f3228cacb7c 100644
--- a/swegener.html
+++ b/swegener.html
@@ -100,7 +100,7 @@
 </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 143 bytes  received 5.09K bytes  1.50K bytes/sec
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 143 bytes  received 5.09K bytes  2.09K bytes/sec
 </pre></td></tr>
             <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 107.78K  speedup is 20.59
 </pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index 0674e12f95f4..1eb0bc27ffa5 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -43,7 +43,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 143
 Total bytes received: 5.09K
 
-sent 143 bytes  received 5.09K bytes  1.50K bytes/sec
+sent 143 bytes  received 5.09K bytes  2.09K bytes/sec
 total size is 107.78K  speedup is 20.59
 *** syncing swegener
 *** synced swegener
diff --git a/xwing.html b/xwing.html
index 3e44e24818b8..348edfd7ac5e 100644
--- a/xwing.html
+++ b/xwing.html
@@ -78,7 +78,7 @@
 </pre></td></tr>
             <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes  received 133 bytes  62.29 bytes/sec
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes  received 133 bytes  87.20 bytes/sec
 </pre></td></tr>
             <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/xwing.txt b/xwing.txt
index 70ac4beefcf3..a333695b5b15 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -32,7 +32,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 133
 
-sent 85 bytes  received 133 bytes  62.29 bytes/sec
+sent 85 bytes  received 133 bytes  87.20 bytes/sec
 total size is 32  speedup is 0.15
 *** syncing xwing
 *** synced xwing
diff --git a/zugaina.html b/zugaina.html
index 9ef4970c4c61..aa2ae9972e70 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -36,7 +36,7 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Number of created files: 0
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of deleted files: 1 (reg: 1)
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of deleted files: 0
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of regular files transferred: 0
 </pre></td></tr>
@@ -48,21 +48,21 @@
 </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: 42.30K
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 43.45K
 </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: 500
+            <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: 46.65K
 </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 500 bytes  received 46.65K bytes  13.47K bytes/sec
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 491 bytes  received 46.65K bytes  18.85K 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 46.44
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.19M  speedup is 46.45
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing zugaina
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index ce518c36eb0f..0324e01f84cb 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -11,20 +11,20 @@ $ pmaint sync zugaina
 
 Number of files: 1,812 (reg: 1,422, dir: 390)
 Number of created files: 0
-Number of deleted files: 1 (reg: 1)
+Number of deleted files: 0
 Number of regular files transferred: 0
 Total file size: 2.19M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 42.30K
+File list size: 43.45K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 500
+Total bytes sent: 491
 Total bytes received: 46.65K
 
-sent 500 bytes  received 46.65K bytes  13.47K bytes/sec
-total size is 2.19M  speedup is 46.44
+sent 491 bytes  received 46.65K bytes  18.85K bytes/sec
+total size is 2.19M  speedup is 46.45
 *** syncing zugaina
 *** synced zugaina
  * Sync succeeded