2024-11-14T12:30:00Z

65 files changed, 356 insertions, 431 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index b1720a1e6fe0..05aef2ef8dfe 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -56,21 +56,21 @@
 </pre></td></tr>
             <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 1.47M
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 1.46M
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 25.49K
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 25.26K
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 4.12M
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 25.49K bytes  received 4.12M bytes  2.76M bytes/sec
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 25.26K bytes  received 4.12M bytes  1.66M bytes/sec
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 98.13M  speedup is 23.69
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 98.13M  speedup is 23.70
 </pre></td></tr>
             <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced R_Overlay
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 4d88a796aa26..c913d7e3722a 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -21,14 +21,14 @@ Total file size: 98.13M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 1.47M
+File list size: 1.46M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 25.49K
+Total bytes sent: 25.26K
 Total bytes received: 4.12M
 
-sent 25.49K bytes  received 4.12M bytes  2.76M bytes/sec
-total size is 98.13M  speedup is 23.69
+sent 25.26K bytes  received 4.12M bytes  1.66M bytes/sec
+total size is 98.13M  speedup is 23.70
 *** synced R_Overlay
  * Sync succeeded
 $ stat --format=%y .
diff --git a/booboo.html b/booboo.html
index 8a4b8c2a89ea..15105d7ade6e 100644
--- a/booboo.html
+++ b/booboo.html
@@ -40,47 +40,49 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing booboo
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing booboo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced booboo
+            <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> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced booboo
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 booboo
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-mobilephone/gsm-ussd-0.4.0.25: failed sourcing ebuild: inherit requires unknown eclass: versionator.eclass
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 booboo
+</pre></td></tr>
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-mobilephone/gsm-ussd-0.4.0.25: failed sourcing ebuild: inherit requires unknown eclass: versionator.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/libsigc++-2.10.9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-libs/libsigc++-2.10.9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-util/bcunit-9999: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-util/bcunit-9999: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * games-simulation/simutrans-extended-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * games-simulation/simutrans-extended-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * games-simulation/simutrans-extended-britain128-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * games-simulation/simutrans-extended-britain128-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * games-simulation/simutrans-extended-sweden128-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * games-simulation/simutrans-extended-sweden128-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * net-libs/pjsip-2.7.2: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-libs/pjsip-2.7.2: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-misc/6tunnel-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-misc/6tunnel-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-misc/trackma-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-misc/trackma-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-wireless/rtl-ais-0.3: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * net-wireless/rtl-ais-0.3: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * net-wireless/rtl-ais-9999: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * net-wireless/rtl-ais-9999: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * sci-electronics/adms-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * sci-electronics/adms-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * sys-boot/sedutil-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * sys-boot/sedutil-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
 </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/booboo.txt b/booboo.txt
index c818ce7f8323..9d9f7cf2c754 100644
--- a/booboo.txt
+++ b/booboo.txt
@@ -13,6 +13,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo
+WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing booboo
 Already up to date.
 *** synced booboo
diff --git a/bratishkaerik-overlay.html b/bratishkaerik-overlay.html
index b6ca6d051fda..76972e7a1eda 100644
--- a/bratishkaerik-overlay.html
+++ b/bratishkaerik-overlay.html
@@ -42,21 +42,23 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bratishkaerik-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing bratishkaerik-overlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bratishkaerik-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced bratishkaerik-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced bratishkaerik-overlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 bratishkaerik-overlay
+            <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> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 bratishkaerik-overlay
+</pre></td></tr>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/bratishkaerik-overlay.txt b/bratishkaerik-overlay.txt
index 1b2266cacd0e..e9bffa71a906 100644
--- a/bratishkaerik-overlay.txt
+++ b/bratishkaerik-overlay.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bratishkaerik-overlay
+WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing bratishkaerik-overlay
 Already up to date.
 *** synced bratishkaerik-overlay
diff --git a/brother-overlay.html b/brother-overlay.html
index ef3f42cf320c..3beb1663f87f 100644
--- a/brother-overlay.html
+++ b/brother-overlay.html
@@ -42,21 +42,23 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync brother-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing brother-overlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing brother-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced brother-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced brother-overlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 brother-overlay
+            <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> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 brother-overlay
+</pre></td></tr>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/brother-overlay.txt b/brother-overlay.txt
index 885dbca0348e..41f01cbcec2e 100644
--- a/brother-overlay.txt
+++ b/brother-overlay.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync brother-overlay
+WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing brother-overlay
 Already up to date.
 *** synced brother-overlay
diff --git a/broverlay.html b/broverlay.html
index c8611708ae5c..2404f9366bab 100644
--- a/broverlay.html
+++ b/broverlay.html
@@ -64,21 +64,23 @@
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync broverlay
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing broverlay
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </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>*** syncing broverlay
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced broverlay
+            <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> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced broverlay
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 broverlay
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 broverlay
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/broverlay.txt b/broverlay.txt
index a96b3674dc89..38648c874bd7 100644
--- a/broverlay.txt
+++ b/broverlay.txt
@@ -25,6 +25,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync broverlay
+WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing broverlay
 Already up to date.
 *** synced broverlay
diff --git a/ceamac.html b/ceamac.html
index 47c007095e80..589ee9f92daf 100644
--- a/ceamac.html
+++ b/ceamac.html
@@ -46,21 +46,23 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing ceamac
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing ceamac
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced ceamac
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </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>*** synced ceamac
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 ceamac
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 ceamac
+</pre></td></tr>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/ceamac.txt b/ceamac.txt
index f9f4c398fcff..79151cc04905 100644
--- a/ceamac.txt
+++ b/ceamac.txt
@@ -16,6 +16,7 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ceamac
 WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ceamac
 Already up to date.
 *** synced ceamac
diff --git a/certbot-dns-plugins.html b/certbot-dns-plugins.html
index 711219536194..25c0fe359838 100644
--- a/certbot-dns-plugins.html
+++ b/certbot-dns-plugins.html
@@ -46,21 +46,23 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing certbot-dns-plugins
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing certbot-dns-plugins
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced certbot-dns-plugins
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </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>*** synced certbot-dns-plugins
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 certbot-dns-plugins
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 certbot-dns-plugins
+</pre></td></tr>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/certbot-dns-plugins.txt b/certbot-dns-plugins.txt
index 17f886e9a4d9..6e57bf3b25b1 100644
--- a/certbot-dns-plugins.txt
+++ b/certbot-dns-plugins.txt
@@ -16,6 +16,7 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync certbot-dns-plugins
 WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing certbot-dns-plugins
 Already up to date.
 *** synced certbot-dns-plugins
diff --git a/crossdev.html b/crossdev.html
index 4c487baed0c0..f216aed98c9b 100644
--- a/crossdev.html
+++ b/crossdev.html
@@ -42,25 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync crossdev
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing crossdev
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing crossdev
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced crossdev
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced crossdev
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 crossdev
 </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
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 crossdev
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/crossdev.txt b/crossdev.txt
index 94c39c9d9fb1..eab185a851f1 100644
--- a/crossdev.txt
+++ b/crossdev.txt
@@ -14,8 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync crossdev
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing crossdev
 Already up to date.
 *** synced crossdev
diff --git a/dargor.html b/dargor.html
index a2524b9d90b6..7a22142d9dae 100644
--- a/dargor.html
+++ b/dargor.html
@@ -42,25 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dargor
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing dargor
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing dargor
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced dargor
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced dargor
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dargor
 </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
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dargor
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dargor.txt b/dargor.txt
index 6994a7c26dab..5a19ec4d5542 100644
--- a/dargor.txt
+++ b/dargor.txt
@@ -14,8 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dargor
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing dargor
 Already up to date.
 *** synced dargor
diff --git a/darkelf.html b/darkelf.html
index 036987b5ce19..dcadb558f803 100644
--- a/darkelf.html
+++ b/darkelf.html
@@ -40,33 +40,29 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync darkelf
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing darkelf
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing darkelf
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced darkelf
 </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> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced darkelf
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 darkelf
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 darkelf
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-misc/oneko-1.3: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-misc/oneko-1.3: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-shells/zsh-syntax-highlighting-0.6.0: failed sourcing ebuild: readme.gentoo-r1: EAPI 6 not supported, (readme.gentoo-r1.eclass, line  25:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-shells/zsh-syntax-highlighting-0.6.0: failed sourcing ebuild: readme.gentoo-r1: EAPI 6 not supported, (readme.gentoo-r1.eclass, line  25:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-shells/zsh-syntax-highlighting-9999: failed sourcing ebuild: readme.gentoo-r1: EAPI 6 not supported, (readme.gentoo-r1.eclass, line  25:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-shells/zsh-syntax-highlighting-9999: failed sourcing ebuild: readme.gentoo-r1: EAPI 6 not supported, (readme.gentoo-r1.eclass, line  25:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * sys-apps/spi-tools-0.8.1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * sys-apps/spi-tools-0.8.1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</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/darkelf.txt b/darkelf.txt
index 4037c9ba6eb9..88b5babfa043 100644
--- a/darkelf.txt
+++ b/darkelf.txt
@@ -13,8 +13,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync darkelf
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing darkelf
 Already up to date.
 *** synced darkelf
diff --git a/darthgandalf-overlay.html b/darthgandalf-overlay.html
index 266e8af8e31c..47201c67f1f1 100644
--- a/darthgandalf-overlay.html
+++ b/darthgandalf-overlay.html
@@ -42,25 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync darthgandalf-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing darthgandalf-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing darthgandalf-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced darthgandalf-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced darthgandalf-overlay
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 darthgandalf-overlay
 </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
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 darthgandalf-overlay
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/darthgandalf-overlay.txt b/darthgandalf-overlay.txt
index ed20240b8c18..72cc0fc93394 100644
--- a/darthgandalf-overlay.txt
+++ b/darthgandalf-overlay.txt
@@ -14,8 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync darthgandalf-overlay
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing darthgandalf-overlay
 Already up to date.
 *** synced darthgandalf-overlay
diff --git a/defiance.html b/defiance.html
index 8d43ff9635fa..b7d59e67d32f 100644
--- a/defiance.html
+++ b/defiance.html
@@ -36,33 +36,29 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync defiance
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing defiance
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing defiance
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced defiance
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced defiance
+            <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> * Sync succeeded
+            <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 log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 defiance
 </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
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 defiance
-</pre></td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * dev-libs/ctap-2.0.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * dev-libs/ctap-2.0.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * dev-libs/libmill-1.18: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * dev-libs/libmill-1.18: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-libs/libspooky-1.0.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * dev-libs/libspooky-1.0.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * media-plugins/gst-plugins-vaapi-1.16.2: failed sourcing ebuild: multilib-build: EAPI 6 not supported, (multilib-build.eclass, line  25:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * media-plugins/gst-plugins-vaapi-1.16.2: failed sourcing ebuild: multilib-build: EAPI 6 not supported, (multilib-build.eclass, line  25:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/defiance.txt b/defiance.txt
index 82c941266819..3716ba3f048e 100644
--- a/defiance.txt
+++ b/defiance.txt
@@ -11,8 +11,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync defiance
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing defiance
 Already up to date.
 *** synced defiance
diff --git a/dev1990-overlay.html b/dev1990-overlay.html
index e408896600d7..e522e5b8e65d 100644
--- a/dev1990-overlay.html
+++ b/dev1990-overlay.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dev1990-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing dev1990-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing dev1990-overlay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced dev1990-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced dev1990-overlay
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dev1990-overlay
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dev1990-overlay
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dev1990-overlay.txt b/dev1990-overlay.txt
index 52a1b497938e..9ed4fbb737e2 100644
--- a/dev1990-overlay.txt
+++ b/dev1990-overlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dev1990-overlay
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing dev1990-overlay
 Already up to date.
 *** synced dev1990-overlay
diff --git a/didos.html b/didos.html
index 0003fa5dd4b2..b83026790e78 100644
--- a/didos.html
+++ b/didos.html
@@ -40,121 +40,119 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing didos
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing didos
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced didos
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced didos
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 didos
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 didos
-</pre></td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-admin/eselect-1.4.15: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-admin/eselect-1.4.15: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-emulation/mars-mips-4.5-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-emulation/mars-mips-4.5-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-emulation/snapd-2.34: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-emulation/snapd-2.34: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-emulation/snapd-2.34.3: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-emulation/snapd-2.34.3: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * app-emulation/snapd-2.38: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-emulation/snapd-2.38: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * app-eselect/eselect-lcdfilter-1: failed sourcing ebuild: vcs-snapshot: EAPI 6 not supported, (vcs-snapshot.eclass, line  47:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * app-eselect/eselect-lcdfilter-1: failed sourcing ebuild: vcs-snapshot: EAPI 6 not supported, (vcs-snapshot.eclass, line  47:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * app-eselect/eselect-lcdfilter-2: failed sourcing ebuild: vcs-snapshot: EAPI 6 not supported, (vcs-snapshot.eclass, line  47:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * app-eselect/eselect-lcdfilter-2: failed sourcing ebuild: vcs-snapshot: EAPI 6 not supported, (vcs-snapshot.eclass, line  47:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-misc/bucklespring-1.4.0: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * app-misc/bucklespring-1.4.0: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-misc/tmux-2.6: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-misc/tmux-2.6: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-office/dia-0.97.3-r1: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-office/dia-0.97.3-r1: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-cpp/cairomm-1.15.4-r1: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-cpp/cairomm-1.15.4-r1: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-cpp/glibmm-2.63.1: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-cpp/glibmm-2.63.1: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-java/ant-core-1.10.5-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-java/ant-core-1.10.5-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-java/ant-core-1.10.7-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-java/ant-core-1.10.7-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-java/hawtjni-runtime-1.10-r1: failed sourcing ebuild: java-pkg-2: EAPI 6 not supported, (java-pkg-2.eclass, line  21:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-java/hawtjni-runtime-1.10-r1: failed sourcing ebuild: java-pkg-2: EAPI 6 not supported, (java-pkg-2.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-java/icu4j-64.2: failed sourcing ebuild: java-pkg-2: EAPI 6 not supported, (java-pkg-2.eclass, line  21:  called die)
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-java/icu4j-64.2: failed sourcing ebuild: java-pkg-2: EAPI 6 not supported, (java-pkg-2.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-java/jansi-native-1.5-r2: failed sourcing ebuild: vcs-snapshot: EAPI 6 not supported, (vcs-snapshot.eclass, line  47:  called die)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-java/jansi-native-1.5-r2: failed sourcing ebuild: vcs-snapshot: EAPI 6 not supported, (vcs-snapshot.eclass, line  47:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-libs/libcroco-0.6.13: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-libs/libcroco-0.6.13: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-nodejs/uglify-es-3.3.9-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-nodejs/uglify-es-3.3.9-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-util/premake-5.0.0_alpha12: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-util/premake-5.0.0_alpha12: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-util/strace-4.20: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-util/strace-4.20: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-util/the_silver_searcher-2.1.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-util/the_silver_searcher-2.1.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-util/yuck-0.2.4: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-util/yuck-0.2.4: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * games-simulation/firestorm-bin-5.1.7-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * games-simulation/firestorm-bin-5.1.7-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * games-simulation/firestorm-bin-6.0.2-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * games-simulation/firestorm-bin-6.0.2-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * games-simulation/firestorm-bin-6.3.2-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * games-simulation/firestorm-bin-6.3.2-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-libs/flac-1.3.2: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-libs/flac-1.3.2: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-libs/libvorbis-1.3.5: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-libs/libvorbis-1.3.5: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * media-libs/libxcam-1.1.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-libs/libxcam-1.1.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * media-sound/shine-3.1.1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * media-sound/shine-3.1.1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * media-video/ffmpeg-4.3-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * media-video/ffmpeg-4.3-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * media-video/ffmpeg-4.3.1-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * media-video/ffmpeg-4.3.1-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-misc/curl-7.71.1-r1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-misc/curl-7.71.1-r1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-misc/curl-7.74.0-r3: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-misc/curl-7.74.0-r3: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * net-misc/rclone-bin-1.41: failed sourcing ebuild: systemd: EAPI 6 not supported, (systemd.eclass, line  32:  called die)
+            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-misc/rclone-bin-1.41: failed sourcing ebuild: systemd: EAPI 6 not supported, (systemd.eclass, line  32:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * sys-apps/fsearch-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * sys-apps/fsearch-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * sys-apps/hdparm-9.56: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
+            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * sys-apps/hdparm-9.56: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * sys-apps/miller-5.3.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * sys-apps/miller-5.3.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sys-apps/rindeal-base-system-settings-0.1: failed sourcing ebuild: udev: EAPI 6 not supported, (udev.eclass, line  44:  called die)
+            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * sys-apps/rindeal-base-system-settings-0.1: failed sourcing ebuild: udev: EAPI 6 not supported, (udev.eclass, line  44:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sys-devel/binutils-2.31.1-r6: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sys-devel/binutils-2.31.1-r6: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * sys-devel/gcc-8.2.0-r7: failed sourcing ebuild: rust: EAPI 7 not supported, (rust.eclass, line  46:  called die)
+            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sys-devel/gcc-8.2.0-r7: failed sourcing ebuild: rust: EAPI 7 not supported, (rust.eclass, line  46:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * sys-fs/fuse-2.9.7-r1: failed sourcing ebuild: linux-info: EAPI 6 not supported, (linux-info.eclass, line  32:  called die)
+            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * sys-fs/fuse-2.9.7-r1: failed sourcing ebuild: linux-info: EAPI 6 not supported, (linux-info.eclass, line  32:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * sys-fs/ntfs3g-2017.3.23: failed sourcing ebuild: inherit requires unknown eclass: ltprune.eclass
+            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * sys-fs/ntfs3g-2017.3.23: failed sourcing ebuild: inherit requires unknown eclass: ltprune.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * sys-libs/linux-syscall-support-20200415: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * sys-libs/linux-syscall-support-20200415: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * sys-process/htop-2.2.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * sys-process/htop-2.2.0: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * sys-process/lsof-4.92.1: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
+            <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * sys-process/lsof-4.92.1: failed sourcing ebuild: flag-o-matic: EAPI 6 not supported, (flag-o-matic.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * www-client/vimb-2.11-r1: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * www-client/vimb-2.11-r1: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * x11-misc/trayion-1.4-r1: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * x11-misc/trayion-1.4-r1: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * x11-misc/xclip-0.12_p20160314-r1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * x11-misc/xclip-0.12_p20160314-r1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/didos.txt b/didos.txt
index dee394e6dd0e..4161619995db 100644
--- a/didos.txt
+++ b/didos.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing didos
 Already up to date.
 *** synced didos
diff --git a/dilfridge.html b/dilfridge.html
index 733a48f99418..c3fa22e20f2e 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -48,25 +48,23 @@
 </pre></td></tr>
             <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dilfridge
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing dilfridge
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing dilfridge
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced dilfridge
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced dilfridge
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dilfridge
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dilfridge
-</pre></td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * net-print/iprint-6.503.20111114.6.5: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * net-print/iprint-6.503.20111114.6.5: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/dilfridge.txt b/dilfridge.txt
index 5d42d3cb5301..4d6202814555 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -17,7 +17,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dilfridge
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing dilfridge
 Already up to date.
 *** synced dilfridge
diff --git a/dinolay.html b/dinolay.html
index 8d27b0e3ee94..c91e4b7b64f3 100644
--- a/dinolay.html
+++ b/dinolay.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dinolay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing dinolay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing dinolay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced dinolay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced dinolay
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dinolay
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 dinolay
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dinolay.txt b/dinolay.txt
index 6732304e9832..b1f0fbe1dccf 100644
--- a/dinolay.txt
+++ b/dinolay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync dinolay
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing dinolay
 Already up to date.
 *** synced dinolay
diff --git a/displacer.html b/displacer.html
index bd1d14dd8a95..f3a715ccca70 100644
--- a/displacer.html
+++ b/displacer.html
@@ -46,27 +46,25 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync displacer
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing displacer
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing displacer
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced displacer
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced displacer
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 displacer
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 displacer
-</pre></td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * sci-libs/scikits_image-0.17.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 168:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * sci-libs/scikits_image-0.17.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 168:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * sys-apps/opencorsairlink-9999: failed sourcing ebuild: git-r3: EAPI 5 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * sys-apps/opencorsairlink-9999: failed sourcing ebuild: git-r3: EAPI 5 not supported, (git-r3.eclass, line  30:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/displacer.txt b/displacer.txt
index 8ad1c15f2093..5aed4f3ed5d4 100644
--- a/displacer.txt
+++ b/displacer.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync displacer
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing displacer
 Already up to date.
 *** synced displacer
diff --git a/distros.html b/distros.html
index 2355ca1ffaab..f0dc9a8a04c1 100644
--- a/distros.html
+++ b/distros.html
@@ -32,23 +32,21 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync distros
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing distros
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing distros
+            <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>*** synced distros
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced distros
+            <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 --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 distros
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 distros
-</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/distros.txt b/distros.txt
index 9be7c3b06a46..f9e33f6784a0 100644
--- a/distros.txt
+++ b/distros.txt
@@ -9,7 +9,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync distros
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing distros
 Already up to date.
 *** synced distros
diff --git a/djc.html b/djc.html
index 03c43e8b2f1c..5839d41f2c54 100644
--- a/djc.html
+++ b/djc.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync djc
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing djc
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing djc
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced djc
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced djc
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 djc
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 djc
-</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/djc.txt b/djc.txt
index 120231153053..37fd9ffcd05c 100644
--- a/djc.txt
+++ b/djc.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync djc
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing djc
 Already up to date.
 *** synced djc
diff --git a/gentoo.html b/gentoo.html
index 9433f1cc952c..78f5f65aacaf 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -44,29 +44,19 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/gentoo/gentoo
+            <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>   7363e2127185..ab8c249838de  master     -&gt; origin/master
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced gentoo
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 7363e2127185..ab8c249838de
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> mail-client/thunderbird/thunderbird-128.4.3.ebuild | 2 +-
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> 1 file changed, 1 insertion(+), 1 deletion(-)
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo
-</pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo.txt b/gentoo.txt
index f3c713a60a50..c22149efe889 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,12 +15,7 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
 *** syncing gentoo
-From https://github.com/gentoo/gentoo
-   7363e2127185..ab8c249838de  master     -> origin/master
-Updating 7363e2127185..ab8c249838de
-Fast-forward
- mail-client/thunderbird/thunderbird-128.4.3.ebuild | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Already up to date.
 *** synced gentoo
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/gitlab.html b/gitlab.html
index ad869a37f098..cea56e859f6a 100644
--- a/gitlab.html
+++ b/gitlab.html
@@ -36,21 +36,23 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gitlab
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing gitlab
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:gentoo-linux-surface-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-linux-surface-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </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 gitlab
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced gitlab
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced gitlab
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gitlab
+            <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> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gitlab
+</pre></td></tr>
+            <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/gitlab.txt b/gitlab.txt
index a07106af57e0..e8516fe161eb 100644
--- a/gitlab.txt
+++ b/gitlab.txt
@@ -11,6 +11,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gitlab
+WARNING:pkgcore:gentoo-linux-surface-overlay repo at '/var/lib/repo-mirror-ci/sync/gentoo-linux-surface-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gitlab
 Already up to date.
 *** synced gitlab
diff --git a/index.html b/index.html
index 010b4f90a5c1..ef29db774412 100644
--- a/index.html
+++ b/index.html
@@ -852,7 +852,7 @@
 
         </table>
 
-        <address>Generated based on results from 2024-11-14 12:18:08 UTC</address>
+        <address>Generated based on results from 2024-11-14 12:33:06 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/inode64-overlay.html b/inode64-overlay.html
index 9678184ab7f8..715665d68d7f 100644
--- a/inode64-overlay.html
+++ b/inode64-overlay.html
@@ -50,33 +50,19 @@
 </pre></td></tr>
             <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing inode64-overlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>From https://github.com/inode64/inode64-overlay
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>   1f0f284..e9bc833  main       -&gt; origin/main
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced inode64-overlay
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Updating 1f0f284..e9bc833
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> dev-util/grunt-cli/Manifest                                           | 4 ++--
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> dev-util/grunt-cli/{grunt-cli-1.4.3.ebuild =&gt; grunt-cli-1.5.0.ebuild} | 0
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 inode64-overlay
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 2 files changed, 2 insertions(+), 2 deletions(-)
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> rename dev-util/grunt-cli/{grunt-cli-1.4.3.ebuild =&gt; grunt-cli-1.5.0.ebuild} (100%)
-</pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced inode64-overlay
-</pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 inode64-overlay
-</pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/inode64-overlay.txt b/inode64-overlay.txt
index a3a8ef593ff5..9d1f959119f2 100644
--- a/inode64-overlay.txt
+++ b/inode64-overlay.txt
@@ -18,14 +18,7 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync inode64-overlay
 *** syncing inode64-overlay
-From https://github.com/inode64/inode64-overlay
-   1f0f284..e9bc833  main       -> origin/main
-Updating 1f0f284..e9bc833
-Fast-forward
- dev-util/grunt-cli/Manifest                                           | 4 ++--
- dev-util/grunt-cli/{grunt-cli-1.4.3.ebuild => grunt-cli-1.5.0.ebuild} | 0
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename dev-util/grunt-cli/{grunt-cli-1.4.3.ebuild => grunt-cli-1.5.0.ebuild} (100%)
+Already up to date.
 *** synced inode64-overlay
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/setkeh.html b/setkeh.html
index a414e5705c56..0db3fcc92a5f 100644
--- a/setkeh.html
+++ b/setkeh.html
@@ -42,29 +42,27 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync setkeh
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing setkeh
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing setkeh
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced setkeh
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced setkeh
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 setkeh
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 setkeh
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-crypt/keybase-1.0.31: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-crypt/keybase-1.0.31: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-editors/code-insiders-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-editors/code-insiders-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-dotnet/gtk-sharp-2.12.41: failed sourcing ebuild: dotnet: EAPI 6 not supported, (dotnet.eclass, line  17:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-dotnet/gtk-sharp-2.12.41: failed sourcing ebuild: dotnet: EAPI 6 not supported, (dotnet.eclass, line  17:  called die)
 </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/setkeh.txt b/setkeh.txt
index 3a0049ac5117..1566e83df18e 100644
--- a/setkeh.txt
+++ b/setkeh.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync setkeh
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing setkeh
 Already up to date.
 *** synced setkeh
diff --git a/sevz.html b/sevz.html
index 59d956af83b7..d1c4fb65dda1 100644
--- a/sevz.html
+++ b/sevz.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sevz
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sevz
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sevz
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced sevz
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sevz
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sevz
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sevz
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/sevz.txt b/sevz.txt
index 124d24d5eeae..8bbe1df87b8a 100644
--- a/sevz.txt
+++ b/sevz.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sevz
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sevz
 Already up to date.
 *** synced sevz
diff --git a/sft.html b/sft.html
index dd372fda4d15..2bbcabfe92cd 100644
--- a/sft.html
+++ b/sft.html
@@ -42,25 +42,23 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sft
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sft
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sft
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced sft
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sft
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sft
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sft
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * games-board/sabaki-0.33.3: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * games-board/sabaki-0.33.3: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/sft.txt b/sft.txt
index 553fed8d9330..f34443def435 100644
--- a/sft.txt
+++ b/sft.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sft
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sft
 Already up to date.
 *** synced sft
diff --git a/sgs.html b/sgs.html
index 50052022d025..c98897bfb3e1 100644
--- a/sgs.html
+++ b/sgs.html
@@ -42,23 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sgs
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sgs
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sgs
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced sgs
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sgs
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sgs
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sgs
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/sgs.txt b/sgs.txt
index 8ebc9bf25daa..07d4fdd69751 100644
--- a/sgs.txt
+++ b/sgs.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sgs
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sgs
 Already up to date.
 *** synced sgs
diff --git a/spring.html b/spring.html
index 7feb6c7a07ce..e82b350d39cb 100644
--- a/spring.html
+++ b/spring.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spring
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing spring
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing spring
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced spring
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced spring
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 spring
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 spring
-</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/spring.txt b/spring.txt
index 9092a290d788..66c09b5ccc62 100644
--- a/spring.txt
+++ b/spring.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spring
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing spring
 Already up to date.
 *** synced spring
diff --git a/sspreitz.html b/sspreitz.html
index 733b90edc9f7..187a4f765e23 100644
--- a/sspreitz.html
+++ b/sspreitz.html
@@ -42,47 +42,49 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sspreitz
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sspreitz
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sspreitz
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced sspreitz
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sspreitz
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sspreitz
+            <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="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.6: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sspreitz
+</pre></td></tr>
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.6: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.7: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.7: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.9: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.9: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.10: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * app-emulation/vagrant-bin-2.2.10: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * dev-python/yamllint-1.23.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 168:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-python/yamllint-1.23.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 168:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * net-im/yakyak-bin-1.5.0: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-im/yakyak-bin-1.5.0: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-vpn/nordvpn-bin-3.3.0-r4: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-vpn/nordvpn-bin-3.3.0-r4: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-vpn/nordvpn-bin-3.3.1-r3: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-vpn/nordvpn-bin-3.3.1-r3: failed sourcing ebuild: rpm: EAPI 6 not supported, (rpm.eclass, line  12:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * x11-themes/numix-cursor-theme-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * x11-themes/numix-cursor-theme-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * x11-themes/numix-gtk-theme-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * x11-themes/numix-gtk-theme-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * x11-themes/numix-icon-theme-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * x11-themes/numix-icon-theme-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * x11-themes/numix-icon-theme-circle-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * x11-themes/numix-icon-theme-circle-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * x11-themes/numix-icon-theme-square-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * x11-themes/numix-icon-theme-square-9999: failed sourcing ebuild: gnome2: EAPI 6 not supported, (gnome2.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/sspreitz.txt b/sspreitz.txt
index 63e38d74140b..87444f1e2736 100644
--- a/sspreitz.txt
+++ b/sspreitz.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sspreitz
+WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sspreitz
 Already up to date.
 *** synced sspreitz
diff --git a/steam-overlay.html b/steam-overlay.html
index 4da5f9cdec15..737d66282702 100644
--- a/steam-overlay.html
+++ b/steam-overlay.html
@@ -40,21 +40,23 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync steam-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing steam-overlay
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing steam-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced steam-overlay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced steam-overlay
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 steam-overlay
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 steam-overlay
+</pre></td></tr>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/steam-overlay.txt b/steam-overlay.txt
index 72a988221ac7..93c07cfba42e 100644
--- a/steam-overlay.txt
+++ b/steam-overlay.txt
@@ -13,6 +13,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync steam-overlay
+WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing steam-overlay
 Already up to date.
 *** synced steam-overlay
diff --git a/swegener.html b/swegener.html
index 40f4fef77f8b..ae34679b3173 100644
--- a/swegener.html
+++ b/swegener.html
@@ -106,7 +106,7 @@
 </pre></td></tr>
             <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 125 bytes  received 3.76K bytes  1.55K bytes/sec
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 125 bytes  received 3.76K bytes  1.11K bytes/sec
 </pre></td></tr>
             <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>total size is 40.21K  speedup is 10.34
 </pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index cf031a3625cd..c6d10f56334b 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -46,7 +46,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 125
 Total bytes received: 3.76K
 
-sent 125 bytes  received 3.76K bytes  1.55K bytes/sec
+sent 125 bytes  received 3.76K bytes  1.11K bytes/sec
 total size is 40.21K  speedup is 10.34
 *** synced swegener
  * Sync succeeded
diff --git a/xwing.html b/xwing.html
index d561d4b18674..5ec4389f1bc3 100644
--- a/xwing.html
+++ b/xwing.html
@@ -76,7 +76,7 @@
 </pre></td></tr>
             <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>sent 85 bytes  received 142 bytes  151.33 bytes/sec
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>sent 85 bytes  received 142 bytes  90.80 bytes/sec
 </pre></td></tr>
             <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>total size is 32  speedup is 0.14
 </pre></td></tr>
diff --git a/xwing.txt b/xwing.txt
index d49d01a31e03..3a2c565974c1 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -31,7 +31,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 142
 
-sent 85 bytes  received 142 bytes  151.33 bytes/sec
+sent 85 bytes  received 142 bytes  90.80 bytes/sec
 total size is 32  speedup is 0.14
 *** synced xwing
  * Sync succeeded
diff --git a/zugaina.html b/zugaina.html
index 4544253086db..d71c5d42a94c 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -66,7 +66,7 @@
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 160 bytes  received 8.72K bytes  5.92K bytes/sec
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 160 bytes  received 8.72K bytes  3.55K bytes/sec
 </pre></td></tr>
             <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>total size is 239.03K  speedup is 26.91
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index d6281fb1fbce..ed0a1be61ef4 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -26,7 +26,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 160
 Total bytes received: 8.72K
 
-sent 160 bytes  received 8.72K bytes  5.92K bytes/sec
+sent 160 bytes  received 8.72K bytes  3.55K bytes/sec
 total size is 239.03K  speedup is 26.91
 *** synced zugaina
  * Sync succeeded