2021-04-19T18:30:01Z

23 files changed, 154 insertions, 181 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index d8acbcce1f98..fa3ed0b0e396 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -52,19 +52,19 @@
 </pre></td></tr>
             <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.42M
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.18M
 </pre></td></tr>
             <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.92K
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.91K
 </pre></td></tr>
             <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 2.75M
 </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>sent 17.92K bytes  received 2.75M bytes  1.85M bytes/sec
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.91K bytes  received 2.75M bytes  1.85M bytes/sec
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 66.18M  speedup is 23.87
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 1782313fc726..40934f54fe52 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -19,13 +19,13 @@ Total file size: 66.18M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.42M
+File list size: 2.18M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 17.92K
+Total bytes sent: 17.91K
 Total bytes received: 2.75M
 
-sent 17.92K bytes  received 2.75M bytes  1.85M bytes/sec
+sent 17.91K bytes  received 2.75M bytes  1.85M bytes/sec
 total size is 66.18M  speedup is 23.87
 *** synced R_Overlay
  * Sync succeeded
diff --git a/calculate.html b/calculate.html
index 20f65b9a995a..230ebc9f605d 100644
--- a/calculate.html
+++ b/calculate.html
@@ -56,19 +56,25 @@
 </pre></td></tr>
             <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>Already up to date.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>From git://git.calculate-linux.org/calculate/calculate-overlay
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced calculate
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>   604c61c4a..d270bb296  develop    -&gt; origin/develop
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>   e0ff0092c..d270bb296  update     -&gt; origin/update
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced calculate
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 calculate
+            <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> * Cache regenerated successfully
+            <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 show -q --pretty=format:%G? HEAD
+</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 calculate
+</pre></td></tr>
+            <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/calculate.txt b/calculate.txt
index 7a4756b42bcf..214fbf4ca1b3 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -21,6 +21,9 @@ 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 git://git.calculate-linux.org/calculate/calculate-overlay
+   604c61c4a..d270bb296  develop    -> origin/develop
+   e0ff0092c..d270bb296  update     -> origin/update
 Already up to date.
 *** synced calculate
  * Sync succeeded
diff --git a/index.html b/index.html
index 684be5f88c92..977808dca40f 100644
--- a/index.html
+++ b/index.html
@@ -777,7 +777,7 @@
 
         </table>
 
-        <address>Generated based on results from 2021-04-19 18:19:44 UTC</address>
+        <address>Generated based on results from 2021-04-19 18:34:44 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/jsteward.html b/jsteward.html
index 55aa89b9e4d7..8b30cf1cf6bd 100644
--- a/jsteward.html
+++ b/jsteward.html
@@ -38,49 +38,47 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync jsteward
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing jsteward
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing jsteward
+            <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>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>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>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>commands sometime before your next pull:
 </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>
 </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.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.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <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>  git config pull.ff only       # fast-forward only
+            <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>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+            <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>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>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>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>invocation.
 </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>
 </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>Already up to date.
 </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>*** synced jsteward
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced jsteward
+            <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> * Sync succeeded
+            <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>$ git log --format=%ci -1
+            <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>$ git show -q --pretty=format:%G? HEAD
+            <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 jsteward
 </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 jsteward
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/jsteward.txt b/jsteward.txt
index f15305d7f95f..43f617f155aa 100644
--- a/jsteward.txt
+++ b/jsteward.txt
@@ -12,7 +12,6 @@
             {'type': 'git', 'uri': 'git@github.com:KireinaHoro/jsteward.git'}],
  'status': 'unofficial'}
 $ pmaint sync jsteward
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jsteward
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/poly-c.html b/poly-c.html
index 948ce7aaeb9e..4c2d21691071 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -116,7 +116,7 @@
 </pre></td></tr>
             <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>sent 85 bytes  received 134 bytes  87.60 bytes/sec
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>sent 85 bytes  received 134 bytes  62.57 bytes/sec
 </pre></td></tr>
             <tr class="" id="l55"><td><a href="#l55"><span>55</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 4fc1533c1da7..7776fa84b6dc 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -51,7 +51,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 134
 
-sent 85 bytes  received 134 bytes  87.60 bytes/sec
+sent 85 bytes  received 134 bytes  62.57 bytes/sec
 total size is 32  speedup is 0.15
 *** synced poly-c
  * Sync succeeded
diff --git a/swegener.html b/swegener.html
index d1ced564c1fe..13b555a69786 100644
--- a/swegener.html
+++ b/swegener.html
@@ -98,15 +98,15 @@
 </pre></td></tr>
             <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total bytes sent: 139
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total bytes sent: 143
 </pre></td></tr>
             <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total bytes received: 5.09K
 </pre></td></tr>
             <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>sent 139 bytes  received 5.09K bytes  1.49K bytes/sec
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>sent 143 bytes  received 5.09K bytes  2.09K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>total size is 107.84K  speedup is 20.62
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>total size is 107.84K  speedup is 20.60
 </pre></td></tr>
             <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced swegener
 </pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index 22c41365a364..a30963fae780 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -42,11 +42,11 @@ Matched data: 0 bytes
 File list size: 5.00K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 139
+Total bytes sent: 143
 Total bytes received: 5.09K
 
-sent 139 bytes  received 5.09K bytes  1.49K bytes/sec
-total size is 107.84K  speedup is 20.62
+sent 143 bytes  received 5.09K bytes  2.09K bytes/sec
+total size is 107.84K  speedup is 20.60
 *** synced swegener
  * Sync succeeded
 $ stat --format=%y .
diff --git a/thegreatmcpain.html b/thegreatmcpain.html
index fbe5c7cc9d06..7ba86eb911eb 100644
--- a/thegreatmcpain.html
+++ b/thegreatmcpain.html
@@ -68,33 +68,19 @@
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>From https://gitlab.com/TheGreatMcPain/thegreatmcpain-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>   82d5a1e..44f2d98  master     -&gt; origin/master
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced thegreatmcpain
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating 82d5a1e..44f2d98
+            <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>Fast-forward
+            <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> x11-drivers/nvidia-drivers/Manifest                |   2 +
+            <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> .../nvidia-drivers/nvidia-drivers-455.50.14.ebuild | 598 +++++++++++++++++++++
+            <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 thegreatmcpain
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> 2 files changed, 600 insertions(+)
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-455.50.14.ebuild
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced thegreatmcpain
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 thegreatmcpain
-</pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+            <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/thegreatmcpain.txt b/thegreatmcpain.txt
index 77607673cfda..9c2da2f32234 100644
--- a/thegreatmcpain.txt
+++ b/thegreatmcpain.txt
@@ -27,14 +27,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/TheGreatMcPain/thegreatmcpain-overlay
-   82d5a1e..44f2d98  master     -> origin/master
-Updating 82d5a1e..44f2d98
-Fast-forward
- x11-drivers/nvidia-drivers/Manifest                |   2 +
- .../nvidia-drivers/nvidia-drivers-455.50.14.ebuild | 598 +++++++++++++++++++++
- 2 files changed, 600 insertions(+)
- create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-455.50.14.ebuild
+Already up to date.
 *** synced thegreatmcpain
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/tocaro.html b/tocaro.html
index 20ad5fb5f2f9..7739c89c4a1d 100644
--- a/tocaro.html
+++ b/tocaro.html
@@ -40,49 +40,47 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tocaro
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing tocaro
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tocaro
+            <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>warning: Pulling without specifying how to reconcile divergent branches is
+            <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>discouraged. You can squelch this message by running one of the following
+            <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>commands sometime before your next pull:
+            <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>  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.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <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>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <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>or --ff-only on the command line to override the configured default per
+            <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>invocation.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced tocaro
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced tocaro
+            <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> * Sync succeeded
+            <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>$ git log --format=%ci -1
+            <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>$ git show -q --pretty=format:%G? HEAD
+            <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 tocaro
 </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 tocaro
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+            <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/tocaro.txt b/tocaro.txt
index c9d70998ffee..ef7f9ccdc43b 100644
--- a/tocaro.txt
+++ b/tocaro.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/tocaro.git'}],
  'status': 'unofficial'}
 $ pmaint sync tocaro
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing tocaro
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/toniz4-overlay.html b/toniz4-overlay.html
index 4444d73e7a18..12a1fe3e7aa4 100644
--- a/toniz4-overlay.html
+++ b/toniz4-overlay.html
@@ -42,49 +42,47 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync toniz4-overlay
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing toniz4-overlay
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing toniz4-overlay
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>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>warning: Pulling without specifying how to reconcile divergent branches is
+            <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>discouraged. You can squelch this message by running one of the following
+            <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>commands sometime before your next pull:
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  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.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <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>  git config pull.ff only       # fast-forward only
+            <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>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <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>or --ff-only on the command line to override the configured default per
+            <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>invocation.
+            <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>
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced toniz4-overlay
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced toniz4-overlay
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 toniz4-overlay
 </pre></td></tr>
-            <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 toniz4-overlay
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/toniz4-overlay.txt b/toniz4-overlay.txt
index 89c2ce9094ca..8ad5e4306cc9 100644
--- a/toniz4-overlay.txt
+++ b/toniz4-overlay.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@github.com:toniz4/toniz4-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync toniz4-overlay
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing toniz4-overlay
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/toolchain.html b/toolchain.html
index 720ae63392ac..a6a156b1f836 100644
--- a/toolchain.html
+++ b/toolchain.html
@@ -42,49 +42,47 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync toolchain
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing toolchain
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing toolchain
+            <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>warning: Pulling without specifying how to reconcile divergent branches is
+            <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>discouraged. You can squelch this message by running one of the following
+            <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>commands sometime before your next pull:
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  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.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <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>  git config pull.ff only       # fast-forward only
+            <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>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <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>or --ff-only on the command line to override the configured default per
+            <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>invocation.
+            <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>
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced toolchain
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced toolchain
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 toolchain
 </pre></td></tr>
-            <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 toolchain
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/toolchain.txt b/toolchain.txt
index f79012bd8a80..06e2bb91032f 100644
--- a/toolchain.txt
+++ b/toolchain.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/toolchain.git'}],
  'status': 'official'}
 $ pmaint sync toolchain
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing toolchain
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/torbrowser.html b/torbrowser.html
index d5b3adb6051f..3ff4a606da19 100644
--- a/torbrowser.html
+++ b/torbrowser.html
@@ -38,49 +38,47 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync torbrowser
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing torbrowser
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing torbrowser
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>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>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>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>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>commands sometime before your next pull:
 </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>
 </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.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.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <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>  git config pull.ff only       # fast-forward only
+            <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>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+            <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>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>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>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>invocation.
 </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>
 </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>Already up to date.
 </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>*** synced torbrowser
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced torbrowser
+            <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> * Sync succeeded
+            <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>$ git log --format=%ci -1
+            <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>$ git show -q --pretty=format:%G? HEAD
+            <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 torbrowser
 </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 torbrowser
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/torbrowser.txt b/torbrowser.txt
index d2c59033f86f..a538147868fc 100644
--- a/torbrowser.txt
+++ b/torbrowser.txt
@@ -12,7 +12,6 @@
              'uri': 'git@github.com:MeisterP/torbrowser-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync torbrowser
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing torbrowser
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/zugaina.html b/zugaina.html
index c78cf9d308bd..fa908e73d0d8 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -50,21 +50,21 @@
 </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: 40.19K
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 41.28K
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 482
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 478
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 44.36K
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 44.35K
 </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 482 bytes  received 44.36K bytes  17.93K bytes/sec
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 478 bytes  received 44.35K bytes  12.81K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 2.01M  speedup is 44.84
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 2.01M  speedup is 44.85
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced zugaina
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 8664d5a0ed85..2be72cea5c89 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -18,14 +18,14 @@ Total file size: 2.01M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 40.19K
+File list size: 41.28K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 482
-Total bytes received: 44.36K
+Total bytes sent: 478
+Total bytes received: 44.35K
 
-sent 482 bytes  received 44.36K bytes  17.93K bytes/sec
-total size is 2.01M  speedup is 44.84
+sent 478 bytes  received 44.35K bytes  12.81K bytes/sec
+total size is 2.01M  speedup is 44.85
 *** synced zugaina
  * Sync succeeded
 $ stat --format=%y .