2024-11-30T20:15:00Z

61 files changed, 360 insertions, 438 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index 55fd0ee40080..6da50d0e4bef 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.46M
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 1.47M
 </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.36K
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 25.59K
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 4.14M
 </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.36K bytes  received 4.14M bytes  1.67M bytes/sec
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 25.59K bytes  received 4.14M bytes  2.78M bytes/sec
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 99.10M  speedup is 23.80
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 99.10M  speedup is 23.79
 </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 c959550954e7..81a8e9ba9511 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -21,14 +21,14 @@ Total file size: 99.10M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 1.46M
+File list size: 1.47M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 25.36K
+Total bytes sent: 25.59K
 Total bytes received: 4.14M
 
-sent 25.36K bytes  received 4.14M bytes  1.67M bytes/sec
-total size is 99.10M  speedup is 23.80
+sent 25.59K bytes  received 4.14M bytes  2.78M bytes/sec
+total size is 99.10M  speedup is 23.79
 *** synced R_Overlay
  * Sync succeeded
 $ stat --format=%y .
diff --git a/bitcoin.html b/bitcoin.html
index f3c55fe8c336..368590274ee8 100644
--- a/bitcoin.html
+++ b/bitcoin.html
@@ -34,23 +34,21 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bitcoin
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</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="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing bitcoin
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing bitcoin
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced bitcoin
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced bitcoin
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 bitcoin
 </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 bitcoin
-</pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/bitcoin.txt b/bitcoin.txt
index 447590991283..dbec06605b5f 100644
--- a/bitcoin.txt
+++ b/bitcoin.txt
@@ -10,7 +10,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bitcoin
-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 bitcoin
 Already up to date.
 *** synced bitcoin
diff --git a/blackburn29.html b/blackburn29.html
index ef02f2d82767..c0f351f34fe3 100644
--- a/blackburn29.html
+++ b/blackburn29.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 blackburn29
 </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 blackburn29
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing blackburn29
+            <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 blackburn29
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced blackburn29
+            <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 blackburn29
 </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 blackburn29
-</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/blackburn29.txt b/blackburn29.txt
index 0977304b4da0..fb3f68511d63 100644
--- a/blackburn29.txt
+++ b/blackburn29.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync blackburn29
-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 blackburn29
 Already up to date.
 *** synced blackburn29
diff --git a/bobwya.html b/bobwya.html
index 50afb5b58afc..3c46322b05d0 100644
--- a/bobwya.html
+++ b/bobwya.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 bobwya
 </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 bobwya
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bobwya
+            <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 bobwya
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced bobwya
+            <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 bobwya
 </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 bobwya
-</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/bobwya.txt b/bobwya.txt
index f361db670591..8af080944277 100644
--- a/bobwya.txt
+++ b/bobwya.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bobwya
-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 bobwya
 Already up to date.
 *** synced bobwya
diff --git a/bombo82.html b/bombo82.html
index 9eef44851489..1c8e790abd12 100644
--- a/bombo82.html
+++ b/bombo82.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 bombo82
 </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 bombo82
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bombo82
+            <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 bombo82
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced bombo82
+            <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 bombo82
 </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 bombo82
-</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/bombo82.txt b/bombo82.txt
index 6aed9e0a6f5a..b43503d93800 100644
--- a/bombo82.txt
+++ b/bombo82.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bombo82
-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 bombo82
 Already up to date.
 *** synced bombo82
diff --git a/booboo.html b/booboo.html
index 15105d7ade6e..8a4b8c2a89ea 100644
--- a/booboo.html
+++ b/booboo.html
@@ -40,49 +40,47 @@
 </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>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 booboo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing booboo
+            <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 booboo
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced booboo
+            <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 booboo
 </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 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
+            <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
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </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-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <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
 </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-britain128-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-britain128-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> * games-simulation/simutrans-extended-sweden128-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-sweden128-9999: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </pre></td><td>[FATAL]</td></tr>
-            <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
+            <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
 </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-0.3: failed sourcing ebuild: toolchain-funcs: EAPI 6 not supported, (toolchain-funcs.eclass, line  21:  called die)
+            <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)
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <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)
 </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="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/booboo.txt b/booboo.txt
index 9d9f7cf2c754..c818ce7f8323 100644
--- a/booboo.txt
+++ b/booboo.txt
@@ -13,7 +13,6 @@
 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 76972e7a1eda..b6ca6d051fda 100644
--- a/bratishkaerik-overlay.html
+++ b/bratishkaerik-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 bratishkaerik-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 bratishkaerik-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bratishkaerik-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 bratishkaerik-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced bratishkaerik-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 bratishkaerik-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 bratishkaerik-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/bratishkaerik-overlay.txt b/bratishkaerik-overlay.txt
index e9bffa71a906..1b2266cacd0e 100644
--- a/bratishkaerik-overlay.txt
+++ b/bratishkaerik-overlay.txt
@@ -14,7 +14,6 @@
 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 3beb1663f87f..ef3f42cf320c 100644
--- a/brother-overlay.html
+++ b/brother-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 brother-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 brother-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing brother-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 brother-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced brother-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 brother-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 brother-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/brother-overlay.txt b/brother-overlay.txt
index 41f01cbcec2e..885dbca0348e 100644
--- a/brother-overlay.txt
+++ b/brother-overlay.txt
@@ -14,7 +14,6 @@
 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/ceamac.html b/ceamac.html
index 589ee9f92daf..47c007095e80 100644
--- a/ceamac.html
+++ b/ceamac.html
@@ -46,23 +46,21 @@
 </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>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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing ceamac
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing ceamac
+            <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 ceamac
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced ceamac
+            <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 ceamac
 </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 ceamac
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/ceamac.txt b/ceamac.txt
index 79151cc04905..f9f4c398fcff 100644
--- a/ceamac.txt
+++ b/ceamac.txt
@@ -16,7 +16,6 @@ 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 25c0fe359838..711219536194 100644
--- a/certbot-dns-plugins.html
+++ b/certbot-dns-plugins.html
@@ -46,23 +46,21 @@
 </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>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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing certbot-dns-plugins
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing certbot-dns-plugins
+            <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 certbot-dns-plugins
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced certbot-dns-plugins
+            <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 certbot-dns-plugins
 </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 certbot-dns-plugins
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/certbot-dns-plugins.txt b/certbot-dns-plugins.txt
index 6e57bf3b25b1..17f886e9a4d9 100644
--- a/certbot-dns-plugins.txt
+++ b/certbot-dns-plugins.txt
@@ -16,7 +16,6 @@ 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/cg.html b/cg.html
index 21309b3092ff..29a9e9f697a8 100644
--- a/cg.html
+++ b/cg.html
@@ -36,41 +36,39 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</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="l14"><td><a href="#l14"><span>14</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="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing cg
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing cg
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced cg
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced cg
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 cg
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 cg
-</pre></td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * media-gfx/oda-file-converter-19.12.0.0-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * media-gfx/oda-file-converter-19.12.0.0-r2: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * media-gfx/oda-file-converter-21.11.0.0-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * media-gfx/oda-file-converter-21.11.0.0-r1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * media-gfx/xcftools-1.0.7: 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> * media-gfx/xcftools-1.0.7: 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> * media-gfx/xcftools-1.0.7-r1: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * media-gfx/xcftools-1.0.7-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="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * media-libs/libuiohook-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * media-libs/libuiohook-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="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * media-makehuman/community-plugins-assetdownload-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * media-makehuman/community-plugins-assetdownload-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="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * media-makehuman/community-plugins-mhapi-9999: failed sourcing ebuild: git-r3: EAPI 6 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> * media-makehuman/community-plugins-mhapi-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="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * media-makehuman/makehuman-assets-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * media-makehuman/makehuman-assets-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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * x11-misc/xbindkeys-config-0.1.3: 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> * x11-misc/xbindkeys-config-0.1.3: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/cg.txt b/cg.txt
index fc93f03be71b..0c2c261b69e7 100644
--- a/cg.txt
+++ b/cg.txt
@@ -11,7 +11,6 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync cg
 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 cg
 Already up to date.
 *** synced cg
diff --git a/chiyuki-overlay.html b/chiyuki-overlay.html
index 6169641a0be3..3a7ffe710a24 100644
--- a/chiyuki-overlay.html
+++ b/chiyuki-overlay.html
@@ -42,23 +42,21 @@
 </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).
 </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>*** syncing chiyuki-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing chiyuki-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 chiyuki-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced chiyuki-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 chiyuki-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 chiyuki-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/chiyuki-overlay.txt b/chiyuki-overlay.txt
index e310e7df86d4..830eb521b15b 100644
--- a/chiyuki-overlay.txt
+++ b/chiyuki-overlay.txt
@@ -14,7 +14,6 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync chiyuki-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 chiyuki-overlay
 Already up to date.
 *** synced chiyuki-overlay
diff --git a/chymeric.html b/chymeric.html
index e1ad0c49da58..dfbfd61098d4 100644
--- a/chymeric.html
+++ b/chymeric.html
@@ -46,29 +46,31 @@
 </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 chymeric
+            <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 chymeric
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced chymeric
+            <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 chymeric
 </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 chymeric
+            <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="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-misc/mkusers-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <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 chymeric
+</pre></td></tr>
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-misc/mkusers-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="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-misc/python-dice-3.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 168:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * app-misc/python-dice-3.1.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="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * dev-python/pypubsub-4.0.3: 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/pypubsub-4.0.3: 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> * sci-libs/cosgen-9999: failed sourcing ebuild: distutils-r1: EAPI 6 not supported, (distutils-r1.eclass, line 225:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * sci-libs/cosgen-9999: failed sourcing ebuild: distutils-r1: EAPI 6 not supported, (distutils-r1.eclass, line 225:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/chymeric.txt b/chymeric.txt
index 2ee1ce420e31..cc512f762bbb 100644
--- a/chymeric.txt
+++ b/chymeric.txt
@@ -16,6 +16,7 @@ pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync chymeric
 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 chymeric
 Already up to date.
 *** synced chymeric
diff --git a/crossdev.html b/crossdev.html
index 4c487baed0c0..6f0f0790c3ee 100644
--- a/crossdev.html
+++ b/crossdev.html
@@ -44,23 +44,21 @@
 </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).
 </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>*** syncing crossdev
 </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>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced crossdev
 </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> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 crossdev
 </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="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/crossdev.txt b/crossdev.txt
index 94c39c9d9fb1..8f632af1b34b 100644
--- a/crossdev.txt
+++ b/crossdev.txt
@@ -15,7 +15,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/darkelf.html b/darkelf.html
index 036987b5ce19..3f5f6161bb0b 100644
--- a/darkelf.html
+++ b/darkelf.html
@@ -42,31 +42,29 @@
 </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).
 </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>*** syncing darkelf
 </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>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 darkelf
 </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> * 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 darkelf
 </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="l24"><td><a href="#l24"><span>24</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="l25"><td><a href="#l25"><span>25</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="l26"><td><a href="#l26"><span>26</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="l27"><td><a href="#l27"><span>27</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="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/darkelf.txt b/darkelf.txt
index 4037c9ba6eb9..be232e9b222a 100644
--- a/darkelf.txt
+++ b/darkelf.txt
@@ -14,7 +14,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/didos.html b/didos.html
index c5bcb777ab5d..df1f117facd5 100644
--- a/didos.html
+++ b/didos.html
@@ -40,119 +40,123 @@
 </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>*** syncing didos
+            <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>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="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced didos
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing didos
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced didos
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 didos
+            <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="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)
+            <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 didos
+</pre></td></tr>
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</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="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
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</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="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)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</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="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)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</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="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)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</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="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)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</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="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)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</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="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)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</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="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)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</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="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)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</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="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)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</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="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)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</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="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
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</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="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
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</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="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)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</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="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)
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</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="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)
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</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="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)
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</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="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
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</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="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)
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</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="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)
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</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="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)
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</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="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)
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</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="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
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</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="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
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</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="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
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</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="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)
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</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="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)
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</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="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)
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</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="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)
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</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="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
+            <tr class="err" id="l55"><td><a href="#l55"><span>55</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="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
+            <tr class="err" id="l56"><td><a href="#l56"><span>56</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="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)
+            <tr class="err" id="l57"><td><a href="#l57"><span>57</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="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)
+            <tr class="err" id="l58"><td><a href="#l58"><span>58</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="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)
+            <tr class="err" id="l59"><td><a href="#l59"><span>59</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="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)
+            <tr class="err" id="l60"><td><a href="#l60"><span>60</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="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)
+            <tr class="err" id="l61"><td><a href="#l61"><span>61</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="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)
+            <tr class="err" id="l62"><td><a href="#l62"><span>62</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="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)
+            <tr class="err" id="l63"><td><a href="#l63"><span>63</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="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
+            <tr class="err" id="l64"><td><a href="#l64"><span>64</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="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  48:  called die)
+            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * sys-devel/gcc-8.2.0-r7: failed sourcing ebuild: rust: EAPI 7 not supported, (rust.eclass, line  48:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <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)
+            <tr class="err" id="l66"><td><a href="#l66"><span>66</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="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
+            <tr class="err" id="l67"><td><a href="#l67"><span>67</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="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)
+            <tr class="err" id="l68"><td><a href="#l68"><span>68</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="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)
+            <tr class="err" id="l69"><td><a href="#l69"><span>69</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="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)
+            <tr class="err" id="l70"><td><a href="#l70"><span>70</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="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)
+            <tr class="err" id="l71"><td><a href="#l71"><span>71</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="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)
+            <tr class="err" id="l72"><td><a href="#l72"><span>72</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="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)
+            <tr class="err" id="l73"><td><a href="#l73"><span>73</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="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/didos.txt b/didos.txt
index 747d4f4d748c..47744ce51649 100644
--- a/didos.txt
+++ b/didos.txt
@@ -13,6 +13,8 @@
 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).
+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 didos
 Already up to date.
 *** synced didos
diff --git a/dilfridge.html b/dilfridge.html
index a7b37343a1d7..8685f37b7973 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -48,21 +48,25 @@
 </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>*** syncing dilfridge
+            <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).
 </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>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="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced dilfridge
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** syncing dilfridge
 </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>Already up to date.
 </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>*** synced dilfridge
 </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> * Sync succeeded
 </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 dilfridge
+            <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> * Cache regenerated successfully
+            <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 dilfridge
+</pre></td></tr>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dilfridge.txt b/dilfridge.txt
index 1d18552bd4bf..730b49a6ffce 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -17,6 +17,8 @@
 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).
+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 dilfridge
 Already up to date.
 *** synced dilfridge
diff --git a/dinolay.html b/dinolay.html
index c91e4b7b64f3..8d27b0e3ee94 100644
--- a/dinolay.html
+++ b/dinolay.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 dinolay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing dinolay
+            <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 dinolay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced dinolay
+            <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 dinolay
 </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 dinolay
+            <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 dinolay
+</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/dinolay.txt b/dinolay.txt
index b1f0fbe1dccf..6732304e9832 100644
--- a/dinolay.txt
+++ b/dinolay.txt
@@ -14,6 +14,7 @@
 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/gentoo.html b/gentoo.html
index ea6fde15e4b5..78f5f65aacaf 100644
--- a/gentoo.html
+++ b/gentoo.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 gentoo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</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).
+            <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>*** syncing 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>Already up to date.
+            <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>*** synced gentoo
+            <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 gentoo
 </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 gentoo
-</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/gentoo.txt b/gentoo.txt
index f52c799c5a6d..c22149efe889 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
-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 gentoo
 Already up to date.
 *** synced gentoo
diff --git a/gnome.html b/gnome.html
index 382f946d45a4..05a7dc1f74c4 100644
--- a/gnome.html
+++ b/gnome.html
@@ -44,21 +44,23 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnome
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gnome
+            <tr class="" id="l18"><td><a href="#l18"><span>18</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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gnome
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gnome
+            <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> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced gnome
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </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 gnome
+            <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> * Cache regenerated successfully
+            <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 gnome
+</pre></td></tr>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gnome.txt b/gnome.txt
index a97c8b83fb9d..5cae276406ce 100644
--- a/gnome.txt
+++ b/gnome.txt
@@ -15,6 +15,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnome
+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 gnome
 Already up to date.
 *** synced gnome
diff --git a/gnu-elpa.html b/gnu-elpa.html
index b3943b9d8837..811220b925b3 100644
--- a/gnu-elpa.html
+++ b/gnu-elpa.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 gnu-elpa
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gnu-elpa
+            <tr class="" id="l17"><td><a href="#l17"><span>17</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="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 gnu-elpa
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced gnu-elpa
+            <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 gnu-elpa
 </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 gnu-elpa
+            <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 gnu-elpa
+</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/gnu-elpa.txt b/gnu-elpa.txt
index b8a3e24420b8..b236567dca3d 100644
--- a/gnu-elpa.txt
+++ b/gnu-elpa.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnu-elpa
+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 gnu-elpa
 Already up to date.
 *** synced gnu-elpa
diff --git a/gnustep.html b/gnustep.html
index 8651d48ab3ce..41e1ee863c42 100644
--- a/gnustep.html
+++ b/gnustep.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 gnustep
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gnustep
+            <tr class="" id="l17"><td><a href="#l17"><span>17</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="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 gnustep
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced gnustep
+            <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 gnustep
 </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 gnustep
+            <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 gnustep
+</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/gnustep.txt b/gnustep.txt
index 7595800f5aa5..582aa77433bb 100644
--- a/gnustep.txt
+++ b/gnustep.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnustep
+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 gnustep
 Already up to date.
 *** synced gnustep
diff --git a/goduck777.html b/goduck777.html
index 13cde89b1dc2..2c11ecf7329f 100644
--- a/goduck777.html
+++ b/goduck777.html
@@ -42,25 +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 goduck777
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing goduck777
+            <tr class="" id="l17"><td><a href="#l17"><span>17</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="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 goduck777
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced goduck777
+            <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 goduck777
 </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 goduck777
+            <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-i18n/wordninja-rs-0.1.0: failed sourcing ebuild: cargo: EAPI 7 not supported, (cargo.eclass, line  16:  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 goduck777
+</pre></td></tr>
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-i18n/wordninja-rs-0.1.0: failed sourcing ebuild: cargo: EAPI 7 not supported, (cargo.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> * sys-fs/dua-cli-2.20.1: failed sourcing ebuild: cargo: EAPI 7 not supported, (cargo.eclass, line  16:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * sys-fs/dua-cli-2.20.1: failed sourcing ebuild: cargo: EAPI 7 not supported, (cargo.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/goduck777.txt b/goduck777.txt
index a8ac2b2a085a..de978ced382e 100644
--- a/goduck777.txt
+++ b/goduck777.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync goduck777
+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 goduck777
 Already up to date.
 *** synced goduck777
diff --git a/gogooverlay.html b/gogooverlay.html
index fd0421f839b4..d1f07a015639 100644
--- a/gogooverlay.html
+++ b/gogooverlay.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 gogooverlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gogooverlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</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="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 gogooverlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced gogooverlay
+            <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 gogooverlay
 </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 gogooverlay
+            <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 gogooverlay
+</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/gogooverlay.txt b/gogooverlay.txt
index 85996bd956d9..c180d7b6e28d 100644
--- a/gogooverlay.txt
+++ b/gogooverlay.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gogooverlay
+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 gogooverlay
 Already up to date.
 *** synced gogooverlay
diff --git a/index.html b/index.html
index b950e01c2e83..9db2f8ddea61 100644
--- a/index.html
+++ b/index.html
@@ -854,7 +854,7 @@
 
         </table>
 
-        <address>Generated based on results from 2024-11-30 20:03:11 UTC</address>
+        <address>Generated based on results from 2024-11-30 20:18:01 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/simonvanderveldt.html b/simonvanderveldt.html
index d913b365f037..d498a88aea56 100644
--- a/simonvanderveldt.html
+++ b/simonvanderveldt.html
@@ -44,31 +44,29 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync simonvanderveldt
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</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="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing simonvanderveldt
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing simonvanderveldt
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced simonvanderveldt
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced simonvanderveldt
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 simonvanderveldt
 </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 simonvanderveldt
-</pre></td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-benchmarks/unigine-heaven-bin-4.0: 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-benchmarks/unigine-heaven-bin-4.0: 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> * app-benchmarks/unigine-superposition-bin-1.1: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-benchmarks/unigine-superposition-bin-1.1: 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> * app-benchmarks/unigine-valley-bin-1.0: 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> * app-benchmarks/unigine-valley-bin-1.0: 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> * sys-apps/rpiboot-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * sys-apps/rpiboot-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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt
index ae411dc09a66..60dbe801a005 100644
--- a/simonvanderveldt.txt
+++ b/simonvanderveldt.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync simonvanderveldt
-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 simonvanderveldt
 Already up to date.
 *** synced simonvanderveldt
diff --git a/sinustrom.html b/sinustrom.html
index 33b98fd2e543..6356ada17aeb 100644
--- a/sinustrom.html
+++ b/sinustrom.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 sinustrom
 </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 sinustrom
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sinustrom
+            <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 sinustrom
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sinustrom
+            <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 sinustrom
 </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 sinustrom
-</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/sinustrom.txt b/sinustrom.txt
index 798f7d80c496..5c4a8cc88474 100644
--- a/sinustrom.txt
+++ b/sinustrom.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sinustrom
-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 sinustrom
 Already up to date.
 *** synced sinustrom
diff --git a/sk-overlay.html b/sk-overlay.html
index 933f244c0a43..08e3b427dd1f 100644
--- a/sk-overlay.html
+++ b/sk-overlay.html
@@ -40,33 +40,31 @@
 </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 sk-overlay
 </pre></td></tr>
-            <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).
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sk-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sk-overlay
+            <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 sk-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced sk-overlay
+            <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 sk-overlay
 </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 sk-overlay
-</pre></td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-misc/mangadex-scraper-0.5.1: failed sourcing ebuild: cargo: EAPI 7 not supported, (cargo.eclass, line  16:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-misc/mangadex-scraper-0.5.1: failed sourcing ebuild: cargo: EAPI 7 not supported, (cargo.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> * app-misc/sconvert-1.0.0: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-misc/sconvert-1.0.0: 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="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-misc/sconvert-1.0.1: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-misc/sconvert-1.0.1: 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="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * app-misc/sconvert-1.1.0: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line  30:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * app-misc/sconvert-1.1.0: 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="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * net-irc/hexchat-otr-0.2.2: failed sourcing ebuild: autotools: EAPI 6 not supported, (autotools.eclass, line  31:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * net-irc/hexchat-otr-0.2.2: 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="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/sk-overlay.txt b/sk-overlay.txt
index bdf0b186e635..a14bd89b9d92 100644
--- a/sk-overlay.txt
+++ b/sk-overlay.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sk-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 sk-overlay
 Already up to date.
 *** synced sk-overlay
diff --git a/stephdewit.html b/stephdewit.html
index 31893093334f..1cfe0fa72e8c 100644
--- a/stephdewit.html
+++ b/stephdewit.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 stephdewit
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing stephdewit
+            <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 stephdewit
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced stephdewit
+            <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 stephdewit
 </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 stephdewit
+            <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 stephdewit
+</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/stephdewit.txt b/stephdewit.txt
index 210786ee678f..7c32c4902cda 100644
--- a/stephdewit.txt
+++ b/stephdewit.txt
@@ -14,6 +14,7 @@
 pkgcore 0.12.28
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stephdewit
+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 stephdewit
 Already up to date.
 *** synced stephdewit
diff --git a/xwing.html b/xwing.html
index 03ec8fbe24be..50e8f6152431 100644
--- a/xwing.html
+++ b/xwing.html
@@ -76,61 +76,19 @@
 </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 141 bytes  90.40 bytes/sec
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>sent 85 bytes  received 141 bytes  64.57 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>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced xwing
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Contact Name   : webmaster@xwing.info
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ stat --format=%y .
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 xwing
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Number of files: 133 (reg: 88, dir: 45)
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Number of created files: 0
-</pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of deleted files: 0
-</pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of regular files transferred: 16
-</pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total file size: 106.07K bytes
-</pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total transferred file size: 17.23K bytes
-</pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Literal data: 17.23K bytes
-</pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>File list size: 4.34K
-</pre></td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
-            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Total bytes sent: 466
-</pre></td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Total bytes received: 10.49K
-</pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>
-</pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 466 bytes  received 10.49K bytes  3.13K bytes/sec
-</pre></td></tr>
-            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>total size is 106.07K  speedup is 9.68
-</pre></td></tr>
-            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced xwing
-</pre></td></tr>
-            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
-            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 xwing
-</pre></td></tr>
-            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/xwing.txt b/xwing.txt
index 502acc00b70e..d357fc4efaa9 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -31,29 +31,8 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 141
 
-sent 85 bytes  received 141 bytes  90.40 bytes/sec
+sent 85 bytes  received 141 bytes  64.57 bytes/sec
 total size is 32  speedup is 0.14
-This is xwing.info / alderaan.xwing.info
-
-Contact Name   : webmaster@xwing.info
-
-
-Number of files: 133 (reg: 88, dir: 45)
-Number of created files: 0
-Number of deleted files: 0
-Number of regular files transferred: 16
-Total file size: 106.07K bytes
-Total transferred file size: 17.23K bytes
-Literal data: 17.23K bytes
-Matched data: 0 bytes
-File list size: 4.34K
-File list generation time: 0.001 seconds
-File list transfer time: 0.000 seconds
-Total bytes sent: 466
-Total bytes received: 10.49K
-
-sent 466 bytes  received 10.49K bytes  3.13K bytes/sec
-total size is 106.07K  speedup is 9.68
 *** synced xwing
  * Sync succeeded
 $ stat --format=%y .
diff --git a/zugaina.html b/zugaina.html
index 95c540dd3b24..e09181999491 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.69K bytes  3.54K bytes/sec
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 160 bytes  received 8.69K bytes  5.90K 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 27.01
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index f0afb667d4e8..e4f4ae969fd7 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.69K
 
-sent 160 bytes  received 8.69K bytes  3.54K bytes/sec
+sent 160 bytes  received 8.69K bytes  5.90K bytes/sec
 total size is 239.03K  speedup is 27.01
 *** synced zugaina
  * Sync succeeded