2021-02-23T11:30:01Z

45 files changed, 469 insertions, 631 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index 8e4f094642d9..efc703a2ff69 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -50,7 +50,7 @@
 </pre></td></tr>
             <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.31M
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.13M
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
@@ -62,7 +62,7 @@
 </pre></td></tr>
             <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.54K bytes  received 2.60M bytes  1.74M bytes/sec
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.54K bytes  received 2.60M bytes  1.05M bytes/sec
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 60.36M  speedup is 23.08
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index a48dd7afb6e4..19629f6bba2c 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 60.36M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.31M
+File list size: 2.13M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
 Total bytes sent: 17.54K
 Total bytes received: 2.60M
 
-sent 17.54K bytes  received 2.60M bytes  1.74M bytes/sec
+sent 17.54K bytes  received 2.60M bytes  1.05M bytes/sec
 total size is 60.36M  speedup is 23.08
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/dlang.html b/dlang.html
index 4ed7c9e27804..1b67a3d2467c 100644
--- a/dlang.html
+++ b/dlang.html
@@ -34,47 +34,49 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dlang
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </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>invocation.
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dlang
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dlang
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing dlang
 </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>*** synced dlang
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dlang
+            <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> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dlang
+</pre></td></tr>
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dlang.txt b/dlang.txt
index 72f7ce9719f0..8e082494f5c1 100644
--- a/dlang.txt
+++ b/dlang.txt
@@ -10,6 +10,7 @@
             {'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}],
  'status': 'unofficial'}
 $ pmaint sync dlang
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dotnet.html b/dotnet.html
index 7e9b6c485eb1..bffb9ff1d972 100644
--- a/dotnet.html
+++ b/dotnet.html
@@ -34,49 +34,47 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dotnet
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <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>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+            <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>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>*** syncing dotnet
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing dotnet
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dotnet
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dotnet
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dotnet
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dotnet
-</pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dotnet.txt b/dotnet.txt
index 6ab41bbd5063..3e734cde42a9 100644
--- a/dotnet.txt
+++ b/dotnet.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git@github.com:gentoo/dotnet.git'}],
  'status': 'official'}
 $ pmaint sync dotnet
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/index.html b/index.html
index 23a93d92f902..97354848edf5 100644
--- a/index.html
+++ b/index.html
@@ -926,7 +926,7 @@
 
         </table>
 
-        <address>Generated based on results from 2021-02-23 11:21:56 UTC</address>
+        <address>Generated based on results from 2021-02-23 11:36:55 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/leonardohn.html b/leonardohn.html
index e72434c93286..1537799cf52d 100644
--- a/leonardohn.html
+++ b/leonardohn.html
@@ -38,47 +38,49 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync leonardohn
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </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>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing leonardohn
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced leonardohn
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing leonardohn
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced leonardohn
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leonardohn
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leonardohn
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/leonardohn.txt b/leonardohn.txt
index 31ee4bbeb767..71b0305fb693 100644
--- a/leonardohn.txt
+++ b/leonardohn.txt
@@ -12,6 +12,7 @@
              'uri': 'git+ssh://git@github.com/leonardohn/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync leonardohn
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/levenkov.html b/levenkov.html
index eacf8ff9cfa7..cc195fb76695 100644
--- a/levenkov.html
+++ b/levenkov.html
@@ -40,49 +40,51 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync levenkov
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore: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).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing levenkov
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced levenkov
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing levenkov
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced levenkov
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 levenkov
+            <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="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/glob2-0.4.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 levenkov
+</pre></td></tr>
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/glob2-0.4.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/levenkov.txt b/levenkov.txt
index d8161874eec3..f07b97e6fa42 100644
--- a/levenkov.txt
+++ b/levenkov.txt
@@ -13,6 +13,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/levenkov.git'}],
  'status': 'unofficial'}
 $ pmaint sync levenkov
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/librepilot.html b/librepilot.html
index 545d5d57573c..10a2cf5973ce 100644
--- a/librepilot.html
+++ b/librepilot.html
@@ -38,47 +38,49 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync librepilot
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </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>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing librepilot
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced librepilot
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing librepilot
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced librepilot
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/librepilot.txt b/librepilot.txt
index 0e40873b2449..811756bbf85a 100644
--- a/librepilot.txt
+++ b/librepilot.txt
@@ -12,6 +12,7 @@
              'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync librepilot
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/libressl.html b/libressl.html
index bd598b53dc76..8e5e80dfda1c 100644
--- a/libressl.html
+++ b/libressl.html
@@ -34,47 +34,49 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync libressl
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </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>invocation.
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing libressl
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced libressl
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing libressl
 </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>*** synced libressl
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
+            <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> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
+</pre></td></tr>
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/libressl.txt b/libressl.txt
index 2b87ba9a72c8..949c337c4da6 100644
--- a/libressl.txt
+++ b/libressl.txt
@@ -10,6 +10,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/libressl.git'}],
  'status': 'official'}
 $ pmaint sync libressl
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/liftm.html b/liftm.html
index c6f9263254d6..01cdfe816ef1 100644
--- a/liftm.html
+++ b/liftm.html
@@ -36,47 +36,49 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync liftm
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </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>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </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>invocation.
 </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>
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing liftm
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced liftm
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing liftm
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced liftm
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
+</pre></td></tr>
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/liftm.txt b/liftm.txt
index a63c9f26429a..15504911fb55 100644
--- a/liftm.txt
+++ b/liftm.txt
@@ -11,6 +11,7 @@
              'uri': 'git+ssh://git@github.com/jcaesar/liftm-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync liftm
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/linux-be.html b/linux-be.html
index 610d3ec96bb1..6891b1450e91 100644
--- a/linux-be.html
+++ b/linux-be.html
@@ -42,47 +42,49 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync linux-be
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore: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).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing linux-be
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced linux-be
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing linux-be
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced linux-be
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/linux-be.txt b/linux-be.txt
index 5e78aefe01cb..10141e6a248d 100644
--- a/linux-be.txt
+++ b/linux-be.txt
@@ -14,6 +14,7 @@
              'uri': 'git+ssh://git@gitlab.com/linux-be/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linux-be
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/linuxunderground-overlay.html b/linuxunderground-overlay.html
index 914a4d2ce21b..3cd98f262dcb 100644
--- a/linuxunderground-overlay.html
+++ b/linuxunderground-overlay.html
@@ -36,47 +36,49 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync linuxunderground-overlay
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </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>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </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>invocation.
 </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>
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing linuxunderground-overlay
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced linuxunderground-overlay
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing linuxunderground-overlay
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced linuxunderground-overlay
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linuxunderground-overlay
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linuxunderground-overlay
+</pre></td></tr>
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/linuxunderground-overlay.txt b/linuxunderground-overlay.txt
index d1723ad8c518..2a9a6f93b484 100644
--- a/linuxunderground-overlay.txt
+++ b/linuxunderground-overlay.txt
@@ -11,6 +11,7 @@
              'uri': 'https://github.com/linuxunderground/gentoo.overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linuxunderground-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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/linxon.html b/linxon.html
index 3fdb08b78f98..355b756eca60 100644
--- a/linxon.html
+++ b/linxon.html
@@ -30,95 +30,97 @@
 </pre></td></tr>
             <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync linxon
 </pre></td></tr>
-            <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
 </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>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing linxon
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced linxon
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing linxon
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced linxon
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+            <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 show -q --pretty=format:%G? HEAD
+            <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linxon
+            <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="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-admin/vhost-gen-0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linxon
+</pre></td></tr>
+            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-admin/vhost-gen-0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-admin/vhost-gen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-admin/vhost-gen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-backup/bytterfs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-backup/bytterfs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-forensics/s3tk-0.1.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-forensics/s3tk-0.1.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-forensics/s3tk-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-forensics/s3tk-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-forensics/s3tk-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-forensics/s3tk-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-misc/brntool-20180404: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-misc/brntool-20180404: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-misc/brntool-20180719: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-misc/brntool-20180719: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-misc/brntool-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-misc/brntool-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-misc/gpick-0.2.4-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-misc/gpick-0.2.4-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/Elixir-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/Elixir-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/confy-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/confy-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/twodict-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/twodict-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/twodict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/twodict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-util/pytwf-20140513: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-util/pytwf-20140513: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-util/pytwf-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-util/pytwf-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * games-misc/nrubik-20170118: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * games-misc/nrubik-20170118: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-video/olive-0.1.0_pre: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-video/olive-0.1.0_pre: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-video/olive-9999: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-video/olive-9999: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-misc/gymail-20170205: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-misc/gymail-20170205: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-misc/gymail-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/gymail-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/youtube-dl-gui-0.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/youtube-dl-gui-0.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/youtube-dl-gui-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-misc/youtube-dl-gui-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * x11-misc/qsudo-20180424: failed sourcing ebuild: EAPI=6 is not supported
+            <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * x11-misc/qsudo-20180424: failed sourcing ebuild: EAPI=6 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/linxon.txt b/linxon.txt
index 97a7194ff2db..b2fbeacb151a 100644
--- a/linxon.txt
+++ b/linxon.txt
@@ -8,6 +8,7 @@
              'uri': 'https://github.com/linxon/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linxon
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/lisp.html b/lisp.html
index 75d121b7240e..a1062f2a977d 100644
--- a/lisp.html
+++ b/lisp.html
@@ -42,47 +42,49 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync lisp
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore: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).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing lisp
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced lisp
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing lisp
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced lisp
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lisp
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lisp
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/lisp.txt b/lisp.txt
index c29cbe10d5f6..140dbf27416f 100644
--- a/lisp.txt
+++ b/lisp.txt
@@ -14,6 +14,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/lisp.git'}],
  'status': 'official'}
 $ pmaint sync lisp
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/lmiphay.html b/lmiphay.html
index bbad0a87083b..9681c432687f 100644
--- a/lmiphay.html
+++ b/lmiphay.html
@@ -32,91 +32,93 @@
 </pre></td></tr>
             <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync lmiphay
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore: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).
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing lmiphay
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced lmiphay
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing lmiphay
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced lmiphay
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * dev-python/curve25519-donna-1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay
+</pre></td></tr>
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/curve25519-donna-1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/ed25519-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/ed25519-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/fuzzywuzzy-0.15.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/fuzzywuzzy-0.15.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/gtts-token-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/gtts-token-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/heat-translator-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/heat-translator-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/kafka-python-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/kafka-python-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/lambda-uploader-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/lambda-uploader-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/namespace-ruamel-1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/namespace-ruamel-1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/pykerberos-1.1.13: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pykerberos-1.1.13: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pyswagger-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/pyswagger-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/python-consul-0.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/python-consul-0.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/python-ironic-inspector-client-1.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/python-ironic-inspector-client-1.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/python-krbV-1.0.90: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/python-krbV-1.0.90: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/python-mistralclient-2.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/python-mistralclient-2.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/python-zaqarclient-1.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/python-zaqarclient-1.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/ruamel-bws-0.3.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/ruamel-bws-0.3.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/spark_parser-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/spark_parser-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/spec-1.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/spec-1.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/srptools-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/srptools-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/toolz-0.8.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/toolz-0.8.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/tosca-parser-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/tosca-parser-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/ua-parser-0.7.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/ua-parser-0.7.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/lmiphay.txt b/lmiphay.txt
index 44ab678c5c3e..0cdc768d7ca9 100644
--- a/lmiphay.txt
+++ b/lmiphay.txt
@@ -9,6 +9,7 @@
              'uri': 'git://anongit.gentoo.org/user/lmiphay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lmiphay
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/lordvan.html b/lordvan.html
index 25615cca4c94..e1fb048e7eec 100644
--- a/lordvan.html
+++ b/lordvan.html
@@ -40,53 +40,55 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync lordvan
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore: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).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing lordvan
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced lordvan
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing lordvan
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced lordvan
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lordvan
+            <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="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-tv/me-tv-1.4.0.10: failed sourcing ebuild: EAPI=4 is not supported
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lordvan
+</pre></td></tr>
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-tv/me-tv-1.4.0.10: failed sourcing ebuild: EAPI=4 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-mail/dbmail-3.1.9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-mail/dbmail-3.1.9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-mail/mailman-3.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-mail/mailman-3.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</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/lordvan.txt b/lordvan.txt
index 76662221cfc7..e0ff6fdb562c 100644
--- a/lordvan.txt
+++ b/lordvan.txt
@@ -13,6 +13,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/lordvan.git'}],
  'status': 'unofficial'}
 $ pmaint sync lordvan
+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).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/menelkir.html b/menelkir.html
index ef09c1912b93..89b084a6df2a 100644
--- a/menelkir.html
+++ b/menelkir.html
@@ -64,147 +64,27 @@
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://gitlab.com/menelkir/gentoo-overlay
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>   a500d902..b36663ee  master     -&gt; origin/master
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing menelkir
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating a500d902..b36663ee
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced menelkir
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> app-misc/g15composer/Manifest                      |  8 +---
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../g15composer/files/g15composer-3.2-docdir.patch | 11 -----
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> .../files/g15composer-3.2-freetype_pkgconfig.patch | 44 --------------------
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> app-misc/g15composer/files/g15composer-3.2.confd   | 17 --------
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> app-misc/g15composer/files/g15composer-3.2.initd   | 48 ----------------------
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> ...mposer-3.2-r1.ebuild =&gt; g15composer-3.4.ebuild} | 26 +++---------
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> app-misc/g15composer/g15composer-9999.ebuild       | 35 ++++++++++++++++
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> app-misc/g15macro/Manifest                         |  6 +--
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> .../files/g15macro-1.0.3-Makefile.am.patch         | 13 ------
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> .../files/g15macro-1.0.3-configure.in.patch        | 10 -----
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> ...macro-1.0.3-r2.ebuild =&gt; g15macro-1.0.5.ebuild} | 13 ++----
-</pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> app-misc/g15macro/g15macro-9999.ebuild             | 35 ++++++++++++++++
-</pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> app-misc/g15message/Manifest                       |  5 +--
-</pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> .../g15message/files/g15message-1.0.0-docdir.patch | 11 -----
-</pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> ...ssage-1.0.0-r2.ebuild =&gt; g15message-1.2.ebuild} |  6 +--
-</pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> app-misc/g15message/g15message-9999.ebuild         | 26 ++++++++++++
-</pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> app-misc/g15mpd/Manifest                           |  7 +---
-</pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> .../files/g15mpd-1.0.0-cflags-and-lib-fix.patch    | 18 --------
-</pre></td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch    | 11 -----
-</pre></td></tr>
-            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch    | 34 ---------------
-</pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> .../{g15mpd-1.0.0-r2.ebuild =&gt; g15mpd-1.1.ebuild}  | 14 ++-----
-</pre></td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> app-misc/g15mpd/g15mpd-9999.ebuild                 | 37 +++++++++++++++++
-</pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> .../{g15composer-3.2-r1 =&gt; g15composer-3.4}        | 11 +++--
-</pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> metadata/md5-cache/app-misc/g15composer-9999       | 11 +++++
-</pre></td></tr>
-            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> metadata/md5-cache/app-misc/g15macro-1.0.5         | 13 ++++++
-</pre></td></tr>
-            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> metadata/md5-cache/app-misc/g15macro-9999          | 11 +++++
-</pre></td></tr>
-            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> .../{g15message-1.0.0-r2 =&gt; g15message-1.2}        |  6 +--
-</pre></td></tr>
-            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> .../{g15macro-1.0.3-r2 =&gt; g15message-9999}         | 14 +++----
-</pre></td></tr>
-            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> .../app-misc/{g15mpd-1.0.0-r2 =&gt; g15mpd-1.1}       | 10 ++---
-</pre></td></tr>
-            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> metadata/md5-cache/app-misc/g15mpd-9999            | 12 ++++++
-</pre></td></tr>
-            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> 30 files changed, 217 insertions(+), 306 deletions(-)
-</pre></td></tr>
-            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> delete mode 100644 app-misc/g15composer/files/g15composer-3.2-docdir.patch
-</pre></td></tr>
-            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> delete mode 100644 app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch
-</pre></td></tr>
-            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> delete mode 100644 app-misc/g15composer/files/g15composer-3.2.confd
-</pre></td></tr>
-            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> delete mode 100644 app-misc/g15composer/files/g15composer-3.2.initd
-</pre></td></tr>
-            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> rename app-misc/g15composer/{g15composer-3.2-r1.ebuild =&gt; g15composer-3.4.ebuild} (53%)
-</pre></td></tr>
-            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> create mode 100644 app-misc/g15composer/g15composer-9999.ebuild
-</pre></td></tr>
-            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> delete mode 100644 app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
-</pre></td></tr>
-            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> delete mode 100644 app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
-</pre></td></tr>
-            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> rename app-misc/g15macro/{g15macro-1.0.3-r2.ebuild =&gt; g15macro-1.0.5.ebuild} (64%)
-</pre></td></tr>
-            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> create mode 100644 app-misc/g15macro/g15macro-9999.ebuild
-</pre></td></tr>
-            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> delete mode 100644 app-misc/g15message/files/g15message-1.0.0-docdir.patch
-</pre></td></tr>
-            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> rename app-misc/g15message/{g15message-1.0.0-r2.ebuild =&gt; g15message-1.2.ebuild} (74%)
-</pre></td></tr>
-            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> create mode 100644 app-misc/g15message/g15message-9999.ebuild
-</pre></td></tr>
-            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> delete mode 100644 app-misc/g15mpd/files/g15mpd-1.0.0-cflags-and-lib-fix.patch
-</pre></td></tr>
-            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> delete mode 100644 app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch
-</pre></td></tr>
-            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> delete mode 100644 app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch
-</pre></td></tr>
-            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> rename app-misc/g15mpd/{g15mpd-1.0.0-r2.ebuild =&gt; g15mpd-1.1.ebuild} (65%)
-</pre></td></tr>
-            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> create mode 100644 app-misc/g15mpd/g15mpd-9999.ebuild
-</pre></td></tr>
-            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> rename metadata/md5-cache/app-misc/{g15composer-3.2-r1 =&gt; g15composer-3.4} (60%)
-</pre></td></tr>
-            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> create mode 100644 metadata/md5-cache/app-misc/g15composer-9999
-</pre></td></tr>
-            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> create mode 100644 metadata/md5-cache/app-misc/g15macro-1.0.5
-</pre></td></tr>
-            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> create mode 100644 metadata/md5-cache/app-misc/g15macro-9999
-</pre></td></tr>
-            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> rename metadata/md5-cache/app-misc/{g15message-1.0.0-r2 =&gt; g15message-1.2} (78%)
-</pre></td></tr>
-            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> rename metadata/md5-cache/app-misc/{g15macro-1.0.3-r2 =&gt; g15message-9999} (56%)
-</pre></td></tr>
-            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> rename metadata/md5-cache/app-misc/{g15mpd-1.0.0-r2 =&gt; g15mpd-1.1} (50%)
-</pre></td></tr>
-            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> create mode 100644 metadata/md5-cache/app-misc/g15mpd-9999
-</pre></td></tr>
-            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>*** syncing menelkir
-</pre></td></tr>
-            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>*** synced menelkir
-</pre></td></tr>
-            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir
-</pre></td></tr>
-            <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * www-client/ungoogled-chromium-87.0.4280.141_p1: failed parsing REQUIRED_USE: '|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( ) thinlto? ( clang ) optimize-thinlto? ( thinlto ) cfi? ( thinlto ) pgo? ( clang ) x86? ( !thinlto !widevine )' is unparseable
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * www-client/ungoogled-chromium-87.0.4280.141_p1: failed parsing REQUIRED_USE: '|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( ) thinlto? ( clang ) optimize-thinlto? ( thinlto ) cfi? ( thinlto ) pgo? ( clang ) x86? ( !thinlto !widevine )' is unparseable
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * www-client/ungoogled-chromium-88.0.4324.96-r1: failed parsing REQUIRED_USE: '|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( ) thinlto? ( clang ) optimize-thinlto? ( thinlto ) cfi? ( thinlto ) pgo? ( clang ) x86? ( !thinlto !widevine )' is unparseable
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * www-client/ungoogled-chromium-88.0.4324.96-r1: failed parsing REQUIRED_USE: '|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( ) thinlto? ( clang ) optimize-thinlto? ( thinlto ) cfi? ( thinlto ) pgo? ( clang ) x86? ( !thinlto !widevine )' is unparseable
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * www-client/ungoogled-chromium-88.0.4324.104-r1: failed parsing REQUIRED_USE: '|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( ) thinlto? ( clang ) optimize-thinlto? ( thinlto ) cfi? ( thinlto ) pgo? ( clang ) x86? ( !thinlto !widevine )' is unparseable
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * www-client/ungoogled-chromium-88.0.4324.104-r1: failed parsing REQUIRED_USE: '|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( ) thinlto? ( clang ) optimize-thinlto? ( thinlto ) cfi? ( thinlto ) pgo? ( clang ) x86? ( !thinlto !widevine )' is unparseable
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/menelkir.txt b/menelkir.txt
index 4869ee96dd97..734290223283 100644
--- a/menelkir.txt
+++ b/menelkir.txt
@@ -25,67 +25,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://gitlab.com/menelkir/gentoo-overlay
-   a500d902..b36663ee  master     -> origin/master
-Updating a500d902..b36663ee
-Fast-forward
- app-misc/g15composer/Manifest                      |  8 +---
- .../g15composer/files/g15composer-3.2-docdir.patch | 11 -----
- .../files/g15composer-3.2-freetype_pkgconfig.patch | 44 --------------------
- app-misc/g15composer/files/g15composer-3.2.confd   | 17 --------
- app-misc/g15composer/files/g15composer-3.2.initd   | 48 ----------------------
- ...mposer-3.2-r1.ebuild => g15composer-3.4.ebuild} | 26 +++---------
- app-misc/g15composer/g15composer-9999.ebuild       | 35 ++++++++++++++++
- app-misc/g15macro/Manifest                         |  6 +--
- .../files/g15macro-1.0.3-Makefile.am.patch         | 13 ------
- .../files/g15macro-1.0.3-configure.in.patch        | 10 -----
- ...macro-1.0.3-r2.ebuild => g15macro-1.0.5.ebuild} | 13 ++----
- app-misc/g15macro/g15macro-9999.ebuild             | 35 ++++++++++++++++
- app-misc/g15message/Manifest                       |  5 +--
- .../g15message/files/g15message-1.0.0-docdir.patch | 11 -----
- ...ssage-1.0.0-r2.ebuild => g15message-1.2.ebuild} |  6 +--
- app-misc/g15message/g15message-9999.ebuild         | 26 ++++++++++++
- app-misc/g15mpd/Manifest                           |  7 +---
- .../files/g15mpd-1.0.0-cflags-and-lib-fix.patch    | 18 --------
- app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch    | 11 -----
- app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch    | 34 ---------------
- .../{g15mpd-1.0.0-r2.ebuild => g15mpd-1.1.ebuild}  | 14 ++-----
- app-misc/g15mpd/g15mpd-9999.ebuild                 | 37 +++++++++++++++++
- .../{g15composer-3.2-r1 => g15composer-3.4}        | 11 +++--
- metadata/md5-cache/app-misc/g15composer-9999       | 11 +++++
- metadata/md5-cache/app-misc/g15macro-1.0.5         | 13 ++++++
- metadata/md5-cache/app-misc/g15macro-9999          | 11 +++++
- .../{g15message-1.0.0-r2 => g15message-1.2}        |  6 +--
- .../{g15macro-1.0.3-r2 => g15message-9999}         | 14 +++----
- .../app-misc/{g15mpd-1.0.0-r2 => g15mpd-1.1}       | 10 ++---
- metadata/md5-cache/app-misc/g15mpd-9999            | 12 ++++++
- 30 files changed, 217 insertions(+), 306 deletions(-)
- delete mode 100644 app-misc/g15composer/files/g15composer-3.2-docdir.patch
- delete mode 100644 app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch
- delete mode 100644 app-misc/g15composer/files/g15composer-3.2.confd
- delete mode 100644 app-misc/g15composer/files/g15composer-3.2.initd
- rename app-misc/g15composer/{g15composer-3.2-r1.ebuild => g15composer-3.4.ebuild} (53%)
- create mode 100644 app-misc/g15composer/g15composer-9999.ebuild
- delete mode 100644 app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch
- delete mode 100644 app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch
- rename app-misc/g15macro/{g15macro-1.0.3-r2.ebuild => g15macro-1.0.5.ebuild} (64%)
- create mode 100644 app-misc/g15macro/g15macro-9999.ebuild
- delete mode 100644 app-misc/g15message/files/g15message-1.0.0-docdir.patch
- rename app-misc/g15message/{g15message-1.0.0-r2.ebuild => g15message-1.2.ebuild} (74%)
- create mode 100644 app-misc/g15message/g15message-9999.ebuild
- delete mode 100644 app-misc/g15mpd/files/g15mpd-1.0.0-cflags-and-lib-fix.patch
- delete mode 100644 app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch
- delete mode 100644 app-misc/g15mpd/files/g15mpd-1.0.0-libmpd.patch
- rename app-misc/g15mpd/{g15mpd-1.0.0-r2.ebuild => g15mpd-1.1.ebuild} (65%)
- create mode 100644 app-misc/g15mpd/g15mpd-9999.ebuild
- rename metadata/md5-cache/app-misc/{g15composer-3.2-r1 => g15composer-3.4} (60%)
- create mode 100644 metadata/md5-cache/app-misc/g15composer-9999
- create mode 100644 metadata/md5-cache/app-misc/g15macro-1.0.5
- create mode 100644 metadata/md5-cache/app-misc/g15macro-9999
- rename metadata/md5-cache/app-misc/{g15message-1.0.0-r2 => g15message-1.2} (78%)
- rename metadata/md5-cache/app-misc/{g15macro-1.0.3-r2 => g15message-9999} (56%)
- rename metadata/md5-cache/app-misc/{g15mpd-1.0.0-r2 => g15mpd-1.1} (50%)
- create mode 100644 metadata/md5-cache/app-misc/g15mpd-9999
+Already up to date.
 *** syncing menelkir
 *** synced menelkir
  * Sync succeeded
diff --git a/pentoo.html b/pentoo.html
index 23254da84b50..7078017b6f5b 100644
--- a/pentoo.html
+++ b/pentoo.html
@@ -60,37 +60,21 @@
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://github.com/pentoo/pentoo-overlay
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>   ba36cae21..b86def40e  master     -&gt; origin/master
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing pentoo
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating ba36cae21..b86def40e
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced pentoo
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> dev-python/hexdump/hexdump-3.3.ebuild   |  4 ++--
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> dev-util/jnitrace/Manifest              |  1 +
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-util/jnitrace/jnitrace-3.2.0.ebuild | 23 +++++++++++++++++++++++
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pentoo
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> 3 files changed, 26 insertions(+), 2 deletions(-)
-</pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> create mode 100644 dev-util/jnitrace/jnitrace-3.2.0.ebuild
-</pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** syncing pentoo
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced pentoo
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pentoo
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/pentoo.txt b/pentoo.txt
index a15d4e3d59d0..f2d726e0b7e1 100644
--- a/pentoo.txt
+++ b/pentoo.txt
@@ -23,15 +23,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://github.com/pentoo/pentoo-overlay
-   ba36cae21..b86def40e  master     -> origin/master
-Updating ba36cae21..b86def40e
-Fast-forward
- dev-python/hexdump/hexdump-3.3.ebuild   |  4 ++--
- dev-util/jnitrace/Manifest              |  1 +
- dev-util/jnitrace/jnitrace-3.2.0.ebuild | 23 +++++++++++++++++++++++
- 3 files changed, 26 insertions(+), 2 deletions(-)
- create mode 100644 dev-util/jnitrace/jnitrace-3.2.0.ebuild
+Already up to date.
 *** syncing pentoo
 *** synced pentoo
  * Sync succeeded
diff --git a/poly-c.html b/poly-c.html
index 4defffe93760..e5056f6e2870 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -112,7 +112,7 @@
 </pre></td></tr>
             <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes  received 132 bytes  86.80 bytes/sec
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes  received 132 bytes  62.00 bytes/sec
 </pre></td></tr>
             <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/poly-c.txt b/poly-c.txt
index 01ff2746bfed..e108b4881760 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -49,7 +49,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 132
 
-sent 85 bytes  received 132 bytes  86.80 bytes/sec
+sent 85 bytes  received 132 bytes  62.00 bytes/sec
 total size is 32  speedup is 0.15
 *** syncing poly-c
 *** synced poly-c
diff --git a/swegener.html b/swegener.html
index 391b7194ba40..cda54dd3a9c4 100644
--- a/swegener.html
+++ b/swegener.html
@@ -100,7 +100,7 @@
 </pre></td></tr>
             <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 143 bytes  received 5.38K bytes  1.58K bytes/sec
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 143 bytes  received 5.38K bytes  2.21K bytes/sec
 </pre></td></tr>
             <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 105.64K  speedup is 19.12
 </pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index 36ba62b1a76e..7190ea096659 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -43,7 +43,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 143
 Total bytes received: 5.38K
 
-sent 143 bytes  received 5.38K bytes  1.58K bytes/sec
+sent 143 bytes  received 5.38K bytes  2.21K bytes/sec
 total size is 105.64K  speedup is 19.12
 *** syncing swegener
 *** synced swegener
diff --git a/vdr-devel.html b/vdr-devel.html
index 958c6d986993..8b53bd413f0e 100644
--- a/vdr-devel.html
+++ b/vdr-devel.html
@@ -42,47 +42,49 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vdr-devel
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vdr-devel
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vdr-devel
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing vdr-devel
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced vdr-devel
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vdr-devel
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vdr-devel
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/vdr-devel.txt b/vdr-devel.txt
index 3030c6762174..2d214f025d16 100644
--- a/vdr-devel.txt
+++ b/vdr-devel.txt
@@ -14,6 +14,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}],
  'status': 'official'}
 $ pmaint sync vdr-devel
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/vifino-overlay.html b/vifino-overlay.html
index 6e160c224a66..abbb9d4861fc 100644
--- a/vifino-overlay.html
+++ b/vifino-overlay.html
@@ -40,47 +40,49 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vifino-overlay
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vifino-overlay
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/vifino-overlay.txt b/vifino-overlay.txt
index b0f4462d7de7..b4d7eb198a1c 100644
--- a/vifino-overlay.txt
+++ b/vifino-overlay.txt
@@ -13,6 +13,7 @@
             {'type': 'git', 'uri': 'git@github.com:vifino/vifino-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vifino-overlay
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/vklimovs.html b/vklimovs.html
index 9475c0576cb1..aa35005d097c 100644
--- a/vklimovs.html
+++ b/vklimovs.html
@@ -38,47 +38,49 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vklimovs
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </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>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vklimovs
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vklimovs
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vklimovs
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vklimovs
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/vklimovs.txt b/vklimovs.txt
index fe881afef31a..14229cf51a99 100644
--- a/vklimovs.txt
+++ b/vklimovs.txt
@@ -12,6 +12,7 @@
              'uri': 'git+ssh://git@github.com/vklimovs/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vklimovs
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/zugaina.html b/zugaina.html
index a9869f803ab1..c54943af5e90 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -48,21 +48,21 @@
 </pre></td></tr>
             <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 39.27K
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 44.05K
 </pre></td></tr>
             <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 499
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 491
 </pre></td></tr>
             <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes received: 46.98K
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 499 bytes  received 46.98K bytes  18.99K bytes/sec
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 491 bytes  received 46.98K bytes  13.56K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.22M  speedup is 46.74
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.22M  speedup is 46.75
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing zugaina
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 72e70b56850c..3f0bd99f03ed 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -17,14 +17,14 @@ Total file size: 2.22M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 39.27K
+File list size: 44.05K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 499
+Total bytes sent: 491
 Total bytes received: 46.98K
 
-sent 499 bytes  received 46.98K bytes  18.99K bytes/sec
-total size is 2.22M  speedup is 46.74
+sent 491 bytes  received 46.98K bytes  13.56K bytes/sec
+total size is 2.22M  speedup is 46.75
 *** syncing zugaina
 *** synced zugaina
  * Sync succeeded