2020-11-20T06:00:01Z

23 files changed, 269 insertions, 409 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index f3e2a95ff149..868eca9d5a32 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -36,35 +36,35 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Number of files: 126,928 (reg: 105,637, dir: 21,291)
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of created files: 143 (reg: 128, dir: 15)
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of created files: 0
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of deleted files: 0
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of regular files transferred: 204
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of regular files transferred: 0
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Total file size: 99.27M bytes
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total transferred file size: 375.12K bytes
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total transferred file size: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Literal data: 375.12K bytes
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Literal data: 0 bytes
 </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: 3.08M
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.99M
 </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: 26.30K
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 22.57K
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 3.82M
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 3.64M
 </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 26.30K bytes  received 3.82M bytes  1.10M bytes/sec
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 22.57K bytes  received 3.64M bytes  1.47M bytes/sec
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 99.27M  speedup is 25.82
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 99.27M  speedup is 27.07
 </pre></td></tr>
             <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing R_Overlay
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index c7959c245a6a..bb1a36aef136 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -11,21 +11,21 @@
 $ pmaint sync R_Overlay
 
 Number of files: 126,928 (reg: 105,637, dir: 21,291)
-Number of created files: 143 (reg: 128, dir: 15)
+Number of created files: 0
 Number of deleted files: 0
-Number of regular files transferred: 204
+Number of regular files transferred: 0
 Total file size: 99.27M bytes
-Total transferred file size: 375.12K bytes
-Literal data: 375.12K bytes
+Total transferred file size: 0 bytes
+Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 3.08M
+File list size: 2.99M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 26.30K
-Total bytes received: 3.82M
+Total bytes sent: 22.57K
+Total bytes received: 3.64M
 
-sent 26.30K bytes  received 3.82M bytes  1.10M bytes/sec
-total size is 99.27M  speedup is 25.82
+sent 22.57K bytes  received 3.64M bytes  1.47M bytes/sec
+total size is 99.27M  speedup is 27.07
 *** syncing R_Overlay
 *** synced R_Overlay
  * Sync succeeded
diff --git a/andjscott.html b/andjscott.html
index b75d70cea83b..a255ba182b8a 100644
--- a/andjscott.html
+++ b/andjscott.html
@@ -28,49 +28,51 @@
 </pre></td></tr>
             <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync andjscott
 </pre></td></tr>
-            <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <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
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull:
+            <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
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </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.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <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
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <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,
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation.
+            <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
 </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>invocation.
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing andjscott
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced andjscott
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing andjscott
 </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>*** synced andjscott
 </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> * Sync succeeded
 </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>$ git log --format=%ci -1
 </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 1 andjscott
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * x11-misc/autorandr-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 andjscott
+</pre></td></tr>
+            <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * x11-misc/autorandr-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/andjscott.txt b/andjscott.txt
index e65c073762c9..1bba7d1e6e97 100644
--- a/andjscott.txt
+++ b/andjscott.txt
@@ -7,6 +7,7 @@
              'uri': 'https://github.com/andjscott/overlays.git'}],
  'status': 'unofficial'}
 $ pmaint sync andjscott
+WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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/anomen.html b/anomen.html
index c98b5d743a28..8b657f717a2f 100644
--- a/anomen.html
+++ b/anomen.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 anomen
 </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:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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 anomen
+            <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 anomen
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing anomen
 </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 anomen
 </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 1 anomen
+            <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 1 anomen
+</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/anomen.txt b/anomen.txt
index 56d185fdd30c..6661fd1806d2 100644
--- a/anomen.txt
+++ b/anomen.txt
@@ -12,6 +12,7 @@
              'uri': 'git@github.com:anomen-s/anomen-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync anomen
+WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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/anyc.html b/anyc.html
index 4636ba0d161c..66c9b684fbf9 100644
--- a/anyc.html
+++ b/anyc.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 anyc
 </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:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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 anyc
+            <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 anyc
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing anyc
 </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 anyc
 </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 1 anyc
+            <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 1 anyc
+</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/anyc.txt b/anyc.txt
index 10523026a316..568323757222 100644
--- a/anyc.txt
+++ b/anyc.txt
@@ -11,6 +11,7 @@
             {'type': 'git', 'uri': 'git@github.com:anyc/anyc-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync anyc
+WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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/deter.html b/deter.html
index 0e4fd46ef9f6..fc3d3bcf5208 100644
--- a/deter.html
+++ b/deter.html
@@ -36,49 +36,51 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync deter
 </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: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="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 deter
+            <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 deter
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing deter
 </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 deter
 </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 1 deter
+            <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="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deter
+</pre></td></tr>
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/deter.txt b/deter.txt
index 59486ffd6a37..5c26f9cd26d3 100644
--- a/deter.txt
+++ b/deter.txt
@@ -11,6 +11,7 @@
             {'type': 'git', 'uri': 'git@github.com:deterenkelt/deter.git'}],
  'status': 'unofficial'}
 $ pmaint sync deter
+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/didactic-duck.html b/didactic-duck.html
index c0893f5e0777..9a6f9268fe8a 100644
--- a/didactic-duck.html
+++ b/didactic-duck.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 didactic-duck
 </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 didactic-duck
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing didactic-duck
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced didactic-duck
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced didactic-duck
+            <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 1 didactic-duck
 </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 1 didactic-duck
-</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/didactic-duck.txt b/didactic-duck.txt
index cd2023abe45b..333ca7466e83 100644
--- a/didactic-duck.txt
+++ b/didactic-duck.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/lucianposton/didactic-duck.git'}],
  'status': 'unofficial'}
 $ pmaint sync didactic-duck
-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/dilfridge.html b/dilfridge.html
index 91fc814467b0..c9245b7075cb 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -44,49 +44,47 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync dilfridge
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</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="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 "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>You can replace "git config" with "git config --global" 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>*** syncing dilfridge
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing dilfridge
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dilfridge
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced dilfridge
+            <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> * Sync succeeded
+            <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>$ git log --format=%ci -1
+            <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>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
+            <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/dilfridge.txt b/dilfridge.txt
index 2ce95887990f..f0834ba70225 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/dilfridge.git'}],
  'status': 'official'}
 $ pmaint sync dilfridge
-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/djc.html b/djc.html
index 93280c66d404..817f6b2b2fa7 100644
--- a/djc.html
+++ b/djc.html
@@ -36,49 +36,47 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync djc
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</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="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>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>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>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>commands sometime before your next pull:
 </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>
 </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.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.rebase false  # merge (the default strategy)
+            <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>  git config pull.rebase true   # rebase
+            <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>  git config pull.ff only       # fast-forward only
+            <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>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>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>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>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>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>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>invocation.
 </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>
 </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>Already up to date.
 </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>*** syncing djc
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing djc
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced djc
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced djc
+            <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> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <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>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 djc
 </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 1 djc
-</pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <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/djc.txt b/djc.txt
index fefa6dbf7311..984c64400bd5 100644
--- a/djc.txt
+++ b/djc.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync djc
-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/gentoo.html b/gentoo.html
index 9ce40d7ff00a..6255f3b5617b 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -64,219 +64,21 @@
 </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://anongit.gentoo.org/git/repo/gentoo
+            <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>   916793ed4f9..422f4274638  master     -&gt; origin/master
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>You are not currently on a branch.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gentoo
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Please specify which branch you want to merge with.
+            <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>See git-pull(1) for details.
+            <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>
+            <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 pull &lt;remote&gt; &lt;branch&gt;
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing gentoo
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>!!! failed syncing gentoo
-</pre></td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync failed with 1
-</pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Will try to re-create
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint sync gentoo
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Updating files:  20% (17442/87064)
-</pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Updating files:  21% (18284/87064)
-</pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating files:  22% (19155/87064)
-</pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files:  23% (20025/87064)
-</pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files:  24% (20896/87064)
-</pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files:  25% (21766/87064)
-</pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files:  26% (22637/87064)
-</pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files:  27% (23508/87064)
-</pre></td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files:  28% (24378/87064)
-</pre></td></tr>
-            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files:  29% (25249/87064)
-</pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files:  30% (26120/87064)
-</pre></td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files:  31% (26990/87064)
-</pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files:  32% (27861/87064)
-</pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files:  33% (28732/87064)
-</pre></td></tr>
-            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Updating files:  34% (29602/87064)
-</pre></td></tr>
-            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Updating files:  35% (30473/87064)
-</pre></td></tr>
-            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Updating files:  36% (31344/87064)
-</pre></td></tr>
-            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Updating files:  37% (32214/87064)
-</pre></td></tr>
-            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Updating files:  38% (33085/87064)
-</pre></td></tr>
-            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Updating files:  39% (33955/87064)
-</pre></td></tr>
-            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Updating files:  40% (34826/87064)
-</pre></td></tr>
-            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Updating files:  41% (35697/87064)
-</pre></td></tr>
-            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Updating files:  41% (36357/87064)
-</pre></td></tr>
-            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Updating files:  42% (36567/87064)
-</pre></td></tr>
-            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Updating files:  43% (37438/87064)
-</pre></td></tr>
-            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Updating files:  44% (38309/87064)
-</pre></td></tr>
-            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Updating files:  45% (39179/87064)
-</pre></td></tr>
-            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Updating files:  46% (40050/87064)
-</pre></td></tr>
-            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Updating files:  47% (40921/87064)
-</pre></td></tr>
-            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Updating files:  48% (41791/87064)
-</pre></td></tr>
-            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Updating files:  49% (42662/87064)
-</pre></td></tr>
-            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Updating files:  50% (43532/87064)
-</pre></td></tr>
-            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Updating files:  51% (44403/87064)
-</pre></td></tr>
-            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Updating files:  52% (45274/87064)
-</pre></td></tr>
-            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files:  53% (46144/87064)
-</pre></td></tr>
-            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files:  54% (47015/87064)
-</pre></td></tr>
-            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files:  55% (47886/87064)
-</pre></td></tr>
-            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files:  56% (48756/87064)
-</pre></td></tr>
-            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files:  57% (49627/87064)
-</pre></td></tr>
-            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files:  58% (50498/87064)
-</pre></td></tr>
-            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files:  59% (51368/87064)
-</pre></td></tr>
-            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files:  60% (52239/87064)
-</pre></td></tr>
-            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files:  61% (53110/87064)
-</pre></td></tr>
-            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files:  61% (53429/87064)
-</pre></td></tr>
-            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files:  62% (53980/87064)
-</pre></td></tr>
-            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files:  63% (54851/87064)
-</pre></td></tr>
-            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files:  64% (55721/87064)
-</pre></td></tr>
-            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files:  65% (56592/87064)
-</pre></td></tr>
-            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files:  66% (57463/87064)
-</pre></td></tr>
-            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files:  67% (58333/87064)
-</pre></td></tr>
-            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files:  68% (59204/87064)
-</pre></td></tr>
-            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files:  69% (60075/87064)
-</pre></td></tr>
-            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files:  70% (60945/87064)
-</pre></td></tr>
-            <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files:  71% (61816/87064)
-</pre></td></tr>
-            <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files:  72% (62687/87064)
-</pre></td></tr>
-            <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files:  73% (63557/87064)
-</pre></td></tr>
-            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files:  74% (64428/87064)
-</pre></td></tr>
-            <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files:  75% (65298/87064)
-</pre></td></tr>
-            <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files:  76% (66169/87064)
-</pre></td></tr>
-            <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files:  77% (67040/87064)
-</pre></td></tr>
-            <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files:  78% (67910/87064)
-</pre></td></tr>
-            <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files:  79% (68781/87064)
-</pre></td></tr>
-            <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files:  80% (69652/87064)
-</pre></td></tr>
-            <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files:  81% (70522/87064)
-</pre></td></tr>
-            <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Updating files:  81% (70836/87064)
-</pre></td></tr>
-            <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Updating files:  82% (71393/87064)
-</pre></td></tr>
-            <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Updating files:  83% (72264/87064)
-</pre></td></tr>
-            <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>Updating files:  84% (73134/87064)
-</pre></td></tr>
-            <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>Updating files:  85% (74005/87064)
-</pre></td></tr>
-            <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Updating files:  86% (74876/87064)
-</pre></td></tr>
-            <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Updating files:  87% (75746/87064)
-</pre></td></tr>
-            <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Updating files:  88% (76617/87064)
-</pre></td></tr>
-            <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Updating files:  89% (77487/87064)
-</pre></td></tr>
-            <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Updating files:  90% (78358/87064)
-</pre></td></tr>
-            <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>Updating files:  91% (79229/87064)
-</pre></td></tr>
-            <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre>Updating files:  92% (80099/87064)
-</pre></td></tr>
-            <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>Updating files:  93% (80970/87064)
-</pre></td></tr>
-            <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>Updating files:  94% (81841/87064)
-</pre></td></tr>
-            <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre>Updating files:  95% (82711/87064)
-</pre></td></tr>
-            <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>Updating files:  95% (83057/87064)
-</pre></td></tr>
-            <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre>Updating files:  96% (83582/87064)
-</pre></td></tr>
-            <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre>Updating files:  97% (84453/87064)
-</pre></td></tr>
-            <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre>Updating files:  98% (85323/87064)
-</pre></td></tr>
-            <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre>Updating files:  99% (86194/87064)
-</pre></td></tr>
-            <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre>Updating files: 100% (87064/87064)
-</pre></td></tr>
-            <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre>Updating files: 100% (87064/87064), done.
-</pre></td></tr>
-            <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre>*** syncing gentoo
-</pre></td></tr>
-            <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
-            <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> * Sync succeeded after re-adding
-</pre></td></tr>
-            <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
-</pre></td></tr>
-            <tr class="" id="l134"><td><a href="#l134"><span>134</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/gentoo.txt b/gentoo.txt
index bc99b46ff85a..106eb8ffaef8 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -25,24 +25,10 @@ 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://anongit.gentoo.org/git/repo/gentoo
-   916793ed4f9..422f4274638  master     -> origin/master
-You are not currently on a branch.
-Please specify which branch you want to merge with.
-See git-pull(1) for details.
-
-    git pull <remote> <branch>
-
-*** syncing gentoo
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files:  20% (17442/87064)
Updating files:  21% (18284/87064)
Updating files:  22% (19155/87064)
Updating files:  23% (20025/87064)
Updating files:  24% (20896/87064)
Updating files:  25% (21766/87064)
Updating files:  26% (22637/87064)
Updating files:  27% (23508/87064)
Updating files:  28% (24378/87064)
Updating files:  29% (25249/87064)
Updating files:  30% (26120/87064)
Updating files:  31% (26990/87064)
Updating files:  32% (27861/87064)
Updating files:  33% (28732/87064)
Updating files:  34% (29602/87064)
Updating files:  35% (30473/87064)
Updating files:  36% (31344/87064)
Updating files:  37% (32214/87064)
Updating files:  38% (33085/87064)
Updating files:  39% (33955/87064)
Updating files:  40% (34826/87064)
Updating files:  41% (35697/87064)
Updating files:  41% (36357/87064)
Updating files:  42% (36567/87064)
Updating files:  43% (37438/87064)
Updating files:  44% (38309/87064)
Updating files:  45% (39179/87064)
Updating files:  46% (40050/87064)
Updating files:  47% (40921/87064)
Updating files:  48% (41791/87064)
Updating files:  49% (42662/87064)
Updating files:  50% (43532/87064)
Updating files:  51% (44403/87064)
Updating files:  52% (45274/87064)
Updating files:  53% (46144/87064)
Updating files:  54% (47015/87064)
Updating files:  55% (47886/87064)
Updating files:  56% (48756/87064)
Updating files:  57% (49627/87064)
Updating files:  58% (50498/87064)
Updating files:  59% (51368/87064)
Updating files:  60% (52239/87064)
Updating files:  61% (53110/87064)
Updating files:  61% (53429/87064)
Updating files:  62% (53980/87064)
Updating files:  63% (54851/87064)
Updating files:  64% (55721/87064)
Updating files:  65% (56592/87064)
Updating files:  66% (57463/87064)
Updating files:  67% (58333/87064)
Updating files:  68% (59204/87064)
Updating files:  69% (60075/87064)
Updating files:  70% (60945/87064)
Updating files:  71% (61816/87064)
Updating files:  72% (62687/87064)
Updating files:  73% (63557/87064)
Updating files:  74% (64428/87064)
Updating files:  75% (65298/87064)
Updating files:  76% (66169/87064)
Updating files:  77% (67040/87064)
Updating files:  78% (67910/87064)
Updating files:  79% (68781/87064)
Updating files:  80% (69652/87064)
Updating files:  81% (70522/87064)
Updating files:  81% (70836/87064)
Updating files:  82% (71393/87064)
Updating files:  83% (72264/87064)
Updating files:  84% (73134/87064)
Updating files:  85% (74005/87064)
Updating files:  86% (74876/87064)
Updating files:  87% (75746/87064)
Updating files:  88% (76617/87064)
Updating files:  89% (77487/87064)
Updating files:  90% (78358/87064)
Updating files:  91% (79229/87064)
Updating files:  92% (80099/87064)
Updating files:  93% (80970/87064)
Updating files:  94% (81841/87064)
Updating files:  95% (82711/87064)
Updating files:  95% (83057/87064)
Updating files:  96% (83582/87064)
Updating files:  97% (84453/87064)
Updating files:  98% (85323/87064)
Updating files:  99% (86194/87064)
Updating files: 100% (87064/87064)
Updating files: 100% (87064/87064), done.
+Already up to date.
 *** syncing gentoo
 *** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
diff --git a/index.html b/index.html
index 40a73f96193b..07eeb72e58eb 100644
--- a/index.html
+++ b/index.html
@@ -909,7 +909,7 @@
 
         </table>
 
-        <address>Generated based on results from 2020-11-20 05:45:44 UTC</address>
+        <address>Generated based on results from 2020-11-20 06:05:16 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/poly-c.html b/poly-c.html
index e04bac7a45a5..f84591178839 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 134 bytes  62.57 bytes/sec
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes  received 134 bytes  87.60 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 b45c7e58d010..eed3928e049d 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: 134
 
-sent 85 bytes  received 134 bytes  62.57 bytes/sec
+sent 85 bytes  received 134 bytes  87.60 bytes/sec
 total size is 32  speedup is 0.15
 *** syncing poly-c
 *** synced poly-c
diff --git a/xwing.html b/xwing.html
index 21bace73b7ab..c60955983be2 100644
--- a/xwing.html
+++ b/xwing.html
@@ -82,21 +82,67 @@
 </pre></td></tr>
             <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>sent 85 bytes  received 130 bytes  86.00 bytes/sec
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>sent 85 bytes  received 130 bytes  61.43 bytes/sec
 </pre></td></tr>
             <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing xwing
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced xwing
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Server Address : 91.134.139.206
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ stat --format=%y .
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Contact Name   : webmaster@xwing.info
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Hardware       : VPS 2016 SSD 3
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>
+</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>Number of files: 175 (reg: 117, dir: 58)
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of created files: 0
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Number of deleted files: 0
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Number of regular files transferred: 26
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total file size: 132.52K bytes
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Total transferred file size: 33.40K bytes
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Literal data: 33.40K bytes
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Matched data: 0 bytes
+</pre></td></tr>
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list size: 5.62K
+</pre></td></tr>
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>File list generation time: 0.001 seconds
+</pre></td></tr>
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>File list transfer time: 0.000 seconds
+</pre></td></tr>
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Total bytes sent: 660
+</pre></td></tr>
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Total bytes received: 24.35K
+</pre></td></tr>
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>sent 660 bytes  received 24.35K bytes  10.01K bytes/sec
+</pre></td></tr>
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>total size is 132.52K  speedup is 5.30
+</pre></td></tr>
+            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing xwing
+</pre></td></tr>
+            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced xwing
+</pre></td></tr>
+            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ stat --format=%y .
+</pre></td></tr>
+            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+</pre></td></tr>
+            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/xwing.txt b/xwing.txt
index fb18d963b723..4830b5a50a20 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -34,8 +34,31 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 130
 
-sent 85 bytes  received 130 bytes  86.00 bytes/sec
+sent 85 bytes  received 130 bytes  61.43 bytes/sec
 total size is 32  speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Server Address : 91.134.139.206
+Contact Name   : webmaster@xwing.info
+Hardware       : VPS 2016 SSD 3
+
+
+Number of files: 175 (reg: 117, dir: 58)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 26
+Total file size: 132.52K bytes
+Total transferred file size: 33.40K bytes
+Literal data: 33.40K bytes
+Matched data: 0 bytes
+File list size: 5.62K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 660
+Total bytes received: 24.35K
+
+sent 660 bytes  received 24.35K bytes  10.01K bytes/sec
+total size is 132.52K  speedup is 5.30
 *** syncing xwing
 *** synced xwing
  * Sync succeeded