2023-09-14T09:45:01Z

233 files changed, 1168 insertions, 1552 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index 7ba3918340ec..fce4554a0307 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -62,13 +62,13 @@
 </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: 22.95K
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 22.94K
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 3.82M
 </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 22.95K bytes  received 3.82M bytes  2.56M bytes/sec
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 22.94K bytes  received 3.82M bytes  2.56M bytes/sec
 </pre></td></tr>
             <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 90.95M  speedup is 23.69
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 3c96da45e643..eadfd6da998b 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -24,10 +24,10 @@ Matched data: 0 bytes
 File list size: 1.39M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 22.95K
+Total bytes sent: 22.94K
 Total bytes received: 3.82M
 
-sent 22.95K bytes  received 3.82M bytes  2.56M bytes/sec
+sent 22.94K bytes  received 3.82M bytes  2.56M bytes/sec
 total size is 90.95M  speedup is 23.69
 *** synced R_Overlay
  * Sync succeeded
diff --git a/fidonet.html b/fidonet.html
index 91f61accfc51..928943889260 100644
--- a/fidonet.html
+++ b/fidonet.html
@@ -70,7 +70,7 @@
 </pre></td></tr>
             <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>sent 85 bytes  received 133 bytes  87.20 bytes/sec
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>sent 85 bytes  received 133 bytes  62.29 bytes/sec
 </pre></td></tr>
             <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/fidonet.txt b/fidonet.txt
index b9db079f32e7..b6a57c1e2284 100644
--- a/fidonet.txt
+++ b/fidonet.txt
@@ -28,7 +28,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 133
 
-sent 85 bytes  received 133 bytes  87.20 bytes/sec
+sent 85 bytes  received 133 bytes  62.29 bytes/sec
 total size is 32  speedup is 0.15
 *** synced fidonet
  * Sync succeeded
diff --git a/flewkey-overlay.html b/flewkey-overlay.html
index d9b5a5697c96..0630826ad57b 100644
--- a/flewkey-overlay.html
+++ b/flewkey-overlay.html
@@ -34,25 +34,23 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync flewkey-overlay
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync flewkey-overlay
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing flewkey-overlay
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing flewkey-overlay
+            <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>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;...
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced flewkey-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced flewkey-overlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 flewkey-overlay
 </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 flewkey-overlay
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/flewkey-overlay.txt b/flewkey-overlay.txt
index 365d86050ec1..33e7cc68512f 100644
--- a/flewkey-overlay.txt
+++ b/flewkey-overlay.txt
@@ -10,10 +10,9 @@
  'status': 'unofficial'}
 pkgcore 0.12.21
 
- * Adding new repository
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync flewkey-overlay
 *** syncing flewkey-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/flewkey-overlay'...
+Already up to date.
 *** synced flewkey-overlay
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/fordfrog.html b/fordfrog.html
index 3f7be07def9f..5a3963f0a63c 100644
--- a/fordfrog.html
+++ b/fordfrog.html
@@ -44,23 +44,21 @@
 </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 fordfrog
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 fordfrog
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing fordfrog
+            <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 fordfrog
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced fordfrog
+            <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 fordfrog
 </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 fordfrog
-</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/fordfrog.txt b/fordfrog.txt
index b866cea5e1b8..5bc7bb949254 100644
--- a/fordfrog.txt
+++ b/fordfrog.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync fordfrog
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing fordfrog
 Already up to date.
 *** synced fordfrog
diff --git a/fortunelay.html b/fortunelay.html
index da7d2d9ba9f1..b90dabb30cee 100644
--- a/fortunelay.html
+++ b/fortunelay.html
@@ -42,25 +42,23 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync fortunelay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 fortunelay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing fortunelay
+            <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 fortunelay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced fortunelay
+            <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 fortunelay
 </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 fortunelay
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * games-misc/fortune-mod-french-0.03: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * games-misc/fortune-mod-french-0.03: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/fortunelay.txt b/fortunelay.txt
index 6c3ead821962..aa0e9b735f0c 100644
--- a/fortunelay.txt
+++ b/fortunelay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync fortunelay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing fortunelay
 Already up to date.
 *** synced fortunelay
diff --git a/fowlay.html b/fowlay.html
index c0b9d0138a36..57fe7a9ea82b 100644
--- a/fowlay.html
+++ b/fowlay.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 fowlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 fowlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing fowlay
+            <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 fowlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced fowlay
+            <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 fowlay
 </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 fowlay
-</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/fowlay.txt b/fowlay.txt
index 617a42a26960..5c283ded09a5 100644
--- a/fowlay.txt
+++ b/fowlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync fowlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing fowlay
 Already up to date.
 *** synced fowlay
diff --git a/foxiverlay.html b/foxiverlay.html
index 8fd35fdad325..97525396e25c 100644
--- a/foxiverlay.html
+++ b/foxiverlay.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync foxiverlay
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing foxiverlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing foxiverlay
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced foxiverlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced foxiverlay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 foxiverlay
 </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 foxiverlay
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/foxiverlay.txt b/foxiverlay.txt
index 58b8a0b06b94..d9afea79834b 100644
--- a/foxiverlay.txt
+++ b/foxiverlay.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync foxiverlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing foxiverlay
 Already up to date.
 *** synced foxiverlay
diff --git a/fritteli.html b/fritteli.html
index 9d95fcb27752..75cce31da112 100644
--- a/fritteli.html
+++ b/fritteli.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 fritteli
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 fritteli
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing fritteli
+            <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 fritteli
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced fritteli
+            <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 fritteli
 </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 fritteli
-</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/fritteli.txt b/fritteli.txt
index 75634350d85d..f94226452376 100644
--- a/fritteli.txt
+++ b/fritteli.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync fritteli
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing fritteli
 Already up to date.
 *** synced fritteli
diff --git a/frr-gentoo.html b/frr-gentoo.html
index 9d88bd567db8..0432e713c716 100644
--- a/frr-gentoo.html
+++ b/frr-gentoo.html
@@ -42,27 +42,25 @@
 </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 frr-gentoo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 frr-gentoo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing frr-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 frr-gentoo
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced frr-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 frr-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 frr-gentoo
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * net-libs/rtrlib-0.8.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * net-libs/rtrlib-0.8.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * net-libs/rtrlib-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * net-libs/rtrlib-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/frr-gentoo.txt b/frr-gentoo.txt
index 455be20c3a2c..5db2ccfeabd0 100644
--- a/frr-gentoo.txt
+++ b/frr-gentoo.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync frr-gentoo
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing frr-gentoo
 Already up to date.
 *** synced frr-gentoo
diff --git a/fyn-overlay.html b/fyn-overlay.html
index 8d378411f5d5..ba5478574325 100644
--- a/fyn-overlay.html
+++ b/fyn-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 fyn-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 fyn-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing fyn-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 fyn-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced fyn-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 fyn-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 fyn-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/fyn-overlay.txt b/fyn-overlay.txt
index 7f842da17c09..3b206908d113 100644
--- a/fyn-overlay.txt
+++ b/fyn-overlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync fyn-overlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing fyn-overlay
 Already up to date.
 *** synced fyn-overlay
diff --git a/gamerlay.html b/gamerlay.html
index 1a3dea1badff..21e889b771d2 100644
--- a/gamerlay.html
+++ b/gamerlay.html
@@ -52,101 +52,99 @@
 </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-sync/etc/portage sync gamerlay
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** syncing gamerlay
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing gamerlay
+            <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>Already up to date.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced gamerlay
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced gamerlay
+            <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> * Sync succeeded
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
+            <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>$ git show -q --pretty=format:%G? HEAD
+            <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 gamerlay
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gamerlay
-</pre></td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * games-action/cave_story_plus-100-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * games-action/cave_story_plus-100-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * games-action/deadlysoccerball-0.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * games-action/deadlysoccerball-0.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * games-action/fieldrunners-1.0.0-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * games-action/fieldrunners-1.0.0-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * games-action/hammerfight-20110812: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * games-action/hammerfight-20110812: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * games-action/psychonauts-2013.05.06: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * games-action/psychonauts-2013.05.06: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * games-action/rochard-1.42: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * games-action/rochard-1.42: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * games-action/shadowgrounds-bin-1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * games-action/shadowgrounds-bin-1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * games-action/shadowgrounds-survivor-bin-1-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * games-action/shadowgrounds-survivor-bin-1-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * games-action/supertirititran-0.9: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * games-action/supertirititran-0.9: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * games-arcade/capsized-2013.10.06: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * games-arcade/capsized-2013.10.06: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * games-arcade/edge-20130703: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * games-arcade/edge-20130703: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * games-arcade/funkysmugglers-20130613: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * games-arcade/funkysmugglers-20130613: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * games-arcade/gianasreturn-1.10: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * games-arcade/gianasreturn-1.10: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.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> * games-arcade/jamestown-1.0.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * games-arcade/jamestown-1.0.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.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> * games-arcade/metalslug3-2014.06.09: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * games-arcade/metalslug3-2014.06.09: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * games-arcade/rush-20130703: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * games-arcade/rush-20130703: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-arcade/shatter-1.0.20130609: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * games-arcade/shatter-1.0.20130609: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * games-arcade/sleepwalker-20130613: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * games-arcade/sleepwalker-20130613: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * games-arcade/stealthbastarddeluxe-1.63.4: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * games-arcade/stealthbastarddeluxe-1.63.4: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * games-arcade/supermeatboy-2013.11.11-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * games-arcade/supermeatboy-2013.11.11-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * games-arcade/tokitori-20130703: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * games-arcade/tokitori-20130703: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * games-puzzle/braid-1.0.2-r9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * games-puzzle/braid-1.0.2-r9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * games-puzzle/closure-1.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * games-puzzle/closure-1.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * games-puzzle/cogs-20110811-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * games-puzzle/cogs-20110811-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * games-puzzle/osmos-1.6.1-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * games-puzzle/osmos-1.6.1-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * games-puzzle/spacechem-1012-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * games-puzzle/spacechem-1012-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * games-puzzle/vessel-2013.02.22: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * games-puzzle/vessel-2013.02.22: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * games-puzzle/zen-puzzle-garden-1.4.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * games-puzzle/zen-puzzle-garden-1.4.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * games-puzzle/zenbound2-20120325-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * games-puzzle/zenbound2-20120325-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * games-rpg/machinarium-1.0-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * games-rpg/machinarium-1.0-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.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> * games-rpg/torchlight-1.15.20130521-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * games-rpg/torchlight-1.15.20130521-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * games-rpg/zeldaolb-3.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * games-rpg/zeldaolb-3.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * games-rpg/zeldaroth-6.11: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * games-rpg/zeldaroth-6.11: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * games-strategy/anomaly-20130402-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * games-strategy/anomaly-20130402-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * games-strategy/anomaly-korea-20130613-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * games-strategy/anomaly-korea-20130613-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * games-strategy/anomaly-mobilecampaign-20130613-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * games-strategy/anomaly-mobilecampaign-20130613-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * games-strategy/swordsandsoldiers-20120325-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * games-strategy/swordsandsoldiers-20120325-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * games-strategy/uplink-1.6-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * games-strategy/uplink-1.6-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * games-strategy/worms-reloaded-20131016-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * games-strategy/worms-reloaded-20131016-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/gamerlay.txt b/gamerlay.txt
index 552d7a998e6f..425003ed00fb 100644
--- a/gamerlay.txt
+++ b/gamerlay.txt
@@ -19,7 +19,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gamerlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gamerlay
 Already up to date.
 *** synced gamerlay
diff --git a/gbrlsnchs.html b/gbrlsnchs.html
index 906278024f2e..bf15cb2684f4 100644
--- a/gbrlsnchs.html
+++ b/gbrlsnchs.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gbrlsnchs
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gbrlsnchs
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gbrlsnchs
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced gbrlsnchs
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced gbrlsnchs
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gbrlsnchs
 </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 gbrlsnchs
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gbrlsnchs.txt b/gbrlsnchs.txt
index 2a4d1f7d37de..b89a51288c05 100644
--- a/gbrlsnchs.txt
+++ b/gbrlsnchs.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gbrlsnchs
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gbrlsnchs
 Already up to date.
 *** synced gbrlsnchs
diff --git a/gentoo-bootstrap.html b/gentoo-bootstrap.html
index c19b056e953f..47ec3a94a340 100644
--- a/gentoo-bootstrap.html
+++ b/gentoo-bootstrap.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-bootstrap
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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-bootstrap
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gentoo-bootstrap
+            <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-bootstrap
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gentoo-bootstrap
+            <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-bootstrap
 </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-bootstrap
-</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-bootstrap.txt b/gentoo-bootstrap.txt
index 846a0482e4a2..b448757a1068 100644
--- a/gentoo-bootstrap.txt
+++ b/gentoo-bootstrap.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo-bootstrap
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo-bootstrap
 Already up to date.
 *** synced gentoo-bootstrap
diff --git a/gentoo-linux-surface-overlay.html b/gentoo-linux-surface-overlay.html
index 9352e970b38e..d11de35f3014 100644
--- a/gentoo-linux-surface-overlay.html
+++ b/gentoo-linux-surface-overlay.html
@@ -44,23 +44,21 @@
 </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 gentoo-linux-surface-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gentoo-linux-surface-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gentoo-linux-surface-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gentoo-linux-surface-overlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced gentoo-linux-surface-overlay
+            <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 gentoo-linux-surface-overlay
 </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 gentoo-linux-surface-overlay
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo-linux-surface-overlay.txt b/gentoo-linux-surface-overlay.txt
index e980f6355f55..90def57e4a23 100644
--- a/gentoo-linux-surface-overlay.txt
+++ b/gentoo-linux-surface-overlay.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo-linux-surface-overlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo-linux-surface-overlay
 Already up to date.
 *** synced gentoo-linux-surface-overlay
diff --git a/gentoo-unity7.html b/gentoo-unity7.html
index 88932ea9db82..c0d97c62ba1b 100644
--- a/gentoo-unity7.html
+++ b/gentoo-unity7.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo-unity7
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gentoo-unity7
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gentoo-unity7
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced gentoo-unity7
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced gentoo-unity7
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo-unity7
 </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 gentoo-unity7
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo-unity7.txt b/gentoo-unity7.txt
index 6163b522a2ce..166cd57b8638 100644
--- a/gentoo-unity7.txt
+++ b/gentoo-unity7.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo-unity7
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo-unity7
 Already up to date.
 *** synced gentoo-unity7
diff --git a/gentoo-zh.html b/gentoo-zh.html
index f0b2e6f939b0..35eb05e0374a 100644
--- a/gentoo-zh.html
+++ b/gentoo-zh.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo-zh
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gentoo-zh
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo-zh
+            <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 gentoo-zh
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced gentoo-zh
+            <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 gentoo-zh
 </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 gentoo-zh
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo-zh.txt b/gentoo-zh.txt
index c946dcc91903..bc49a338d257 100644
--- a/gentoo-zh.txt
+++ b/gentoo-zh.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo-zh
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo-zh
 Already up to date.
 *** synced gentoo-zh
diff --git a/gentoo.html b/gentoo.html
index c257c3808100..0113f18d883c 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -42,41 +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:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gentoo
+            <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>From https://anongit.gentoo.org/git/repo/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>   c873e809cc26..4bf5d818a660  master     -&gt; origin/master
+            <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>Updating c873e809cc26..4bf5d818a660
+            <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>Fast-forward
+            <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> dev-python/mdx-gh-links/mdx-gh-links-0.3.1.ebuild                   | 2 +-
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> x11-misc/py3status/Manifest                                         | 2 +-
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> x11-misc/py3status/{py3status-3.52.ebuild =&gt; py3status-3.53.ebuild} | 0
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 3 files changed, 2 insertions(+), 2 deletions(-)
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> rename x11-misc/py3status/{py3status-3.52.ebuild =&gt; py3status-3.53.ebuild} (100%)
-</pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo
-</pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</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 45724dec048b..847c540c3cab 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -14,18 +14,8 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo
-From https://anongit.gentoo.org/git/repo/gentoo
-   c873e809cc26..4bf5d818a660  master     -> origin/master
-Updating c873e809cc26..4bf5d818a660
-Fast-forward
- dev-python/mdx-gh-links/mdx-gh-links-0.3.1.ebuild                   | 2 +-
- x11-misc/py3status/Manifest                                         | 2 +-
- x11-misc/py3status/{py3status-3.52.ebuild => py3status-3.53.ebuild} | 0
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename x11-misc/py3status/{py3status-3.52.ebuild => py3status-3.53.ebuild} (100%)
+Already up to date.
 *** synced gentoo
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/gentoobr.html b/gentoobr.html
index 5bfbbfeee9e0..c57882710671 100644
--- a/gentoobr.html
+++ b/gentoobr.html
@@ -58,41 +58,39 @@
 </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-sync/etc/portage sync gentoobr
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing gentoobr
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing gentoobr
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced gentoobr
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced gentoobr
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoobr
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoobr
-</pre></td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/deezer-py-0.0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * dev-python/deezer-py-0.0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-python/deezer-py-1.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/deezer-py-1.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-python/deezer-py-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/deezer-py-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/spotipy-2.17.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/spotipy-2.17.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/spotipy-2.18.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/spotipy-2.18.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-python/spotipy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/spotipy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-misc/deemix-py-2.0.16: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-misc/deemix-py-2.0.16: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-misc/deemix-py-3.0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-misc/deemix-py-3.0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-misc/deemix-py-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-misc/deemix-py-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/gentoobr.txt b/gentoobr.txt
index 5ef536d41523..de4d9316d2f4 100644
--- a/gentoobr.txt
+++ b/gentoobr.txt
@@ -22,7 +22,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoobr
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoobr
 Already up to date.
 *** synced gentoobr
diff --git a/gerislay.html b/gerislay.html
index 51c275385c2d..e9cf5d57330b 100644
--- a/gerislay.html
+++ b/gerislay.html
@@ -48,27 +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 gerislay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing gerislay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing gerislay
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced gerislay
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced gerislay
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gerislay
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gerislay
-</pre></td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * media-gfx/leocad-23.03: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * media-gfx/leocad-23.03: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * sys-kernel/hwmon-it87-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * sys-kernel/hwmon-it87-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/gerislay.txt b/gerislay.txt
index 7c78886bfb6a..27cc598cc2d1 100644
--- a/gerislay.txt
+++ b/gerislay.txt
@@ -17,7 +17,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gerislay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gerislay
 Already up to date.
 *** synced gerislay
diff --git a/gig.html b/gig.html
index d0ad58528ee9..cd0226567870 100644
--- a/gig.html
+++ b/gig.html
@@ -34,39 +34,37 @@
 </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 gig
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gig
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing gig
+            <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 gig
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced gig
+            <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 gig
 </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 gig
-</pre></td></tr>
-            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-admin/cockpit-293: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * app-admin/cockpit-293: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-admin/cockpit-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-admin/cockpit-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-misc/urlview-0.9_p21: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-misc/urlview-0.9_p21: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * media-sound/scdl-1.3.3_beta1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * media-sound/scdl-1.3.3_beta1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-sound/scdl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * media-sound/scdl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * x11-misc/optimus-manager-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * x11-misc/optimus-manager-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * x11-terms/termite-13: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * x11-terms/termite-13: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * x11-terms/termite-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * x11-terms/termite-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/gig.txt b/gig.txt
index 9f3859800be3..a4195b7c7d90 100644
--- a/gig.txt
+++ b/gig.txt
@@ -10,7 +10,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gig
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gig
 Already up to date.
 *** synced gig
diff --git a/gitlab.html b/gitlab.html
index af0df84c7e35..ed57373059ac 100644
--- a/gitlab.html
+++ b/gitlab.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gitlab
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gitlab
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gitlab
+            <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 gitlab
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced gitlab
+            <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 gitlab
 </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 gitlab
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gitlab.txt b/gitlab.txt
index 6e625c8c8fbb..01323b5417a1 100644
--- a/gitlab.txt
+++ b/gitlab.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gitlab
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gitlab
 Already up to date.
 *** synced gitlab
diff --git a/gnome.html b/gnome.html
index dc401e91733e..d016e2e0934b 100644
--- a/gnome.html
+++ b/gnome.html
@@ -44,23 +44,21 @@
 </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>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gnome
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gnome
+            <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 gnome
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced gnome
+            <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 gnome
 </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 gnome
-</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/gnome.txt b/gnome.txt
index 06a9a84e6ccc..f0e1febb0a89 100644
--- a/gnome.txt
+++ b/gnome.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnome
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-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 dfbf163ef371..443ccfc8b8f9 100644
--- a/gnu-elpa.html
+++ b/gnu-elpa.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 gnu-elpa
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gnu-elpa
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gnu-elpa
+            <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 gnu-elpa
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gnu-elpa
+            <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 gnu-elpa
 </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 gnu-elpa
-</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/gnu-elpa.txt b/gnu-elpa.txt
index 71c51c627e3b..d80a98079499 100644
--- a/gnu-elpa.txt
+++ b/gnu-elpa.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnu-elpa
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-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/gnuradio.html b/gnuradio.html
index 597e861352e3..56e6267ca5e5 100644
--- a/gnuradio.html
+++ b/gnuradio.html
@@ -38,273 +38,271 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnuradio
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gnuradio
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gnuradio
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced gnuradio
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced gnuradio
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gnuradio
 </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 gnuradio
-</pre></td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * net-libs/libad9361-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * net-libs/libad9361-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * net-libs/libiio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * net-libs/libiio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * net-wireless/gnuradio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * net-wireless/gnuradio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * net-wireless/gr-acars2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * net-wireless/gr-acars2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * net-wireless/gr-adsb-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * net-wireless/gr-adsb-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * net-wireless/gr-air-modes-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * net-wireless/gr-air-modes-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * net-wireless/gr-ais-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * net-wireless/gr-ais-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-wireless/gr-ale-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * net-wireless/gr-ale-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-wireless/gr-ambe3000-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-wireless/gr-ambe3000-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-wireless/gr-amps-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-wireless/gr-amps-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.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/gr-analysis-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-wireless/gr-analysis-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * net-wireless/gr-ax25-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * net-wireless/gr-ax25-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-wireless/gr-baz-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * net-wireless/gr-baz-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-wireless/gr-benchmark-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-wireless/gr-benchmark-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-wireless/gr-bluetooth-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-wireless/gr-bluetooth-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-wireless/gr-bokehgui-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-wireless/gr-bokehgui-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-wireless/gr-bruninga-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-wireless/gr-bruninga-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-wireless/gr-burst-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-wireless/gr-burst-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-wireless/gr-cdma-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-wireless/gr-cdma-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * net-wireless/gr-clenabled-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-wireless/gr-clenabled-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * net-wireless/gr-compat-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * net-wireless/gr-compat-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * net-wireless/gr-correctiq-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * net-wireless/gr-correctiq-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * net-wireless/gr-csp-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * net-wireless/gr-csp-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * net-wireless/gr-dab-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * net-wireless/gr-dab-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * net-wireless/gr-dect2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * net-wireless/gr-dect2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * net-wireless/gr-display-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * net-wireless/gr-display-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-wireless/gr-doa-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * net-wireless/gr-doa-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-wireless/gr-drm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-wireless/gr-drm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-wireless/gr-dsd-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-wireless/gr-dsd-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-wireless/gr-dsss-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-wireless/gr-dsss-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-wireless/gr-dvbs2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-wireless/gr-dvbs2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-wireless/gr-dvbt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-wireless/gr-dvbt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-wireless/gr-dvbt2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-wireless/gr-dvbt2-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-wireless/gr-eb200-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-wireless/gr-eb200-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-wireless/gr-elster-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-wireless/gr-elster-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * net-wireless/gr-ettus-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-wireless/gr-ettus-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * net-wireless/gr-eventstream-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * net-wireless/gr-eventstream-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * net-wireless/gr-fbmc-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * net-wireless/gr-fbmc-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * net-wireless/gr-fcdproplus-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * net-wireless/gr-fcdproplus-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * net-wireless/gr-filerepeater-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * net-wireless/gr-filerepeater-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * net-wireless/gr-finite-stream-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * net-wireless/gr-finite-stream-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * net-wireless/gr-flarm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * net-wireless/gr-flarm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * net-wireless/gr-flexfft-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * net-wireless/gr-flexfft-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * net-wireless/gr-fm0-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * net-wireless/gr-fm0-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * net-wireless/gr-foo-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * net-wireless/gr-foo-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * net-wireless/gr-fosphor-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * net-wireless/gr-fosphor-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * net-wireless/gr-framers-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * net-wireless/gr-framers-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * net-wireless/gr-fsk-burst-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * net-wireless/gr-fsk-burst-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * net-wireless/gr-gpredict-doppler-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * net-wireless/gr-gpredict-doppler-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * net-wireless/gr-gps-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * net-wireless/gr-gps-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * net-wireless/gr-grnet-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * net-wireless/gr-grnet-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * net-wireless/gr-gsm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * net-wireless/gr-gsm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * net-wireless/gr-ham-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * net-wireless/gr-ham-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * net-wireless/gr-hpsdr-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * net-wireless/gr-hpsdr-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * net-wireless/gr-husban-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * net-wireless/gr-husban-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * net-wireless/gr-ieee80211-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * net-wireless/gr-ieee80211-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * net-wireless/gr-ieee802154-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * net-wireless/gr-ieee802154-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * net-wireless/gr-iio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * net-wireless/gr-iio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * net-wireless/gr-inspector-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * net-wireless/gr-inspector-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * net-wireless/gr-iqbal-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * net-wireless/gr-iqbal-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * net-wireless/gr-iridium-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * net-wireless/gr-iridium-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * net-wireless/gr-isdbt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * net-wireless/gr-isdbt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * net-wireless/gr-keyfob-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * net-wireless/gr-keyfob-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * net-wireless/gr-kiss-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * net-wireless/gr-kiss-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * net-wireless/gr-lacrosse-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * net-wireless/gr-lacrosse-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * net-wireless/gr-ldpc-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * net-wireless/gr-ldpc-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * net-wireless/gr-lfast-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * net-wireless/gr-lfast-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * net-wireless/gr-lilacsat-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * net-wireless/gr-lilacsat-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * net-wireless/gr-lora-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * net-wireless/gr-lora-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * net-wireless/gr-lpwan-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * net-wireless/gr-lpwan-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * net-wireless/gr-lte-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * net-wireless/gr-lte-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * net-wireless/gr-mac-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * net-wireless/gr-mac-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * net-wireless/gr-mapper-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * net-wireless/gr-mapper-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * net-wireless/gr-mediatools-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * net-wireless/gr-mediatools-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * net-wireless/gr-mer-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * net-wireless/gr-mer-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * net-wireless/gr-message_tools-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * net-wireless/gr-message_tools-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * net-wireless/gr-microtelecom-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * net-wireless/gr-microtelecom-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * net-wireless/gr-mixalot-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * net-wireless/gr-mixalot-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * net-wireless/gr-multimon-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * net-wireless/gr-multimon-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> * net-wireless/gr-nacl-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * net-wireless/gr-nacl-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> * net-wireless/gr-nmea-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> * net-wireless/gr-nmea-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> * net-wireless/gr-nordic-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> * net-wireless/gr-nordic-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> * net-wireless/gr-nrsc5-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> * net-wireless/gr-nrsc5-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> * net-wireless/gr-ofdm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> * net-wireless/gr-ofdm-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> * net-wireless/gr-op25-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> * net-wireless/gr-op25-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> * net-wireless/gr-osmosdr-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> * net-wireless/gr-osmosdr-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> * net-wireless/gr-outernet-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> * net-wireless/gr-outernet-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> * net-wireless/gr-packetradio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> * net-wireless/gr-packetradio-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> * net-wireless/gr-pager-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> * net-wireless/gr-pager-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> * net-wireless/gr-paint-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> * net-wireless/gr-paint-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> * net-wireless/gr-pcap-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> * net-wireless/gr-pcap-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> * net-wireless/gr-pico-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> * net-wireless/gr-pico-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> * net-wireless/gr-pocsag-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> * net-wireless/gr-pocsag-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> * net-wireless/gr-polaris-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> * net-wireless/gr-polaris-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> * net-wireless/gr-psk-burst-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> * net-wireless/gr-psk-burst-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> * net-wireless/gr-psk31-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> * net-wireless/gr-psk31-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> * net-wireless/gr-pyqt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> * net-wireless/gr-pyqt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> * net-wireless/gr-ra_blocks-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> * net-wireless/gr-ra_blocks-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> * net-wireless/gr-radar-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> * net-wireless/gr-radar-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> * net-wireless/gr-rds-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> * net-wireless/gr-rds-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> * net-wireless/gr-remotecar-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> * net-wireless/gr-remotecar-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> * net-wireless/gr-reveng-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> * net-wireless/gr-reveng-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> * net-wireless/gr-rftap-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> * net-wireless/gr-rftap-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> * net-wireless/gr-rstt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> * net-wireless/gr-rstt-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> * net-wireless/gr-rtty-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> * net-wireless/gr-rtty-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> * net-wireless/gr-satellites-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> * net-wireless/gr-satellites-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> * net-wireless/gr-satnogs-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> * net-wireless/gr-satnogs-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> * net-wireless/gr-signal_exciter-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> * net-wireless/gr-signal_exciter-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> * net-wireless/gr-smartnet-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> * net-wireless/gr-smartnet-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> * net-wireless/gr-smithchart-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> * net-wireless/gr-smithchart-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> * net-wireless/gr-specest-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> * net-wireless/gr-specest-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> * net-wireless/gr-streamsink-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> * net-wireless/gr-streamsink-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> * net-wireless/gr-supacars-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> * net-wireless/gr-supacars-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> * net-wireless/gr-symbolrate-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> * net-wireless/gr-symbolrate-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> * net-wireless/gr-tagutils-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> * net-wireless/gr-tagutils-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> * net-wireless/gr-tf-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> * net-wireless/gr-tf-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> * net-wireless/gr-theano-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> * net-wireless/gr-theano-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> * net-wireless/gr-tpms-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> * net-wireless/gr-tpms-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> * net-wireless/gr-tutorial-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> * net-wireless/gr-tutorial-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> * net-wireless/gr-uhdgps-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> * net-wireless/gr-uhdgps-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> * net-wireless/gr-ysf-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> * net-wireless/gr-ysf-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> * net-wireless/gr-zmqblocks-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> * net-wireless/gr-zmqblocks-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> * net-wireless/uhd-3.15.0.0-r1: failed sourcing ebuild: python-single-r1: EAPI 6 not supported, (python-single-r1.eclass, line  42:  called die)
+            <tr class="err" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> * net-wireless/uhd-3.15.0.0-r1: failed sourcing ebuild: python-single-r1: EAPI 6 not supported, (python-single-r1.eclass, line  42:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> * net-wireless/uhd-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> * net-wireless/uhd-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> * sci-libs/volk-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
+            <tr class="err" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> * sci-libs/volk-9999: failed sourcing ebuild: inherit requires unknown eclass: cmake-utils.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/gnuradio.txt b/gnuradio.txt
index e403f92a204d..93668f6f5b87 100644
--- a/gnuradio.txt
+++ b/gnuradio.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnuradio
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gnuradio
 Already up to date.
 *** synced gnuradio
diff --git a/gnustep.html b/gnustep.html
index 06d2e126a47e..c1afd3c4e438 100644
--- a/gnustep.html
+++ b/gnustep.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 gnustep
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gnustep
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gnustep
+            <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 gnustep
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gnustep
+            <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 gnustep
 </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 gnustep
-</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/gnustep.txt b/gnustep.txt
index 826898bf7cd7..65cbb51683d1 100644
--- a/gnustep.txt
+++ b/gnustep.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gnustep
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-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 f3ec9e268503..83f90425eff7 100644
--- a/goduck777.html
+++ b/goduck777.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 goduck777
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 goduck777
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing goduck777
+            <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 goduck777
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced goduck777
+            <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 goduck777
 </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 goduck777
-</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/goduck777.txt b/goduck777.txt
index c346f2fd4c2e..40f7e0d35094 100644
--- a/goduck777.txt
+++ b/goduck777.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync goduck777
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-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 adf251db1dad..fc6ec60d1d57 100644
--- a/gogooverlay.html
+++ b/gogooverlay.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 gogooverlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gogooverlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gogooverlay
+            <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 gogooverlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gogooverlay
+            <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 gogooverlay
 </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 gogooverlay
-</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/gogooverlay.txt b/gogooverlay.txt
index e51b7c06dccb..a8186d626268 100644
--- a/gogooverlay.txt
+++ b/gogooverlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gogooverlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-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/graaff.html b/graaff.html
index 744a29709000..cab5eb987005 100644
--- a/graaff.html
+++ b/graaff.html
@@ -48,23 +48,21 @@
 </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 graaff
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing graaff
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing graaff
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced graaff
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced graaff
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 graaff
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 graaff
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/graaff.txt b/graaff.txt
index 744d56bae5a1..8485fa86d94a 100644
--- a/graaff.txt
+++ b/graaff.txt
@@ -17,7 +17,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync graaff
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing graaff
 Already up to date.
 *** synced graaff
diff --git a/griffon_overlay.html b/griffon_overlay.html
index 52cb49bfa95f..30630025d7d8 100644
--- a/griffon_overlay.html
+++ b/griffon_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 griffon_overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 griffon_overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing griffon_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 griffon_overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced griffon_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 griffon_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 griffon_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/griffon_overlay.txt b/griffon_overlay.txt
index adf2a7d6e090..93b721a1a41c 100644
--- a/griffon_overlay.txt
+++ b/griffon_overlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync griffon_overlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing griffon_overlay
 Already up to date.
 *** synced griffon_overlay
diff --git a/gsview-overlay.html b/gsview-overlay.html
index 1b75f369cf0c..821deffea8aa 100644
--- a/gsview-overlay.html
+++ b/gsview-overlay.html
@@ -44,23 +44,21 @@
 </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 gsview-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 gsview-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gsview-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced gsview-overlay
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced gsview-overlay
+            <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 gsview-overlay
 </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 gsview-overlay
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gsview-overlay.txt b/gsview-overlay.txt
index 2c3d6fc10d97..03b79c3cb577 100644
--- a/gsview-overlay.txt
+++ b/gsview-overlay.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gsview-overlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gsview-overlay
 Already up to date.
 *** synced gsview-overlay
diff --git a/guru.html b/guru.html
index d391f72abc5f..c0339a03b226 100644
--- a/guru.html
+++ b/guru.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync guru
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing guru
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing guru
+            <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 guru
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced guru
+            <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 guru
 </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 guru
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/guru.txt b/guru.txt
index d0dc08ecf2dc..a25227fc2535 100644
--- a/guru.txt
+++ b/guru.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync guru
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing guru
 Already up to date.
 *** synced guru
diff --git a/haarp.html b/haarp.html
index 255ff677d6a9..ce311d8617ec 100644
--- a/haarp.html
+++ b/haarp.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 haarp
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing haarp
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing haarp
+            <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 haarp
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced haarp
+            <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 haarp
 </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 haarp
-</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/haarp.txt b/haarp.txt
index ddc9c554b4f5..992bd7028d48 100644
--- a/haarp.txt
+++ b/haarp.txt
@@ -10,7 +10,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync haarp
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing haarp
 Already up to date.
 *** synced haarp
diff --git a/hamari.html b/hamari.html
index f2b26be149b0..e6edbbad71b7 100644
--- a/hamari.html
+++ b/hamari.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 hamari
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 hamari
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing hamari
+            <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 hamari
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced hamari
+            <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 hamari
 </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 hamari
-</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/hamari.txt b/hamari.txt
index b7ecceea2dfd..1324af36046a 100644
--- a/hamari.txt
+++ b/hamari.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync hamari
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hamari
 Already up to date.
 *** synced hamari
diff --git a/hamper-overlay.html b/hamper-overlay.html
index 9dc1c8eb7490..c1dadba6966a 100644
--- a/hamper-overlay.html
+++ b/hamper-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 hamper-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 hamper-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing hamper-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 hamper-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced hamper-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 hamper-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 hamper-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/hamper-overlay.txt b/hamper-overlay.txt
index dcc17ff1943e..bc91583416a5 100644
--- a/hamper-overlay.txt
+++ b/hamper-overlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync hamper-overlay
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hamper-overlay
 Already up to date.
 *** synced hamper-overlay
diff --git a/han.html b/han.html
index 2d48d3bcf64a..ceec7cae67db 100644
--- a/han.html
+++ b/han.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 han
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-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 han
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing han
+            <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 han
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced han
+            <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 han
 </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 han
-</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/han.txt b/han.txt
index 76ae2f2b89bf..9fa53b2a3b1e 100644
--- a/han.txt
+++ b/han.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync han
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing han
 Already up to date.
 *** synced han
diff --git a/index.html b/index.html
index 5271311a3654..49dd8c622015 100644
--- a/index.html
+++ b/index.html
@@ -781,7 +781,7 @@
 
         </table>
 
-        <address>Generated based on results from 2023-09-14 09:31:21 UTC</address>
+        <address>Generated based on results from 2023-09-14 09:46:19 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/jl1990.html b/jl1990.html
index 23000ad06cb6..d9b95494a151 100644
--- a/jl1990.html
+++ b/jl1990.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jl1990
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#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 jl1990
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing jl1990
+            <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 jl1990
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced jl1990
+            <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 jl1990
 </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 jl1990
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/jl1990.txt b/jl1990.txt
index d760d303831d..7ed6f4662ae6 100644
--- a/jl1990.txt
+++ b/jl1990.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jl1990
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jl1990
 Already up to date.
 *** synced jl1990
diff --git a/jm-overlay.html b/jm-overlay.html
index 87f19e34795e..6b6864f19dd0 100644
--- a/jm-overlay.html
+++ b/jm-overlay.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jm-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#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 jm-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing jm-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 jm-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced jm-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 jm-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 jm-overlay
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/jm-overlay.txt b/jm-overlay.txt
index 59b542b643e8..3207b0b29bde 100644
--- a/jm-overlay.txt
+++ b/jm-overlay.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jm-overlay
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jm-overlay
 Already up to date.
 *** synced jm-overlay
diff --git a/jmbsvicetto.html b/jmbsvicetto.html
index 2fb0246b5c40..202d0e4bd1d4 100644
--- a/jmbsvicetto.html
+++ b/jmbsvicetto.html
@@ -46,51 +46,49 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#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 jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing jmbsvicetto
+            <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 jmbsvicetto
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced jmbsvicetto
+            <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 jmbsvicetto
 </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 jmbsvicetto
-</pre></td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-db/phpmyadmin-4.9.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-db/phpmyadmin-4.9.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-db/phpmyadmin-4.9.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-db/phpmyadmin-4.9.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-db/phpmyadmin-5.0.2: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * dev-db/phpmyadmin-5.0.2: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * dev-db/phpmyadmin-5.0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-db/phpmyadmin-5.0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-analyzer/OCSInventory-Server-2.4.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * net-analyzer/OCSInventory-Server-2.4.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-analyzer/OCSInventory-Server-2.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * net-analyzer/OCSInventory-Server-2.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * net-analyzer/OCSInventory-Server-2.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-analyzer/OCSInventory-Server-2.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-analyzer/OCSInventory-Server-2.6-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * net-analyzer/OCSInventory-Server-2.6-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-analyzer/OCSInventory-ocsreports-2.4.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * net-analyzer/OCSInventory-ocsreports-2.4.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-analyzer/OCSInventory-ocsreports-2.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-analyzer/OCSInventory-ocsreports-2.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-analyzer/OCSInventory-ocsreports-2.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-analyzer/OCSInventory-ocsreports-2.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * www-misc/awstats-7.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * www-misc/awstats-7.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * www-misc/awstats-7.8: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * www-misc/awstats-7.8: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * www-misc/awstats-7.8-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * www-misc/awstats-7.8-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt
index e012028a8eb9..f823a5e8d21e 100644
--- a/jmbsvicetto.txt
+++ b/jmbsvicetto.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jmbsvicetto
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jmbsvicetto
 Already up to date.
 *** synced jmbsvicetto
diff --git a/mva.html b/mva.html
index f30e070b7539..d1645281447f 100644
--- a/mva.html
+++ b/mva.html
@@ -40,21 +40,23 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mva
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing mva
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing mva
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced mva
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced mva
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 mva
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 mva
+</pre></td></tr>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/mva.txt b/mva.txt
index 063114099070..d6abf210dd7d 100644
--- a/mva.txt
+++ b/mva.txt
@@ -13,6 +13,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mva
+WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mva
 Already up to date.
 *** synced mva
diff --git a/quarks.html b/quarks.html
index 916b963f0174..c2d8b86bb3b8 100644
--- a/quarks.html
+++ b/quarks.html
@@ -36,25 +36,23 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync quarks
 </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 quarks
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing quarks
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing quarks
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;...
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced quarks
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced quarks
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 quarks
 </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 quarks
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/quarks.txt b/quarks.txt
index 2a64120fb4e0..def303b42ef6 100644
--- a/quarks.txt
+++ b/quarks.txt
@@ -11,10 +11,9 @@
  'status': 'unofficial'}
 pkgcore 0.12.21
 
- * Adding new repository
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync quarks
 *** syncing quarks
-Cloning into '/var/lib/repo-mirror-ci/sync/quarks'...
+Already up to date.
 *** synced quarks
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/rimio.html b/rimio.html
index 6f20d0a39cc5..0e7b4b270155 100644
--- a/rimio.html
+++ b/rimio.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 rimio
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 rimio
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing rimio
+            <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 rimio
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced rimio
+            <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 rimio
 </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 rimio
-</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/rimio.txt b/rimio.txt
index 79ec1570144d..dde793f46615 100644
--- a/rimio.txt
+++ b/rimio.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync rimio
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing rimio
 Already up to date.
 *** synced rimio
diff --git a/rion.html b/rion.html
index 94aacba63b8d..32306d7c1317 100644
--- a/rion.html
+++ b/rion.html
@@ -44,23 +44,21 @@
 </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 rion
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 rion
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing rion
+            <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 rion
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced rion
+            <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 rion
 </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 rion
-</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/rion.txt b/rion.txt
index ba9472657580..51152f31266e 100644
--- a/rion.txt
+++ b/rion.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync rion
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing rion
 Already up to date.
 *** synced rion
diff --git a/riru.html b/riru.html
index 50d75d0e2b09..c0ea0f465d64 100644
--- a/riru.html
+++ b/riru.html
@@ -42,29 +42,27 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync riru
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 riru
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing riru
+            <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 riru
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced riru
+            <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 riru
 </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 riru
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-lang/hy-0.19.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * dev-lang/hy-0.19.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-lang/hy-0.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-lang/hy-0.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-video/baka-mplayer-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * media-video/baka-mplayer-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/riru.txt b/riru.txt
index bd446a7234a2..37257d56bc2f 100644
--- a/riru.txt
+++ b/riru.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync riru
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing riru
 Already up to date.
 *** synced riru
diff --git a/riscv.html b/riscv.html
index 248f73801eec..afce6ac99318 100644
--- a/riscv.html
+++ b/riscv.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync riscv
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing riscv
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing riscv
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced riscv
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced riscv
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 riscv
 </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 riscv
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/riscv.txt b/riscv.txt
index a7452ab3e3ad..11cdbb440044 100644
--- a/riscv.txt
+++ b/riscv.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync riscv
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing riscv
 Already up to date.
 *** synced riscv
diff --git a/rnp.html b/rnp.html
index 5a00a224a0ee..66e65f21557a 100644
--- a/rnp.html
+++ b/rnp.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 rnp
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 rnp
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing rnp
+            <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 rnp
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced rnp
+            <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 rnp
 </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 rnp
-</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/rnp.txt b/rnp.txt
index 37298c0389c4..90845e5d7f06 100644
--- a/rnp.txt
+++ b/rnp.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync rnp
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing rnp
 Already up to date.
 *** synced rnp
diff --git a/robert7k.html b/robert7k.html
index 705c1fbda6a6..51a745b4763b 100644
--- a/robert7k.html
+++ b/robert7k.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync robert7k
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing robert7k
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing robert7k
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced robert7k
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced robert7k
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 robert7k
 </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 robert7k
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/robert7k.txt b/robert7k.txt
index 87d7f9c01ad1..1835e2ce0087 100644
--- a/robert7k.txt
+++ b/robert7k.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync robert7k
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing robert7k
 Already up to date.
 *** synced robert7k
diff --git a/robertgzr.html b/robertgzr.html
index ed89c9c0287b..2de31732d935 100644
--- a/robertgzr.html
+++ b/robertgzr.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync robertgzr
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing robertgzr
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing robertgzr
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced robertgzr
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced robertgzr
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 robertgzr
 </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 robertgzr
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/robertgzr.txt b/robertgzr.txt
index 92066854956e..4cdd761606f4 100644
--- a/robertgzr.txt
+++ b/robertgzr.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync robertgzr
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing robertgzr
 Already up to date.
 *** synced robertgzr
diff --git a/roslin.html b/roslin.html
index de1a9045833a..0be5b1061d41 100644
--- a/roslin.html
+++ b/roslin.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync roslin
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 roslin
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing roslin
+            <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 roslin
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced roslin
+            <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 roslin
 </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 roslin
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/roslin.txt b/roslin.txt
index 12d614e8a61e..ad40c9172661 100644
--- a/roslin.txt
+++ b/roslin.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync roslin
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing roslin
 Already up to date.
 *** synced roslin
diff --git a/ruby.html b/ruby.html
index fbb4c4020fee..8d4bedb81c51 100644
--- a/ruby.html
+++ b/ruby.html
@@ -46,23 +46,21 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ruby
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 ruby
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing ruby
+            <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 ruby
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced ruby
+            <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 ruby
 </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 ruby
-</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/ruby.txt b/ruby.txt
index 4a07ba90ec79..ab622dc5a6b2 100644
--- a/ruby.txt
+++ b/ruby.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ruby
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ruby
 Already up to date.
 *** synced ruby
diff --git a/ruixi-overlay.html b/ruixi-overlay.html
index 4da944766c09..2e09ad59e88a 100644
--- a/ruixi-overlay.html
+++ b/ruixi-overlay.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ruixi-overlay
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 ruixi-overlay
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ruixi-overlay
+            <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 ruixi-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced ruixi-overlay
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 ruixi-overlay
 </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 ruixi-overlay
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/ruixi-overlay.txt b/ruixi-overlay.txt
index b8a2a095e33d..29e127975b3f 100644
--- a/ruixi-overlay.txt
+++ b/ruixi-overlay.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ruixi-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ruixi-overlay
 Already up to date.
 *** synced ruixi-overlay
diff --git a/rukruk.html b/rukruk.html
index 5c0808dfea51..0b7bbfb0230e 100644
--- a/rukruk.html
+++ b/rukruk.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync rukruk
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 rukruk
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing rukruk
+            <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 rukruk
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced rukruk
+            <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 rukruk
 </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 rukruk
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/rukruk.txt b/rukruk.txt
index cc1ceb902c5a..25b5e374c705 100644
--- a/rukruk.txt
+++ b/rukruk.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync rukruk
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing rukruk
 Already up to date.
 *** synced rukruk
diff --git a/ryans.html b/ryans.html
index 5759df62ad2a..7503e502a133 100644
--- a/ryans.html
+++ b/ryans.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ryans
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 ryans
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ryans
+            <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 ryans
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced ryans
+            <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 ryans
 </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 ryans
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/ryans.txt b/ryans.txt
index ffe31d1b1c49..221119cd9769 100644
--- a/ryans.txt
+++ b/ryans.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ryans
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ryans
 Already up to date.
 *** synced ryans
diff --git a/sage-on-gentoo.html b/sage-on-gentoo.html
index dfb0c6e2df16..4ede8d96782f 100644
--- a/sage-on-gentoo.html
+++ b/sage-on-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 sage-on-gentoo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 sage-on-gentoo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sage-on-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 sage-on-gentoo
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sage-on-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 sage-on-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 sage-on-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/sage-on-gentoo.txt b/sage-on-gentoo.txt
index 7156112e49f6..786f0b386e48 100644
--- a/sage-on-gentoo.txt
+++ b/sage-on-gentoo.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sage-on-gentoo
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sage-on-gentoo
 Already up to date.
 *** synced sage-on-gentoo
diff --git a/salfter.html b/salfter.html
index a06a9a006915..df868eef6950 100644
--- a/salfter.html
+++ b/salfter.html
@@ -34,29 +34,27 @@
 </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 salfter
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 salfter
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing salfter
+            <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 salfter
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced salfter
+            <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 salfter
 </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 salfter
-</pre></td></tr>
-            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-crypt/vanitygen-plus-1.53: failed sourcing ebuild: inherit: missing eclass argument
+            <tr class="err" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * app-crypt/vanitygen-plus-1.53: failed sourcing ebuild: inherit: missing eclass argument
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * media-sound/mp3val-0.1.8: failed sourcing ebuild: inherit: missing eclass argument
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * media-sound/mp3val-0.1.8: failed sourcing ebuild: inherit: missing eclass argument
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * net-mail/spfpolicy-2.011-r1: failed sourcing ebuild: inherit: missing eclass argument
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * net-mail/spfpolicy-2.011-r1: failed sourcing ebuild: inherit: missing eclass argument
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/salfter.txt b/salfter.txt
index 428a7a03276f..d9d97cf39a80 100644
--- a/salfter.txt
+++ b/salfter.txt
@@ -10,7 +10,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync salfter
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing salfter
 Already up to date.
 *** synced salfter
diff --git a/sam_c.html b/sam_c.html
index a3056939f8f1..c3612c3a7a05 100644
--- a/sam_c.html
+++ b/sam_c.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sam_c
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 sam_c
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sam_c
+            <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 sam_c
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced sam_c
+            <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 sam_c
 </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 sam_c
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/sam_c.txt b/sam_c.txt
index 79770210e4ef..82d3724b8353 100644
--- a/sam_c.txt
+++ b/sam_c.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sam_c
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sam_c
 Already up to date.
 *** synced sam_c
diff --git a/sattvik.html b/sattvik.html
index 4cef996e4697..24780ce19fa7 100644
--- a/sattvik.html
+++ b/sattvik.html
@@ -46,23 +46,21 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sattvik
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 sattvik
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing sattvik
+            <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 sattvik
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced sattvik
+            <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 sattvik
 </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 sattvik
-</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/sattvik.txt b/sattvik.txt
index e81965c7cbb2..a65faac6e3ee 100644
--- a/sattvik.txt
+++ b/sattvik.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sattvik
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sattvik
 Already up to date.
 *** synced sattvik
diff --git a/schplaf.html b/schplaf.html
index 5d12ae4cb5a4..cab234cb1b9b 100644
--- a/schplaf.html
+++ b/schplaf.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 schplaf
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 schplaf
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing schplaf
+            <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 schplaf
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced schplaf
+            <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 schplaf
 </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 schplaf
-</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/schplaf.txt b/schplaf.txt
index b6cc6b2023ed..9c3d4274c025 100644
--- a/schplaf.txt
+++ b/schplaf.txt
@@ -10,7 +10,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync schplaf
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing schplaf
 Already up to date.
 *** synced schplaf
diff --git a/science.html b/science.html
index c4fc9daa10a1..203017370241 100644
--- a/science.html
+++ b/science.html
@@ -68,23 +68,21 @@
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync science
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing science
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing science
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced science
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced science
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 science
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 science
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/science.txt b/science.txt
index 81732f2ea6ca..9b65fbfc2c80 100644
--- a/science.txt
+++ b/science.txt
@@ -27,7 +27,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync science
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing science
 Already up to date.
 *** synced science
diff --git a/scrill.html b/scrill.html
index 2579ba45d6b4..296e748c9962 100644
--- a/scrill.html
+++ b/scrill.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 scrill
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 scrill
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing scrill
+            <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 scrill
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced scrill
+            <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 scrill
 </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 scrill
-</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/scrill.txt b/scrill.txt
index 099bb83f7633..b61331abaeba 100644
--- a/scrill.txt
+++ b/scrill.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync scrill
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing scrill
 Already up to date.
 *** synced scrill
diff --git a/seden.html b/seden.html
index 1ccaeb9f9e9d..e0c64996950f 100644
--- a/seden.html
+++ b/seden.html
@@ -44,23 +44,21 @@
 </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 seden
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 seden
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing seden
+            <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 seden
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced seden
+            <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 seden
 </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 seden
-</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/seden.txt b/seden.txt
index ad3a9c5088a2..e37a471f77a1 100644
--- a/seden.txt
+++ b/seden.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync seden
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing seden
 Already up to date.
 *** synced seden
diff --git a/sergiotarxz.html b/sergiotarxz.html
index a000dec88cab..bfb54968f1b2 100644
--- a/sergiotarxz.html
+++ b/sergiotarxz.html
@@ -38,19 +38,15 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sergiotarxz
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sergiotarxz
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;...
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sergiotarxz
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>fatal: unable to access &#x27;https://gitea.sergiotarxz.freemyip.com/sergiotarxz/sergiotarxz-overlay.git/&#x27;: SSL certificate problem: unable to get local issuer certificate
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;...
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>!!! failed syncing sergiotarxz
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>fatal: unable to access &#x27;https://gitea.sergiotarxz.freemyip.com/sergiotarxz/sergiotarxz-overlay.git/&#x27;: SSL certificate problem: unable to get local issuer certificate
-</pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>!!! failed syncing sergiotarxz
-</pre></td></tr>
-            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync failed with 1
+            <tr class="err" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync failed with 1
 </pre></td><td>[FATAL]</td></tr>
 
         </table>
diff --git a/sergiotarxz.txt b/sergiotarxz.txt
index 506b24a604b4..c1e939744588 100644
--- a/sergiotarxz.txt
+++ b/sergiotarxz.txt
@@ -12,8 +12,6 @@ pkgcore 0.12.21
 
  * Adding new repository
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sergiotarxz
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sergiotarxz
 Cloning into '/var/lib/repo-mirror-ci/sync/sergiotarxz'...
 fatal: unable to access 'https://gitea.sergiotarxz.freemyip.com/sergiotarxz/sergiotarxz-overlay.git/': SSL certificate problem: unable to get local issuer certificate
diff --git a/serioussam.html b/serioussam.html
index 6f1827222bfb..8723c577c993 100644
--- a/serioussam.html
+++ b/serioussam.html
@@ -38,7 +38,7 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync serioussam
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>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="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing serioussam
 </pre></td></tr>
diff --git a/serioussam.txt b/serioussam.txt
index c7c009d25792..b60b5b6a6309 100644
--- a/serioussam.txt
+++ b/serioussam.txt
@@ -12,7 +12,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync serioussam
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+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 serioussam
 Already up to date.
 *** synced serioussam
diff --git a/setkeh.html b/setkeh.html
index 0a12f2212232..672ca4b031b1 100644
--- a/setkeh.html
+++ b/setkeh.html
@@ -42,7 +42,7 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync setkeh
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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>*** syncing setkeh
 </pre></td></tr>
diff --git a/setkeh.txt b/setkeh.txt
index 75f3e68fac76..9124f2f99f30 100644
--- a/setkeh.txt
+++ b/setkeh.txt
@@ -14,7 +14,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync setkeh
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing setkeh
 Already up to date.
 *** synced setkeh
diff --git a/sevz.html b/sevz.html
index fe0d557fc26b..0926f76d0ff8 100644
--- a/sevz.html
+++ b/sevz.html
@@ -42,7 +42,7 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sevz
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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>*** syncing sevz
 </pre></td></tr>
diff --git a/sevz.txt b/sevz.txt
index 1bb62eaecbbe..fffd55cd53b7 100644
--- a/sevz.txt
+++ b/sevz.txt
@@ -14,7 +14,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sevz
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sevz
 Already up to date.
 *** synced sevz
diff --git a/sft.html b/sft.html
index 67452982217e..4de862c25311 100644
--- a/sft.html
+++ b/sft.html
@@ -42,7 +42,7 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sft
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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>*** syncing sft
 </pre></td></tr>
diff --git a/sft.txt b/sft.txt
index 17b9a9ea9be3..0a6ab80ff01d 100644
--- a/sft.txt
+++ b/sft.txt
@@ -14,7 +14,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sft
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sft
 Already up to date.
 *** synced sft
diff --git a/sgs.html b/sgs.html
index 96403b104b47..622da8444be1 100644
--- a/sgs.html
+++ b/sgs.html
@@ -42,7 +42,7 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sgs
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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>*** syncing sgs
 </pre></td></tr>
diff --git a/sgs.txt b/sgs.txt
index 65c9712a7bf2..1ffd89a9d367 100644
--- a/sgs.txt
+++ b/sgs.txt
@@ -14,7 +14,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sgs
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sgs
 Already up to date.
 *** synced sgs
diff --git a/shnurise.html b/shnurise.html
index 68a2df0ed8d2..b64c636ec54a 100644
--- a/shnurise.html
+++ b/shnurise.html
@@ -44,7 +44,7 @@
 </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 shnurise
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing shnurise
 </pre></td></tr>
diff --git a/shnurise.txt b/shnurise.txt
index 7de258223317..645869a3ba73 100644
--- a/shnurise.txt
+++ b/shnurise.txt
@@ -15,7 +15,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync shnurise
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+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 shnurise
 Already up to date.
 *** synced shnurise
diff --git a/simonvanderveldt.html b/simonvanderveldt.html
index 2338d472e8ce..0366c26fd576 100644
--- a/simonvanderveldt.html
+++ b/simonvanderveldt.html
@@ -44,7 +44,7 @@
 </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:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing simonvanderveldt
 </pre></td></tr>
diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt
index 6e2dee2d4b93..12fb659116be 100644
--- a/simonvanderveldt.txt
+++ b/simonvanderveldt.txt
@@ -15,7 +15,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync simonvanderveldt
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+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 9f4cd6c05ddd..77a4baff1c97 100644
--- a/sinustrom.html
+++ b/sinustrom.html
@@ -42,7 +42,7 @@
 </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:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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>*** syncing sinustrom
 </pre></td></tr>
diff --git a/sinustrom.txt b/sinustrom.txt
index 92d37fdf1aa2..435d36e93df6 100644
--- a/sinustrom.txt
+++ b/sinustrom.txt
@@ -14,7 +14,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sinustrom
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+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 8c20b5582a7b..cfa4655eac5c 100644
--- a/sk-overlay.html
+++ b/sk-overlay.html
@@ -40,7 +40,7 @@
 </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:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sk-overlay
 </pre></td></tr>
diff --git a/sk-overlay.txt b/sk-overlay.txt
index 5db1068adc25..cd5f4cc7124a 100644
--- a/sk-overlay.txt
+++ b/sk-overlay.txt
@@ -13,7 +13,7 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sk-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+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/slonko.html b/slonko.html
index 57dc64a31cd1..be0e491838ed 100644
--- a/slonko.html
+++ b/slonko.html
@@ -36,25 +36,23 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync slonko
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing slonko
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing slonko
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced slonko
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced slonko
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 slonko
 </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 slonko
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/slonko.txt b/slonko.txt
index 5f68b6e0e983..8a22adb055f9 100644
--- a/slonko.txt
+++ b/slonko.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync slonko
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 slonko
 Already up to date.
diff --git a/smaeul.html b/smaeul.html
index 61bfce63fdb3..39c85b39584b 100644
--- a/smaeul.html
+++ b/smaeul.html
@@ -44,37 +44,35 @@
 </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 smaeul
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l19"><td><a href="#l19"><span>19</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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing smaeul
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing smaeul
+            <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 smaeul
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced smaeul
+            <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 smaeul
 </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 smaeul
-</pre></td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-lang/rust-1.48.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-lang/rust-1.48.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  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-lang/rust-1.49.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-lang/rust-1.49.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-lang/rust-1.50.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * dev-lang/rust-1.50.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * dev-lang/rust-1.58.1: failed sourcing ebuild: rust-toolchain: EAPI 7 not supported, (rust-toolchain.eclass, line  16:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-lang/rust-1.58.1: failed sourcing ebuild: rust-toolchain: EAPI 7 not supported, (rust-toolchain.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * dev-lang/rust-1.59.0: failed sourcing ebuild: rust-toolchain: EAPI 7 not supported, (rust-toolchain.eclass, line  16:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * dev-lang/rust-1.59.0: failed sourcing ebuild: rust-toolchain: EAPI 7 not supported, (rust-toolchain.eclass, line  16:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * www-client/chromium-85.0.4183.83: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * www-client/chromium-85.0.4183.83: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/smaeul.txt b/smaeul.txt
index 65372b44cfb6..948743d73cf7 100644
--- a/smaeul.txt
+++ b/smaeul.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync smaeul
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 smaeul
 Already up to date.
diff --git a/snapd.html b/snapd.html
index 9caeba4aedef..c0d62715027e 100644
--- a/snapd.html
+++ b/snapd.html
@@ -40,25 +40,23 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync snapd
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>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 snapd
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing snapd
+            <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 snapd
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced snapd
+            <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 snapd
 </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 snapd
-</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/snapd.txt b/snapd.txt
index edeb088f8a9e..6a61ca7bc7c3 100644
--- a/snapd.txt
+++ b/snapd.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync snapd
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 snapd
 Already up to date.
diff --git a/sogo-connector.html b/sogo-connector.html
index 7ae2b71ad42b..d7e4eea453ff 100644
--- a/sogo-connector.html
+++ b/sogo-connector.html
@@ -46,25 +46,23 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sogo-connector
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l20"><td><a href="#l20"><span>20</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="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing sogo-connector
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing sogo-connector
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced sogo-connector
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced sogo-connector
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sogo-connector
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sogo-connector
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/sogo-connector.txt b/sogo-connector.txt
index e38aa892e0e6..c16a2ad4425f 100644
--- a/sogo-connector.txt
+++ b/sogo-connector.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sogo-connector
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 sogo-connector
 Already up to date.
diff --git a/soltys.html b/soltys.html
index 8e94c68e53d1..391d137b2e9b 100644
--- a/soltys.html
+++ b/soltys.html
@@ -44,25 +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 soltys
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l19"><td><a href="#l19"><span>19</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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing soltys
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing soltys
+            <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 soltys
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced soltys
+            <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 soltys
 </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 soltys
-</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/soltys.txt b/soltys.txt
index 6da370e9e112..166794a5f9b6 100644
--- a/soltys.txt
+++ b/soltys.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync soltys
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 soltys
 Already up to date.
diff --git a/sorrow.html b/sorrow.html
index 399f10fc7081..0e7603f9f1ab 100644
--- a/sorrow.html
+++ b/sorrow.html
@@ -40,25 +40,23 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sorrow
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>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 sorrow
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sorrow
+            <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 sorrow
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sorrow
+            <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 sorrow
 </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 sorrow
-</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/sorrow.txt b/sorrow.txt
index b23c1f66d21f..e022b5ff72a9 100644
--- a/sorrow.txt
+++ b/sorrow.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sorrow
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 sorrow
 Already up to date.
diff --git a/spark-overlay.html b/spark-overlay.html
index 196e07dd338f..670278a79e28 100644
--- a/spark-overlay.html
+++ b/spark-overlay.html
@@ -40,25 +40,23 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spark-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>WARNING:pkgcore:sergiotarxz repo at &#x27;/var/lib/repo-mirror-ci/sync/sergiotarxz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>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 spark-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing spark-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 spark-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced spark-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 spark-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 spark-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/spark-overlay.txt b/spark-overlay.txt
index fb5c81a1dec0..f2afc54977ee 100644
--- a/spark-overlay.txt
+++ b/spark-overlay.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spark-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 spark-overlay
 Already up to date.
diff --git a/spikyatlinux.html b/spikyatlinux.html
index bad8b7eb5319..55c51ba94686 100644
--- a/spikyatlinux.html
+++ b/spikyatlinux.html
@@ -42,25 +42,23 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spikyatlinux
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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>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 spikyatlinux
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing spikyatlinux
+            <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 spikyatlinux
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced spikyatlinux
+            <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 spikyatlinux
 </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 spikyatlinux
-</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/spikyatlinux.txt b/spikyatlinux.txt
index 174c5dbbd064..0797339176a9 100644
--- a/spikyatlinux.txt
+++ b/spikyatlinux.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spikyatlinux
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 spikyatlinux
 Already up to date.
diff --git a/sping.html b/sping.html
index 5425c33e48bd..a840955ed987 100644
--- a/sping.html
+++ b/sping.html
@@ -44,25 +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 sping
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>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="l19"><td><a href="#l19"><span>19</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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing sping
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing sping
+            <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 sping
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced sping
+            <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 sping
 </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 sping
-</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/sping.txt b/sping.txt
index 4e628db39600..d99ad221bf36 100644
--- a/sping.txt
+++ b/sping.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sping
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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 sping
 Already up to date.
diff --git a/spring.html b/spring.html
index 94d0e5a95826..7d654b248d53 100644
--- a/spring.html
+++ b/spring.html
@@ -38,25 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spring
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing spring
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>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>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing spring
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced spring
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced spring
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 spring
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ 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>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 spring
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/spring.txt b/spring.txt
index 661ed96ff36d..0b9be6b3d526 100644
--- a/spring.txt
+++ b/spring.txt
@@ -12,8 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync spring
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing spring
 Already up to date.
 *** synced spring
diff --git a/src_prepare-overlay.html b/src_prepare-overlay.html
index 75f557d85ebb..56565d65f7d7 100644
--- a/src_prepare-overlay.html
+++ b/src_prepare-overlay.html
@@ -42,25 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync src_prepare-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 src_prepare-overlay
 </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>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing src_prepare-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced src_prepare-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced src_prepare-overlay
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 src_prepare-overlay
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 src_prepare-overlay
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/src_prepare-overlay.txt b/src_prepare-overlay.txt
index 38ef35b05262..c81b5baa70b0 100644
--- a/src_prepare-overlay.txt
+++ b/src_prepare-overlay.txt
@@ -14,8 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync src_prepare-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-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 src_prepare-overlay
 Already up to date.
 *** synced src_prepare-overlay
diff --git a/ssnb.html b/ssnb.html
index bcbd197b095b..f77ebbce925c 100644
--- a/ssnb.html
+++ b/ssnb.html
@@ -44,25 +44,21 @@
 </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 ssnb
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 ssnb
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</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="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>*** syncing ssnb
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced ssnb
 </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> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced ssnb
+            <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> * Sync succeeded
+            <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 log --format=%ci -1
+            <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 ssnb
 </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
-</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 ssnb
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</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/ssnb.txt b/ssnb.txt
index f3ecb9e12742..77b8427cfc4f 100644
--- a/ssnb.txt
+++ b/ssnb.txt
@@ -15,8 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ssnb
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-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 ssnb
 Already up to date.
 *** synced ssnb
diff --git a/sspreitz.html b/sspreitz.html
index 17919016bc7e..4dd75b535b24 100644
--- a/sspreitz.html
+++ b/sspreitz.html
@@ -42,27 +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 sspreitz
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 sspreitz
 </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>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing sspreitz
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced sspreitz
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced sspreitz
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sspreitz
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 sspreitz
-</pre></td></tr>
-            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-python/yamllint-1.23.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * dev-python/yamllint-1.23.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 178:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/sspreitz.txt b/sspreitz.txt
index 3ff840f4306f..92b742903616 100644
--- a/sspreitz.txt
+++ b/sspreitz.txt
@@ -14,8 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sspreitz
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sspreitz
 Already up to date.
 *** synced sspreitz
diff --git a/steam-overlay.html b/steam-overlay.html
index be788dac9c8f..50455c49bee1 100644
--- a/steam-overlay.html
+++ b/steam-overlay.html
@@ -40,25 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync steam-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 steam-overlay
 </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>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing steam-overlay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced steam-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced steam-overlay
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 steam-overlay
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 steam-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="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/steam-overlay.txt b/steam-overlay.txt
index 698941382e12..f3727db9e86c 100644
--- a/steam-overlay.txt
+++ b/steam-overlay.txt
@@ -13,8 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync steam-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing steam-overlay
 Already up to date.
 *** synced steam-overlay
diff --git a/stefantalpalaru.html b/stefantalpalaru.html
index 779734762377..e9f53c9b6d91 100644
--- a/stefantalpalaru.html
+++ b/stefantalpalaru.html
@@ -44,25 +44,21 @@
 </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 stefantalpalaru
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 stefantalpalaru
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</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="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>*** syncing stefantalpalaru
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced stefantalpalaru
 </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> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced stefantalpalaru
+            <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> * Sync succeeded
+            <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 log --format=%ci -1
+            <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 stefantalpalaru
 </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
-</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 stefantalpalaru
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</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/stefantalpalaru.txt b/stefantalpalaru.txt
index 4c27630bbcf0..6e532bc084a7 100644
--- a/stefantalpalaru.txt
+++ b/stefantalpalaru.txt
@@ -15,8 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stefantalpalaru
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-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 stefantalpalaru
 Already up to date.
 *** synced stefantalpalaru
diff --git a/stephdewit.html b/stephdewit.html
index d65f6ea1de7c..f388a66b8e14 100644
--- a/stephdewit.html
+++ b/stephdewit.html
@@ -42,25 +42,21 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stephdewit
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 stephdewit
 </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>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing stephdewit
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced stephdewit
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced stephdewit
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 stephdewit
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 stephdewit
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/stephdewit.txt b/stephdewit.txt
index 19ad43e80281..55c4f53232ec 100644
--- a/stephdewit.txt
+++ b/stephdewit.txt
@@ -14,8 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stephdewit
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-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/stha09.html b/stha09.html
index 321841623433..21eab8d73f01 100644
--- a/stha09.html
+++ b/stha09.html
@@ -40,19 +40,15 @@
 </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 stha09
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 stha09
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;...
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing stha09
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>fatal: could not read Username for &#x27;https://github.com&#x27;: No such device or address
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;...
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>!!! failed syncing stha09
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>fatal: could not read Username for &#x27;https://github.com&#x27;: No such device or address
-</pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>!!! failed syncing stha09
-</pre></td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync failed with 1
+            <tr class="err" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync failed with 1
 </pre></td><td>[FATAL]</td></tr>
 
         </table>
diff --git a/stha09.txt b/stha09.txt
index 784200675af7..f810000c0032 100644
--- a/stha09.txt
+++ b/stha09.txt
@@ -13,8 +13,6 @@ pkgcore 0.12.21
 
  * Adding new repository
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stha09
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing stha09
 Cloning into '/var/lib/repo-mirror-ci/sync/stha09'...
 fatal: could not read Username for 'https://github.com': No such device or address
diff --git a/stowe-verlay.html b/stowe-verlay.html
index 170ff0713704..e8f0b3c42e87 100644
--- a/stowe-verlay.html
+++ b/stowe-verlay.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stowe-verlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 stowe-verlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing stowe-verlay
+            <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 stowe-verlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced stowe-verlay
+            <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 stowe-verlay
 </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 stowe-verlay
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/stowe-verlay.txt b/stowe-verlay.txt
index 2aa374a4e602..4c0a8a4564f7 100644
--- a/stowe-verlay.txt
+++ b/stowe-verlay.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stowe-verlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing stowe-verlay
 Already up to date.
 *** synced stowe-verlay
diff --git a/strohel.html b/strohel.html
index b2b7167c1186..8e60461b6238 100644
--- a/strohel.html
+++ b/strohel.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 strohel
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 strohel
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing strohel
+            <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 strohel
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced strohel
+            <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 strohel
 </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 strohel
-</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/strohel.txt b/strohel.txt
index b183eb5a004b..54437ffc317a 100644
--- a/strohel.txt
+++ b/strohel.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync strohel
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing strohel
 Already up to date.
 *** synced strohel
diff --git a/stuff.html b/stuff.html
index 62b435ca165f..9779347784b1 100644
--- a/stuff.html
+++ b/stuff.html
@@ -36,109 +36,107 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stuff
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 stuff
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing stuff
+            <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 stuff
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced stuff
+            <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 stuff
 </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 stuff
-</pre></td></tr>
-            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-editors/gobby-0.5.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-editors/gobby-0.5.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-editors/gobby-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-editors/gobby-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-portage/gcc-switcher-1.4.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * app-portage/gcc-switcher-1.4.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-portage/portopts-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-portage/portopts-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/aptana-3.6.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * dev-util/aptana-3.6.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-util/aptana-3.7.2: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * dev-util/aptana-3.7.2: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * lxde-base/lxpanelx-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * lxde-base/lxpanelx-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * mail-client/alpine-2.21: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * mail-client/alpine-2.21: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * mail-client/alpine-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * mail-client/alpine-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * media-gfx/fontforge-99999999-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * media-gfx/fontforge-99999999-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-gfx/sk1-0.9.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * media-gfx/sk1-0.9.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-gfx/sk1-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-gfx/sk1-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-plugins/deadbeef-archive-reader-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-plugins/deadbeef-archive-reader-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-plugins/deadbeef-bookmark-manager-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-plugins/deadbeef-bookmark-manager-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-plugins/deadbeef-bs2b-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-plugins/deadbeef-bs2b-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-plugins/deadbeef-ffmpeg-0.10.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-plugins/deadbeef-ffmpeg-0.10.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-plugins/deadbeef-gnome-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-plugins/deadbeef-gnome-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-plugins/deadbeef-jack-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-plugins/deadbeef-jack-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-plugins/deadbeef-musical-spectrum-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-plugins/deadbeef-musical-spectrum-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-plugins/deadbeef-opus-0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-plugins/deadbeef-opus-0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-plugins/deadbeef-opus-0.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-plugins/deadbeef-opus-0.6: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.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> * media-plugins/deadbeef-opus-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-plugins/deadbeef-opus-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.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> * media-plugins/deadbeef-spectrogram-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * media-plugins/deadbeef-spectrogram-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * media-plugins/deadbeef-stereo-widener-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * media-plugins/deadbeef-stereo-widener-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * media-plugins/deadbeef-vgmstream-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * media-plugins/deadbeef-vgmstream-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.2: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.2: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-plugins/deadbeef-waveform-seekbar-0.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-0.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-plugins/deadbeef-waveform-seekbar-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-plugins/deadbeef-waveform-seekbar-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-libs/libinfinity-0.6.8: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-libs/libinfinity-0.6.8: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-libs/libinfinity-0.7.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-libs/libinfinity-0.7.1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-libs/ortp-0.27.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-libs/ortp-0.27.0: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * sci-mathematics/sofastatistics-1.5.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * sci-mathematics/sofastatistics-1.5.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * sys-apps/dkms-gentoo-19.2-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * sys-apps/dkms-gentoo-19.2-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * sys-apps/dkms-gentoo-20: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * sys-apps/dkms-gentoo-20: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/dkms-gentoo-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * sys-apps/dkms-gentoo-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * x11-apps/skb-0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * x11-apps/skb-0.3: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.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> * x11-apps/skb-0.4: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * x11-apps/skb-0.4: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * x11-misc/xbindkeys-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * x11-misc/xbindkeys-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * x11-misc/yd-tools-1.11.0-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * x11-misc/yd-tools-1.11.0-r1: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * x11-misc/yd-tools-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * x11-misc/yd-tools-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * x11-wm/wmfs-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * x11-wm/wmfs-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/stuff.txt b/stuff.txt
index 46e7455349ee..a3190363ccfc 100644
--- a/stuff.txt
+++ b/stuff.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stuff
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing stuff
 Already up to date.
 *** synced stuff
diff --git a/sunset-repo.html b/sunset-repo.html
index 05e3c17ee5ba..829d8f045fd6 100644
--- a/sunset-repo.html
+++ b/sunset-repo.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 sunset-repo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 sunset-repo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sunset-repo
+            <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 sunset-repo
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced sunset-repo
+            <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 sunset-repo
 </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 sunset-repo
-</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/sunset-repo.txt b/sunset-repo.txt
index 62f575485ba2..26faf1005310 100644
--- a/sunset-repo.txt
+++ b/sunset-repo.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync sunset-repo
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing sunset-repo
 Already up to date.
 *** synced sunset-repo
diff --git a/suntar.html b/suntar.html
index 7184d31466bf..75db08f5327b 100644
--- a/suntar.html
+++ b/suntar.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 suntar
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 suntar
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing suntar
+            <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 suntar
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced suntar
+            <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 suntar
 </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 suntar
-</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/suntar.txt b/suntar.txt
index 0e4206c5cdb6..eae43a179269 100644
--- a/suntar.txt
+++ b/suntar.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync suntar
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing suntar
 Already up to date.
 *** synced suntar
diff --git a/superposition.html b/superposition.html
index a50e91853bb2..cf6b39c03326 100644
--- a/superposition.html
+++ b/superposition.html
@@ -46,23 +46,21 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync superposition
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 superposition
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing superposition
+            <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 superposition
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced superposition
+            <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 superposition
 </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 superposition
-</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/superposition.txt b/superposition.txt
index abc8fa02f9f4..4c900739448e 100644
--- a/superposition.txt
+++ b/superposition.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync superposition
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing superposition
 Already up to date.
 *** synced superposition
diff --git a/supertux88.html b/supertux88.html
index 1c444dfc8234..1f157f4ed099 100644
--- a/supertux88.html
+++ b/supertux88.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 supertux88
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 supertux88
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing supertux88
+            <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 supertux88
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced supertux88
+            <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 supertux88
 </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 supertux88
-</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/supertux88.txt b/supertux88.txt
index d47ddd4dcd44..a7fefefd1a6c 100644
--- a/supertux88.txt
+++ b/supertux88.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync supertux88
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing supertux88
 Already up to date.
 *** synced supertux88
diff --git a/swegener.html b/swegener.html
index 9f168cee013b..f10003bc94f9 100644
--- a/swegener.html
+++ b/swegener.html
@@ -44,83 +44,81 @@
 </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 swegener
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 swegener
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing swegener
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Welcome To
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Welcome To
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>        ____ _____ _____    _    _     _____ ____               _
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>        ____ _____ _____    _    _     _____ ____               _
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>       / ___|_   _| ____|  / \  | |   | ____|  _ \   _ __   ___| |_
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>       / ___|_   _| ____|  / \  | |   | ____|  _ \   _ __   ___| |_
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>       \___ \ | | |  _|   / _ \ | |   |  _| | |_) | | &#x27;_ \ / _ \ __|
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>       \___ \ | | |  _|   / _ \ | |   |  _| | |_) | | &#x27;_ \ / _ \ __|
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>        ___) || | | |___ / ___ \| |___| |___|  _ &lt; _| | | |  __/ |_
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>        ___) || | | |___ / ___ \| |___| |___|  _ &lt; _| | | |  __/ |_
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>       |____/ |_| |_____/_/   \_\_____|_____|_| \_(_)_| |_|\___|\__|
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>       |____/ |_| |_____/_/   \_\_____|_____|_| \_(_)_| |_|\___|\__|
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>IP: 144.76.13.132
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>IP: 144.76.13.132
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>AKA: rsync7.de.gentoo.org
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>AKA: rsync7.de.gentoo.org
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>AKA: rsync.gentoo.stealer.net
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>AKA: rsync.gentoo.stealer.net
+            <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>
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Connection: 1 GBit/s, rsync limited to 20 connections
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Connection: 1 GBit/s, rsync limited to 20 connections
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Location: Germany
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Location: Germany
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Contact: Sven Wegener &lt;swegener@gentoo.org&gt;
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Contact: Sven Wegener &lt;swegener@gentoo.org&gt;
+            <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>
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Number of files: 139 (reg: 71, dir: 68)
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Number of files: 139 (reg: 71, dir: 68)
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Number of created files: 0
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Number of created files: 0
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Number of deleted files: 0
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Number of deleted files: 0
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Number of regular files transferred: 0
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Number of regular files transferred: 0
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Total file size: 56.89K bytes
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Total file size: 56.89K bytes
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Total transferred file size: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Total transferred file size: 0 bytes
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Literal data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Literal data: 0 bytes
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Matched data: 0 bytes
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>File list size: 4.28K
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>File list size: 4.28K
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>File list generation time: 0.001 seconds
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>File list transfer time: 0.000 seconds
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total bytes sent: 133
 </pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total bytes sent: 133
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total bytes received: 4.36K
 </pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Total bytes received: 4.36K
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 133 bytes  received 4.36K bytes  1.80K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>sent 133 bytes  received 4.36K bytes  1.80K bytes/sec
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>total size is 56.89K  speedup is 12.65
 </pre></td></tr>
-            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>total size is 56.89K  speedup is 12.65
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced swegener
 </pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced swegener
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ stat --format=%y .
 </pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ stat --format=%y .
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 swegener
 </pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 swegener
-</pre></td></tr>
-            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/swegener.txt b/swegener.txt
index 862a412ad990..9581f03aee9e 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync swegener
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing swegener
 Welcome To
         ____ _____ _____    _    _     _____ ____               _
diff --git a/tamiko.html b/tamiko.html
index a938a30dfbc0..4594b55987d7 100644
--- a/tamiko.html
+++ b/tamiko.html
@@ -46,23 +46,21 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tamiko
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tamiko
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing tamiko
+            <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 tamiko
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced tamiko
+            <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 tamiko
 </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 tamiko
-</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/tamiko.txt b/tamiko.txt
index 89dba8cff37d..e5690f77b69e 100644
--- a/tamiko.txt
+++ b/tamiko.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tamiko
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tamiko
 Already up to date.
 *** synced tamiko
diff --git a/tarantool.html b/tarantool.html
index 02b6b4456c7f..42297a00e943 100644
--- a/tarantool.html
+++ b/tarantool.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 tarantool
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tarantool
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing tarantool
+            <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 tarantool
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced tarantool
+            <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 tarantool
 </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 tarantool
-</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/tarantool.txt b/tarantool.txt
index 10d0b42dd820..2cffd727cb3d 100644
--- a/tarantool.txt
+++ b/tarantool.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tarantool
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tarantool
 Already up to date.
 *** synced tarantool
diff --git a/tastytea.html b/tastytea.html
index 5414927ba25b..c2e69fcfa36f 100644
--- a/tastytea.html
+++ b/tastytea.html
@@ -36,25 +36,23 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tastytea
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tastytea
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing tastytea
+            <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 tastytea
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced tastytea
+            <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>error: gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>error: gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification
+            <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 tastytea
 </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 tastytea
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/tastytea.txt b/tastytea.txt
index 6947021bc0c5..84153fc4732e 100644
--- a/tastytea.txt
+++ b/tastytea.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tastytea
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tastytea
 Already up to date.
 *** synced tastytea
diff --git a/tatsh-overlay.html b/tatsh-overlay.html
index 98d9b6a0eda4..6b153d5092f6 100644
--- a/tatsh-overlay.html
+++ b/tatsh-overlay.html
@@ -42,37 +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 tatsh-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tatsh-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing tatsh-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>From https://github.com/Tatsh/tatsh-overlay
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced tatsh-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>   53dbb135..4e7dd5f3  master     -&gt; origin/master
+            <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>Updating 53dbb135..4e7dd5f3
+            <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>Fast-forward
+            <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> dev-python/minchoc/Manifest                                       | 4 ++--
+            <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 tatsh-overlay
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> dev-python/minchoc/{minchoc-0.0.5.ebuild =&gt; minchoc-0.0.6.ebuild} | 0
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> 2 files changed, 2 insertions(+), 2 deletions(-)
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> rename dev-python/minchoc/{minchoc-0.0.5.ebuild =&gt; minchoc-0.0.6.ebuild} (100%)
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced tatsh-overlay
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay
-</pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</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/tatsh-overlay.txt b/tatsh-overlay.txt
index da363655811f..d6c99d3da8aa 100644
--- a/tatsh-overlay.txt
+++ b/tatsh-overlay.txt
@@ -14,16 +14,8 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tatsh-overlay
-From https://github.com/Tatsh/tatsh-overlay
-   53dbb135..4e7dd5f3  master     -> origin/master
-Updating 53dbb135..4e7dd5f3
-Fast-forward
- dev-python/minchoc/Manifest                                       | 4 ++--
- dev-python/minchoc/{minchoc-0.0.5.ebuild => minchoc-0.0.6.ebuild} | 0
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename dev-python/minchoc/{minchoc-0.0.5.ebuild => minchoc-0.0.6.ebuild} (100%)
+Already up to date.
 *** synced tatsh-overlay
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/telans.html b/telans.html
index e5f68b904db6..f22225826bd2 100644
--- a/telans.html
+++ b/telans.html
@@ -36,23 +36,21 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync telans
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 telans
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing telans
+            <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 telans
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced telans
+            <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 telans
 </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 telans
-</pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/telans.txt b/telans.txt
index 441e80ed53c6..e90e1e3dea37 100644
--- a/telans.txt
+++ b/telans.txt
@@ -11,7 +11,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync telans
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing telans
 Already up to date.
 *** synced telans
diff --git a/tezeta.html b/tezeta.html
index 65dd2333c370..3f85ca26c1c0 100644
--- a/tezeta.html
+++ b/tezeta.html
@@ -42,31 +42,29 @@
 </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 tezeta
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tezeta
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing tezeta
+            <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 tezeta
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced tezeta
+            <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 tezeta
 </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 tezeta
-</pre></td></tr>
-            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-misc/pro-intellimouse-control-panel-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * app-misc/pro-intellimouse-control-panel-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/stopwatch-3.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * app-misc/stopwatch-3.5: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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-misc/sm64ex-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * games-misc/sm64ex-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/funiq-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  called die)
+            <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * sys-apps/funiq-9999: failed sourcing ebuild: eutils: EAPI 7 not supported, (eutils.eclass, line  18:  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/tezeta.txt b/tezeta.txt
index a690095b4d2f..b9d516d66875 100644
--- a/tezeta.txt
+++ b/tezeta.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tezeta
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tezeta
 Already up to date.
 *** synced tezeta
diff --git a/tgbugs-overlay.html b/tgbugs-overlay.html
index 554109164744..8f55e8f53585 100644
--- a/tgbugs-overlay.html
+++ b/tgbugs-overlay.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tgbugs-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tgbugs-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tgbugs-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 tgbugs-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced tgbugs-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 tgbugs-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 tgbugs-overlay
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/tgbugs-overlay.txt b/tgbugs-overlay.txt
index 50fc4b6640ef..0b974674581c 100644
--- a/tgbugs-overlay.txt
+++ b/tgbugs-overlay.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tgbugs-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tgbugs-overlay
 Already up to date.
 *** synced tgbugs-overlay
diff --git a/thegreatmcpain.html b/thegreatmcpain.html
index 81e0206344ac..158928042300 100644
--- a/thegreatmcpain.html
+++ b/thegreatmcpain.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 thegreatmcpain
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 thegreatmcpain
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing thegreatmcpain
+            <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 thegreatmcpain
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced thegreatmcpain
+            <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 thegreatmcpain
 </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 thegreatmcpain
-</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/thegreatmcpain.txt b/thegreatmcpain.txt
index 883f3ef40c51..96d60c658c18 100644
--- a/thegreatmcpain.txt
+++ b/thegreatmcpain.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync thegreatmcpain
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing thegreatmcpain
 Already up to date.
 *** synced thegreatmcpain
diff --git a/third-party-certbot-plugins.html b/third-party-certbot-plugins.html
index 579342575b6c..f8f488068fa4 100644
--- a/third-party-certbot-plugins.html
+++ b/third-party-certbot-plugins.html
@@ -44,23 +44,21 @@
 </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 third-party-certbot-plugins
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 third-party-certbot-plugins
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing third-party-certbot-plugins
+            <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 third-party-certbot-plugins
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced third-party-certbot-plugins
+            <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 third-party-certbot-plugins
 </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 third-party-certbot-plugins
-</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/third-party-certbot-plugins.txt b/third-party-certbot-plugins.txt
index fe6672ab6eca..db96cb25f29a 100644
--- a/third-party-certbot-plugins.txt
+++ b/third-party-certbot-plugins.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync third-party-certbot-plugins
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing third-party-certbot-plugins
 Already up to date.
 *** synced third-party-certbot-plugins
diff --git a/tmacedo.html b/tmacedo.html
index 5b823ba5e177..1fede2e63665 100644
--- a/tmacedo.html
+++ b/tmacedo.html
@@ -40,23 +40,21 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tmacedo
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 tmacedo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tmacedo
+            <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 tmacedo
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced tmacedo
+            <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 tmacedo
 </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 tmacedo
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/tmacedo.txt b/tmacedo.txt
index 77c61bf86302..cf8268a3d08a 100644
--- a/tmacedo.txt
+++ b/tmacedo.txt
@@ -13,7 +13,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tmacedo
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tmacedo
 Already up to date.
 *** synced tmacedo
diff --git a/toniz4-overlay.html b/toniz4-overlay.html
index cf49b89a7c7c..ace151e3fc8e 100644
--- a/toniz4-overlay.html
+++ b/toniz4-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 toniz4-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 toniz4-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing toniz4-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 toniz4-overlay
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced toniz4-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 toniz4-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 toniz4-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/toniz4-overlay.txt b/toniz4-overlay.txt
index 1dc46f355c22..eaee830337ea 100644
--- a/toniz4-overlay.txt
+++ b/toniz4-overlay.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync toniz4-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing toniz4-overlay
 Already up to date.
 *** synced toniz4-overlay
diff --git a/toolchain.html b/toolchain.html
index 7d8b51e464cd..b21ae95f2c60 100644
--- a/toolchain.html
+++ b/toolchain.html
@@ -46,23 +46,21 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync toolchain
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 toolchain
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing toolchain
+            <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 toolchain
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced toolchain
+            <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 toolchain
 </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 toolchain
-</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/toolchain.txt b/toolchain.txt
index ec1a063a2339..81d8a4b147b0 100644
--- a/toolchain.txt
+++ b/toolchain.txt
@@ -16,7 +16,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync toolchain
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing toolchain
 Already up to date.
 *** synced toolchain
diff --git a/torbrowser.html b/torbrowser.html
index 01e8df53a688..b8f6978b8a24 100644
--- a/torbrowser.html
+++ b/torbrowser.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync torbrowser
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing torbrowser
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing torbrowser
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced torbrowser
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced torbrowser
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 torbrowser
 </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 torbrowser
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/torbrowser.txt b/torbrowser.txt
index fcd70d343653..145558fbe7cc 100644
--- a/torbrowser.txt
+++ b/torbrowser.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync torbrowser
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing torbrowser
 Already up to date.
 *** synced torbrowser
diff --git a/touchfish-os.html b/touchfish-os.html
index 5bf9e0cb5e82..762e35437a8b 100644
--- a/touchfish-os.html
+++ b/touchfish-os.html
@@ -38,23 +38,21 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync touchfish-os
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing touchfish-os
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing touchfish-os
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced touchfish-os
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced touchfish-os
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 touchfish-os
 </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 touchfish-os
-</pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/touchfish-os.txt b/touchfish-os.txt
index 9faff7e6e214..be52006d577e 100644
--- a/touchfish-os.txt
+++ b/touchfish-os.txt
@@ -12,7 +12,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync touchfish-os
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing touchfish-os
 Already up to date.
 *** synced touchfish-os
diff --git a/trolltoo.html b/trolltoo.html
index 49a11079dd90..ea906205e705 100644
--- a/trolltoo.html
+++ b/trolltoo.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 trolltoo
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 trolltoo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing trolltoo
+            <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 trolltoo
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced trolltoo
+            <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 trolltoo
 </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 trolltoo
-</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/trolltoo.txt b/trolltoo.txt
index dda040de7d7c..8fd3b5bb8087 100644
--- a/trolltoo.txt
+++ b/trolltoo.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync trolltoo
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing trolltoo
 Already up to date.
 *** synced trolltoo
diff --git a/tryton.html b/tryton.html
index b4f5c5860e29..b1b7c72655c7 100644
--- a/tryton.html
+++ b/tryton.html
@@ -32,25 +32,23 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tryton
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing tryton
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing tryton
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>pulling from https://foss.heptapod.net/tryton/gentoo-overlay
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>pulling from https://foss.heptapod.net/tryton/gentoo-overlay
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>searching for changes
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>searching for changes
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>no changes found
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>no changes found
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced tryton
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced tryton
+            <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>$ hg log -l 1 --template={date|isodatesec}
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ hg log -l 1 --template={date|isodatesec}
+            <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 tryton
 </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 tryton
-</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/tryton.txt b/tryton.txt
index baeebdf6aa22..4d0ac205e50d 100644
--- a/tryton.txt
+++ b/tryton.txt
@@ -9,7 +9,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tryton
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tryton
 pulling from https://foss.heptapod.net/tryton/gentoo-overlay
 searching for changes
diff --git a/turret-overlay.html b/turret-overlay.html
index 769321eddd86..ecaf7ddf7f35 100644
--- a/turret-overlay.html
+++ b/turret-overlay.html
@@ -32,23 +32,21 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync turret-overlay
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing turret-overlay
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing turret-overlay
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** synced turret-overlay
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced turret-overlay
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 turret-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 turret-overlay
-</pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/turret-overlay.txt b/turret-overlay.txt
index 10af88160997..cadf93150f1a 100644
--- a/turret-overlay.txt
+++ b/turret-overlay.txt
@@ -9,7 +9,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync turret-overlay
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing turret-overlay
 Already up to date.
 *** synced turret-overlay
diff --git a/ukui.html b/ukui.html
index d616ab26fd74..719dc7b44f4c 100644
--- a/ukui.html
+++ b/ukui.html
@@ -50,23 +50,21 @@
 </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-sync/etc/portage sync ukui
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing ukui
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** syncing ukui
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced ukui
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced ukui
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 ukui
 </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 ukui
-</pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/ukui.txt b/ukui.txt
index e0c00e38c335..22282fa77f5a 100644
--- a/ukui.txt
+++ b/ukui.txt
@@ -18,7 +18,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ukui
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ukui
 Already up to date.
 *** synced ukui
diff --git a/ulm.html b/ulm.html
index 0aa35218132a..5674b4d1d05c 100644
--- a/ulm.html
+++ b/ulm.html
@@ -44,23 +44,21 @@
 </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 ulm
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 ulm
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing ulm
+            <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 ulm
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced ulm
+            <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 ulm
 </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 ulm
-</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/ulm.txt b/ulm.txt
index 5626b5577487..263154bea52f 100644
--- a/ulm.txt
+++ b/ulm.txt
@@ -15,7 +15,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ulm
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ulm
 Already up to date.
 *** synced ulm
diff --git a/unc3nsored.html b/unc3nsored.html
index 9174e194a35c..10ded76e5409 100644
--- a/unc3nsored.html
+++ b/unc3nsored.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 unc3nsored
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#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 unc3nsored
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing unc3nsored
+            <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 unc3nsored
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced unc3nsored
+            <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 unc3nsored
 </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 unc3nsored
-</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/unc3nsored.txt b/unc3nsored.txt
index 09f413ed29e8..620dec9a328a 100644
--- a/unc3nsored.txt
+++ b/unc3nsored.txt
@@ -14,7 +14,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync unc3nsored
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing unc3nsored
 Already up to date.
 *** synced unc3nsored
diff --git a/underworld.html b/underworld.html
index a36c37245db7..8f806acb07da 100644
--- a/underworld.html
+++ b/underworld.html
@@ -48,23 +48,21 @@
 </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 underworld
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing underworld
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing underworld
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced underworld
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced underworld
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 underworld
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 underworld
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/underworld.txt b/underworld.txt
index 7c5248ec682b..2e07b3fea7e7 100644
--- a/underworld.txt
+++ b/underworld.txt
@@ -17,7 +17,6 @@
 pkgcore 0.12.21
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync underworld
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing underworld
 Already up to date.
 *** synced underworld