From d44342fe8eceac76c5097f1c78c87b548789b669 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 12 Apr 2021 06:05:02 +0000 Subject: 2021-04-12T06:00:01Z --- R_Overlay.html | 4 +- R_Overlay.txt | 4 +- gentoo.html | 44 +++---- gentoo.txt | 1 - gerislay.html | 46 ++++--- gerislay.txt | 1 - gnuradio.html | 44 +++---- gnuradio.txt | 1 - gnustep.html | 44 +++---- gnustep.txt | 1 - go-overlay.html | 44 +++---- go-overlay.txt | 1 - godin.html | 44 +++---- godin.txt | 1 - goduck777.html | 44 +++---- goduck777.txt | 1 - goris.html | 56 ++++---- goris.txt | 1 - graaff.html | 44 +++---- graaff.txt | 1 - griffon_overlay.html | 44 +++---- griffon_overlay.txt | 1 - grub2-themes.html | 44 +++---- grub2-themes.txt | 1 - gsview-overlay.html | 44 +++---- gsview-overlay.txt | 1 - guru.html | 290 +++--------------------------------------- guru.txt | 126 +----------------- haarp.html | 46 ++++--- haarp.txt | 1 - hamper-overlay.html | 44 +++---- hamper-overlay.txt | 1 - han.html | 44 +++---- han.txt | 1 - hangul-typing.html | 44 +++---- hangul-typing.txt | 1 - haskell.html | 44 +++---- haskell.txt | 1 - heindsight.html | 44 +++---- heindsight.txt | 1 - hering-overlay.html | 44 +++---- hering-overlay.txt | 1 - hexedit-overlay.html | 46 ++++--- hexedit-overlay.txt | 1 - hibiscus.html | 44 +++---- hibiscus.txt | 1 - holgersson-overlay.html | 44 +++---- holgersson-overlay.txt | 1 - hossie.html | 44 +++---- hossie.txt | 1 - hotstoast.html | 44 +++---- hotstoast.txt | 1 - ikelos.html | 76 ++++++----- ikelos.txt | 1 - index.html | 2 +- ixit.html | 44 +++---- ixit.txt | 1 - jacendi-overlay.html | 44 +++---- jacendi-overlay.txt | 1 - jamesbroadhead.html | 44 +++---- jamesbroadhead.txt | 1 - java.html | 54 ++++---- java.txt | 1 - jboro-overlay.html | 44 +++---- jboro-overlay.txt | 1 - jkolo.html | 16 +-- jkolo.txt | 2 - jm-overlay.html | 44 +++---- jm-overlay.txt | 1 - jmbsvicetto.html | 44 +++---- jmbsvicetto.txt | 1 - johnmh.html | 46 ++++--- johnmh.txt | 1 - johu.html | 44 +++---- johu.txt | 1 - jorgicio.html | 66 +++++----- jorgicio.txt | 1 - jsteward.html | 44 +++---- jsteward.txt | 1 - junkdrawer.html | 62 +++++---- junkdrawer.txt | 1 - kaa.html | 46 ++++--- kaa.txt | 1 - kde.html | 2 +- kde.txt | 2 +- keepbot-overlay.html | 46 ++++--- keepbot-overlay.txt | 1 - khoverlay.html | 46 ++++--- khoverlay.txt | 1 - klondike.html | 46 ++++--- klondike.txt | 1 - konsolebox.html | 46 ++++--- konsolebox.txt | 1 - kripton-overlay.html | 46 ++++--- kripton-overlay.txt | 1 - kske.html | 46 ++++--- kske.txt | 1 - lanodanOverlay.html | 48 ++++--- lanodanOverlay.txt | 1 - leechcraft.html | 46 ++++--- leechcraft.txt | 1 - leio.html | 50 ++++---- leio.txt | 1 - librepilot.html | 46 ++++--- librepilot.txt | 1 - libressl.html | 46 ++++--- libressl.txt | 1 - liftm.html | 48 ++++--- liftm.txt | 1 - linux-be.html | 46 ++++--- linux-be.txt | 1 - linuxunderground-overlay.html | 46 ++++--- linuxunderground-overlay.txt | 1 - lisp.html | 128 +++++++++---------- lisp.txt | 1 - lmiphay.html | 48 ++++--- lmiphay.txt | 1 - lto-overlay.html | 46 ++++--- lto-overlay.txt | 1 - luke-jr.html | 46 ++++--- luke-jr.txt | 1 - luxifer.html | 46 +++---- luxifer.txt | 2 - maekke.html | 46 ++++--- maekke.txt | 1 - mate-de-gentoo.html | 46 ++++--- mate-de-gentoo.txt | 1 - megacoffee.html | 44 +++---- megacoffee.txt | 1 - menelkir.html | 44 +++---- menelkir.txt | 1 - metahax.html | 44 +++---- metahax.txt | 1 - milos-rs.html | 44 +++---- milos-rs.txt | 1 - miramir.html | 44 +++---- miramir.txt | 1 - mkr-overlay.html | 44 +++---- mkr-overlay.txt | 1 - moaxcp.html | 44 +++---- moaxcp.txt | 1 - moexiami.html | 44 +++---- moexiami.txt | 1 - moltonel.html | 44 +++---- moltonel.txt | 1 - monero.html | 44 +++---- monero.txt | 1 - mschiff.html | 44 +++---- mschiff.txt | 1 - multilib-portage.html | 52 ++++---- multilib-portage.txt | 1 - musl-clang.html | 44 +++---- musl-clang.txt | 1 - musl.html | 62 +++++---- musl.txt | 1 - mv.html | 44 +++---- mv.txt | 1 - mva.html | 44 +++---- mva.txt | 1 - myrvolay.html | 44 +++---- myrvolay.txt | 1 - mysql.html | 44 +++---- mysql.txt | 1 - natinst.html | 44 +++---- natinst.txt | 1 - nelson-graca.html | 44 +++---- nelson-graca.txt | 1 - nest.html | 48 ++++--- nest.txt | 1 - nico.html | 44 +++---- nico.txt | 1 - nitratesky.html | 44 +++---- nitratesky.txt | 1 - nix-guix.html | 44 +++---- nix-guix.txt | 1 - np-hardass-overlay.html | 48 ++++--- np-hardass-overlay.txt | 1 - nx.html | 44 +++---- nx.txt | 1 - nymphos.html | 44 +++---- nymphos.txt | 1 - octopus.html | 46 ++++--- octopus.txt | 1 - oddlama.html | 44 +++---- oddlama.txt | 1 - olifre.html | 44 +++---- olifre.txt | 1 - openclonk.html | 44 +++---- openclonk.txt | 1 - openwrt.html | 44 +++---- openwrt.txt | 1 - overseerr-overlay.html | 44 +++---- overseerr-overlay.txt | 1 - palemoon.html | 44 +++---- palemoon.txt | 1 - poly-c.html | 2 +- poly-c.txt | 2 +- xwing.html | 52 +++++++- xwing.txt | 21 +++ zugaina.html | 8 +- zugaina.txt | 8 +- 201 files changed, 2202 insertions(+), 2799 deletions(-) diff --git a/R_Overlay.html b/R_Overlay.html index 3bdfbf8c088f..63f0841911ed 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -52,7 +52,7 @@ 21
Matched data: 0 bytes
- 22
File list size: 2.25M
+            22
File list size: 2.43M
 

             23
File list generation time: 0.001 seconds
 

@@ -64,7 +64,7 @@
27
- 28
sent 17.88K bytes  received 2.74M bytes  1.84M bytes/sec
+            28
sent 17.88K bytes  received 2.74M bytes  1.10M bytes/sec
 

             29
total size is 65.41M  speedup is 23.76
 

diff --git a/R_Overlay.txt b/R_Overlay.txt
index 3babb8718952..28d92218a879 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -19,13 +19,13 @@ Total file size: 65.41M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.25M
+File list size: 2.43M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
 Total bytes sent: 17.88K
 Total bytes received: 2.74M
 
-sent 17.88K bytes  received 2.74M bytes  1.84M bytes/sec
+sent 17.88K bytes  received 2.74M bytes  1.10M bytes/sec
 total size is 65.41M  speedup is 23.76
 *** synced R_Overlay
  * Sync succeeded
diff --git a/gentoo.html b/gentoo.html
index d63691d3b234..d5b02ce36f10 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -40,49 +40,47 @@
15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
- 16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing gentoo
 

-            17
*** syncing gentoo
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced gentoo
 

-            32
*** synced gentoo
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/gentoo.txt b/gentoo.txt
index 561de4db3908..65720ca804fd 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,7 +13,6 @@
  'status': 'official'}
 $ pmaint sync gentoo
 WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gentoo
 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/gerislay.html b/gerislay.html
index ff67ca651595..6cbf26d65dc8 100644
--- a/gerislay.html
+++ b/gerislay.html
@@ -44,51 +44,49 @@
 

             17
$ pmaint sync gerislay
 

-            18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing gerislay
 

-            19
*** syncing gerislay
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
commands sometime before your next pull:
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.rebase true   # rebase
 

-            25
  git config pull.rebase true   # rebase
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.ff only       # fast-forward only
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
or --ff-only on the command line to override the configured default per
 

-            30
or --ff-only on the command line to override the configured default per
+            30
invocation.
 

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced gerislay
 

-            34
*** synced gerislay
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gerislay
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gerislay
-

-            39
 * media-libs/raop-play-0.5.1-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 2 is too old., (flag-o-matic.eclass, line  14:  called die)
+            38
 * media-libs/raop-play-0.5.1-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 2 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            40
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/gerislay.txt b/gerislay.txt
index 44c3e4e44818..cc2bcc294392 100644
--- a/gerislay.txt
+++ b/gerislay.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/gerislay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gerislay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gerislay
 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/gnuradio.html b/gnuradio.html
index a7034a06ad25..28a81a41a897 100644
--- a/gnuradio.html
+++ b/gnuradio.html
@@ -30,49 +30,47 @@
 

             10
$ pmaint sync gnuradio
 

-            11
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
*** syncing gnuradio
 

-            12
*** syncing gnuradio
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
discouraged. You can squelch this message by running one of the following
+            14
commands sometime before your next pull:
 

-            15
commands sometime before your next pull:
+            15
 

-            16
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
  git config pull.rebase true   # rebase
 

-            18
  git config pull.rebase true   # rebase
+            18
  git config pull.ff only       # fast-forward only
 

-            19
  git config pull.ff only       # fast-forward only
+            19
 

-            20
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
You can replace "git config" with "git config --global" to set a default
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
or --ff-only on the command line to override the configured default per
 

-            23
or --ff-only on the command line to override the configured default per
+            23
invocation.
 

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** synced gnuradio
 

-            27
*** synced gnuradio
+            27
 * Sync succeeded
 

-            28
 * Sync succeeded
+            28
$ git log --format=%ci -1
 

-            29
$ git log --format=%ci -1
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnuradio
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnuradio
-

-            32
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
diff --git a/gnuradio.txt b/gnuradio.txt
index 8137dae846de..bb0bc5166d77 100644
--- a/gnuradio.txt
+++ b/gnuradio.txt
@@ -8,7 +8,6 @@
              'uri': 'https://github.com/hololeap/gentoo-gnuradio'}],
  'status': 'unofficial'}
 $ pmaint sync gnuradio
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gnuradio
 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/gnustep.html b/gnustep.html
index e4f2a9d0225a..626c7bee076b 100644
--- a/gnustep.html
+++ b/gnustep.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync gnustep
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing gnustep
 

-            16
*** syncing gnustep
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced gnustep
 

-            31
*** synced gnustep
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnustep
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnustep
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/gnustep.txt b/gnustep.txt
index 7629c7b40113..60ac8bed6117 100644
--- a/gnustep.txt
+++ b/gnustep.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/gnustep.git'}],
  'status': 'official'}
 $ pmaint sync gnustep
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gnustep
 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/go-overlay.html b/go-overlay.html
index e3daa412d279..de78cc3fcdf4 100644
--- a/go-overlay.html
+++ b/go-overlay.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync go-overlay
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing go-overlay
 

-            13
*** syncing go-overlay
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced go-overlay
 

-            28
*** synced go-overlay
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 go-overlay
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 go-overlay
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/go-overlay.txt b/go-overlay.txt
index 4fe1e21a24fa..2024aba88938 100644
--- a/go-overlay.txt
+++ b/go-overlay.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/Dr-Terrible/go-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync go-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing go-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/godin.html b/godin.html
index 557a321681fb..efd4dd7dbe7b 100644
--- a/godin.html
+++ b/godin.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync godin
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing godin
 

-            16
*** syncing godin
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced godin
 

-            31
*** synced godin
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 godin
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 godin
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/godin.txt b/godin.txt
index c6b634c757ff..e03b125baa27 100644
--- a/godin.txt
+++ b/godin.txt
@@ -12,7 +12,6 @@
              'uri': 'git://github.com/Godin/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync godin
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing godin
 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/goduck777.html b/goduck777.html
index 2a2c8c99beb3..ca424b761723 100644
--- a/goduck777.html
+++ b/goduck777.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync goduck777
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing goduck777
 

-            18
*** syncing goduck777
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced goduck777
 

-            33
*** synced goduck777
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goduck777
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goduck777
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/goduck777.txt b/goduck777.txt
index 3fd0bb99e7f0..4b07576a7b92 100644
--- a/goduck777.txt
+++ b/goduck777.txt
@@ -14,7 +14,6 @@
              'uri': 'git@github.com:goduck777/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync goduck777
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing goduck777
 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/goris.html b/goris.html
index 5cf833524112..e250e3b945e4 100644
--- a/goris.html
+++ b/goris.html
@@ -42,61 +42,59 @@
 

             16
$ pmaint sync goris
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing goris
 

-            18
*** syncing goris
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced goris
 

-            33
*** synced goris
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goris
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goris
-

-            38
 * media-fonts/arian-amu-3.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            37
 * media-fonts/arian-amu-3.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            39
 * media-fonts/arian-amu-4.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            38
 * media-fonts/arian-amu-4.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            40
 * media-fonts/arian-amu-mono-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            39
 * media-fonts/arian-amu-mono-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            41
 * media-fonts/arian-amu-serif-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            40
 * media-fonts/arian-amu-serif-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            42
 * media-fonts/arian-grqi-2.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            41
 * media-fonts/arian-grqi-2.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            43
 * media-fonts/ghea-unicode-fonts-1.006: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            42
 * media-fonts/ghea-unicode-fonts-1.006: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            44
 * Cache regen failed with 1
+            43
 * Cache regen failed with 1
 

 
         
diff --git a/goris.txt b/goris.txt
index 4d79db43ec25..ecb9c22baa17 100644
--- a/goris.txt
+++ b/goris.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/goris.git'}],
  'status': 'unofficial'}
 $ pmaint sync goris
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing goris
 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/graaff.html b/graaff.html
index 57f4a1767e9b..3c27ced02892 100644
--- a/graaff.html
+++ b/graaff.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync graaff
 

-            18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing graaff
 

-            19
*** syncing graaff
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
commands sometime before your next pull:
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.rebase true   # rebase
 

-            25
  git config pull.rebase true   # rebase
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.ff only       # fast-forward only
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
or --ff-only on the command line to override the configured default per
 

-            30
or --ff-only on the command line to override the configured default per
+            30
invocation.
 

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced graaff
 

-            34
*** synced graaff
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 graaff
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 graaff
-

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/graaff.txt b/graaff.txt
index d7d16a1ae7fa..df99725fbddb 100644
--- a/graaff.txt
+++ b/graaff.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/graaff.git'}],
  'status': 'official'}
 $ pmaint sync graaff
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing graaff
 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/griffon_overlay.html b/griffon_overlay.html
index 79bf672482af..51964b5730af 100644
--- a/griffon_overlay.html
+++ b/griffon_overlay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync griffon_overlay
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing griffon_overlay
 

-            16
*** syncing griffon_overlay
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced griffon_overlay
 

-            31
*** synced griffon_overlay
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 griffon_overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 griffon_overlay
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/griffon_overlay.txt b/griffon_overlay.txt
index 099777862f61..42e5554de87b 100644
--- a/griffon_overlay.txt
+++ b/griffon_overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/windfail/griffon_overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync griffon_overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing griffon_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/grub2-themes.html b/grub2-themes.html
index e40b895ab18d..cd6e1d76b02f 100644
--- a/grub2-themes.html
+++ b/grub2-themes.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync grub2-themes
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing grub2-themes
 

-            17
*** syncing grub2-themes
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced grub2-themes
 

-            32
*** synced grub2-themes
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 grub2-themes
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 grub2-themes
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/grub2-themes.txt b/grub2-themes.txt
index 9817277398d0..e091433e3636 100644
--- a/grub2-themes.txt
+++ b/grub2-themes.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git'}],
  'status': 'official'}
 $ pmaint sync grub2-themes
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing grub2-themes
 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/gsview-overlay.html b/gsview-overlay.html
index 2b4cf7d54f39..23552b2d4b2f 100644
--- a/gsview-overlay.html
+++ b/gsview-overlay.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync gsview-overlay
 

-            18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing gsview-overlay
 

-            19
*** syncing gsview-overlay
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
commands sometime before your next pull:
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.rebase true   # rebase
 

-            25
  git config pull.rebase true   # rebase
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.ff only       # fast-forward only
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
or --ff-only on the command line to override the configured default per
 

-            30
or --ff-only on the command line to override the configured default per
+            30
invocation.
 

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced gsview-overlay
 

-            34
*** synced gsview-overlay
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gsview-overlay
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gsview-overlay
-

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/gsview-overlay.txt b/gsview-overlay.txt
index cd03dd6cc482..853838e55aa8 100644
--- a/gsview-overlay.txt
+++ b/gsview-overlay.txt
@@ -15,7 +15,6 @@
              'uri': 'git@github.com:uleysky/gsview-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gsview-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing gsview-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/guru.html b/guru.html
index 29264f12d1cd..3a85341c2d54 100644
--- a/guru.html
+++ b/guru.html
@@ -36,295 +36,47 @@
 

             13
$ pmaint sync guru
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing guru
 

-            15
*** syncing guru
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
From https://anongit.gentoo.org/git/repo/proj/guru
+            29
*** synced guru
 

-            30
   623ae723..f083f536  master     -> origin/master
+            30
 * Sync succeeded
 

-            31
Updating 623ae723..f083f536
+            31
$ git log --format=%ci -1
 

-            32
Fast-forward
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
 .../files/gnome-passwordsafe-4.1.patch             |  34 ++++++
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 guru
 

-            34
 .../gnome-passwordsafe-4.1.ebuild                  |  15 +--
-

-            35
 app-crypt/tomb/Manifest                            |   1 +
-

-            36
 app-crypt/tomb/files/gtomb.patch                   |  13 +++
-

-            37
 app-crypt/tomb/metadata.xml                        |  20 ++++
-

-            38
 app-crypt/tomb/tomb-2.9.ebuild                     |  88 +++++++++++++++
-

-            39
 ...-1.55.0-r3.ebuild => atom-bin-1.55.0-r4.ebuild} |  13 ++-
-

-            40
 app-editors/typora-bin/Manifest                    |   1 +
-

-            41
 app-editors/typora-bin/files/Typora.desktop        |  13 +++
-

-            42
 app-editors/typora-bin/metadata.xml                |   8 ++
-

-            43
 app-editors/typora-bin/typora-bin-9999.ebuild      |  43 +++++++
-

-            44
 app-misc/cpufetch/Manifest                         |   2 +-
-

-            45
 ...10406.ebuild => cpufetch-0.94_p20210409.ebuild} |   4 +-
-

-            46
 .../cpufetch/files/makefile-0.94_p20210409.patch   |  26 +++++
-

-            47
 app-misc/cpufetch/files/makefile.patch             |  50 ---------
-

-            48
 app-misc/watchexec/Manifest                        |  21 ++++
-

-            49
 app-misc/watchexec/watchexec-1.15.0.ebuild         |  97 ++++++++++++++++
-

-            50
 app-portage/emlop/emlop-0.4.1.ebuild               |   2 +
-

-            51
 app-shells/fish-history-merge/Manifest             |   1 +
-

-            52
 .../fish-history-merge-0_pre20201121.ebuild        |  25 +++++
-

-            53
 app-shells/fish-history-merge/metadata.xml         |  16 +++
-

-            54
 dev-cpp/gsl-lite/Manifest                          |   1 +
-

-            55
 dev-cpp/gsl-lite/gsl-lite-0.38.0.ebuild            |  27 +++++
-

-            56
 dev-cpp/gsl-lite/metadata.xml                      |   8 ++
-

-            57
 dev-lang/fbc-bootstrap/Manifest                    |   1 +
-

-            58
 dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild |  26 +++++
-

-            59
 dev-lang/fbc/Manifest                              |   1 +
-

-            60
 dev-lang/fbc/fbc-1.07.3.ebuild                     |  61 ++++++++++
-

-            61
 dev-lang/gleam/gleam-0.12.1.ebuild                 |  12 ++
-

-            62
 dev-vcs/gitqlient/Manifest                         |   4 +-
-

-            63
 dev-vcs/gitqlient/gitqlient-1.2.0.ebuild           |  59 ----------
-

-            64
 ...nt-1.3.0_beta.ebuild => gitqlient-1.3.1.ebuild} |   7 +-
-

-            65
 dev-vcs/gitqlient/gitqlient-9999.ebuild            |   4 +-
-

-            66
 dev-vcs/lazygit/Manifest                           |   2 +
-

-            67
 dev-vcs/lazygit/lazygit-0.27.3.ebuild              |  36 ++++++
-

-            68
 dev-vcs/lazygit/lazygit-0.27.4.ebuild              |  36 ++++++
-

-            69
 .../duckstation/duckstation-9999.ebuild            |   2 +-
-

-            70
 licenses/Typora-EULA                               |  88 +++++++++++++++
-

-            71
 media-gfx/qview/qview-4.0.ebuild                   |   3 +-
-

-            72
 media-sound/noson-app/noson-app-4.4.9.ebuild       |   1 +
-

-            73
 net-libs/kcgi/Manifest                             |   1 +
-

-            74
 net-libs/kcgi/kcgi-0.12.4.ebuild                   |  54 +++++++++
-

-            75
 net-libs/usockets/Manifest                         |   3 +-
-

-            76
 .../usockets/files/usockets-0.6.0-Makefile.patch   | 124 ---------------------
-

-            77
 net-libs/usockets/usockets-0.7.1.ebuild            |  49 --------
-

-            78
 ...0126.ebuild => usockets-0.7.1_p20210214.ebuild} |   4 +-
-

-            79
 net-misc/kristall/kristall-9999.ebuild             |   4 +-
-

-            80
 net-misc/purritobin/Manifest                       |   3 +-
-

-            81
 net-misc/purritobin/purritobin-0.5.0.ebuild        |  47 --------
-

-            82
 ...itobin-0.4.2.ebuild => purritobin-0.5.2.ebuild} |   0
-

-            83
 sci-libs/chaco/chaco-2.2.ebuild                    |  20 ++--
-

-            84
 sci-libs/chaco/files/makefile.patch                |  26 +++++
-

-            85
 sci-libs/meschach/files/makefile.patch             | 116 +++++++++++++++++++
-

-            86
 sci-libs/meschach/meschach-1.2b.ebuild             |  26 ++---
-

-            87
 sys-apps/dool/Manifest                             |   1 +
-

-            88
 sys-apps/dool/dool-0.8_pre20191010.ebuild          |  59 ++++++++++
-

-            89
 sys-apps/dool/dool-9999.ebuild                     |  59 ++++++++++
-

-            90
 sys-apps/dool/metadata.xml                         |   8 ++
-

-            91
 sys-apps/procs/procs-0.10.10.ebuild                |   2 +
-

-            92
 sys-apps/procs/procs-0.11.3.ebuild                 |   2 +
-

-            93
 sys-apps/procs/procs-0.11.4.ebuild                 |   2 +
-

-            94
 sys-cluster/KVTree/KVTree-1.1.1.ebuild             |  56 ++++++++++
-

-            95
 sys-cluster/KVTree/Manifest                        |   1 +
-

-            96
 sys-cluster/pcs/files/openrc-0.10.7.patch          |  50 ++++-----
-

-            97
 sys-cluster/pcs/files/openrc-0.10.8.patch          |  48 ++++----
-

-            98
 sys-cluster/pcs/files/pcsd-daemon.service.patch    |  10 +-
-

-            99
 sys-cluster/pcs/pcs-0.10.8-r2.ebuild               |   4 +
-

-            100
 sys-fs/dwarfs/Manifest                             |   2 +-
-

-            101
 .../{dwarfs-0.5.2.ebuild => dwarfs-0.5.4.ebuild}   |  13 +--
-

-            102
 sys-power/gwe/Manifest                             |   2 +-
-

-            103
 .../gwe/{gwe-0.15.2.ebuild => gwe-0.15.3.ebuild}   |   0
-

-            104
 www-apps/jackett-bin/Manifest                      |   6 +-
-

-            105
 ...0.17.456.ebuild => jackett-bin-0.17.866.ebuild} |   0
-

-            106
 www-apps/uwebsockets/Manifest                      |   2 +-
-

-            107
 ...ts-18.23.0.ebuild => uwebsockets-19.1.0.ebuild} |   0
-

-            108
 75 files changed, 1220 insertions(+), 456 deletions(-)
-

-            109
 create mode 100644 app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1.patch
-

-            110
 create mode 100644 app-crypt/tomb/Manifest
-

-            111
 create mode 100644 app-crypt/tomb/files/gtomb.patch
-

-            112
 create mode 100644 app-crypt/tomb/metadata.xml
-

-            113
 create mode 100644 app-crypt/tomb/tomb-2.9.ebuild
-

-            114
 rename app-editors/atom-bin/{atom-bin-1.55.0-r3.ebuild => atom-bin-1.55.0-r4.ebuild} (87%)
-

-            115
 create mode 100644 app-editors/typora-bin/Manifest
-

-            116
 create mode 100644 app-editors/typora-bin/files/Typora.desktop
-

-            117
 create mode 100644 app-editors/typora-bin/metadata.xml
-

-            118
 create mode 100644 app-editors/typora-bin/typora-bin-9999.ebuild
-

-            119
 rename app-misc/cpufetch/{cpufetch-0.94_p20210406.ebuild => cpufetch-0.94_p20210409.ebuild} (83%)
-

-            120
 create mode 100644 app-misc/cpufetch/files/makefile-0.94_p20210409.patch
-

-            121
 delete mode 100644 app-misc/cpufetch/files/makefile.patch
-

-            122
 create mode 100644 app-misc/watchexec/watchexec-1.15.0.ebuild
-

-            123
 create mode 100644 app-shells/fish-history-merge/Manifest
-

-            124
 create mode 100644 app-shells/fish-history-merge/fish-history-merge-0_pre20201121.ebuild
-

-            125
 create mode 100644 app-shells/fish-history-merge/metadata.xml
-

-            126
 create mode 100644 dev-cpp/gsl-lite/Manifest
-

-            127
 create mode 100644 dev-cpp/gsl-lite/gsl-lite-0.38.0.ebuild
-

-            128
 create mode 100644 dev-cpp/gsl-lite/metadata.xml
-

-            129
 create mode 100644 dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
-

-            130
 create mode 100644 dev-lang/fbc/fbc-1.07.3.ebuild
-

-            131
 delete mode 100644 dev-vcs/gitqlient/gitqlient-1.2.0.ebuild
-

-            132
 rename dev-vcs/gitqlient/{gitqlient-1.3.0_beta.ebuild => gitqlient-1.3.1.ebuild} (82%)
-

-            133
 create mode 100644 dev-vcs/lazygit/lazygit-0.27.3.ebuild
-

-            134
 create mode 100644 dev-vcs/lazygit/lazygit-0.27.4.ebuild
-

-            135
 create mode 100644 licenses/Typora-EULA
-

-            136
 create mode 100644 net-libs/kcgi/kcgi-0.12.4.ebuild
-

-            137
 delete mode 100644 net-libs/usockets/files/usockets-0.6.0-Makefile.patch
-

-            138
 delete mode 100644 net-libs/usockets/usockets-0.7.1.ebuild
-

-            139
 rename net-libs/usockets/{usockets-0.6.0_p20210126.ebuild => usockets-0.7.1_p20210214.ebuild} (91%)
-

-            140
 delete mode 100644 net-misc/purritobin/purritobin-0.5.0.ebuild
-

-            141
 rename net-misc/purritobin/{purritobin-0.4.2.ebuild => purritobin-0.5.2.ebuild} (100%)
-

-            142
 create mode 100644 sci-libs/chaco/files/makefile.patch
-

-            143
 create mode 100644 sci-libs/meschach/files/makefile.patch
-

-            144
 create mode 100644 sys-apps/dool/Manifest
-

-            145
 create mode 100644 sys-apps/dool/dool-0.8_pre20191010.ebuild
-

-            146
 create mode 100644 sys-apps/dool/dool-9999.ebuild
-

-            147
 create mode 100644 sys-apps/dool/metadata.xml
-

-            148
 create mode 100644 sys-cluster/KVTree/KVTree-1.1.1.ebuild
-

-            149
 rename sys-fs/dwarfs/{dwarfs-0.5.2.ebuild => dwarfs-0.5.4.ebuild} (89%)
-

-            150
 rename sys-power/gwe/{gwe-0.15.2.ebuild => gwe-0.15.3.ebuild} (100%)
-

-            151
 rename www-apps/jackett-bin/{jackett-bin-0.17.456.ebuild => jackett-bin-0.17.866.ebuild} (100%)
-

-            152
 rename www-apps/uwebsockets/{uwebsockets-18.23.0.ebuild => uwebsockets-19.1.0.ebuild} (100%)
-

-            153
*** synced guru
-

-            154
 * Sync succeeded
-

-            155
$ git log --format=%ci -1
-

-            156
$ git show -q --pretty=format:%G? HEAD
-

-            157
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 guru
-

-            158
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/guru.txt b/guru.txt
index 1de01dbc2669..ae762ef6f91f 100644
--- a/guru.txt
+++ b/guru.txt
@@ -11,7 +11,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/guru.git'}],
  'status': 'official'}
 $ pmaint sync guru
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing guru
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
@@ -26,130 +25,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://anongit.gentoo.org/git/repo/proj/guru
-   623ae723..f083f536  master     -> origin/master
-Updating 623ae723..f083f536
-Fast-forward
- .../files/gnome-passwordsafe-4.1.patch             |  34 ++++++
- .../gnome-passwordsafe-4.1.ebuild                  |  15 +--
- app-crypt/tomb/Manifest                            |   1 +
- app-crypt/tomb/files/gtomb.patch                   |  13 +++
- app-crypt/tomb/metadata.xml                        |  20 ++++
- app-crypt/tomb/tomb-2.9.ebuild                     |  88 +++++++++++++++
- ...-1.55.0-r3.ebuild => atom-bin-1.55.0-r4.ebuild} |  13 ++-
- app-editors/typora-bin/Manifest                    |   1 +
- app-editors/typora-bin/files/Typora.desktop        |  13 +++
- app-editors/typora-bin/metadata.xml                |   8 ++
- app-editors/typora-bin/typora-bin-9999.ebuild      |  43 +++++++
- app-misc/cpufetch/Manifest                         |   2 +-
- ...10406.ebuild => cpufetch-0.94_p20210409.ebuild} |   4 +-
- .../cpufetch/files/makefile-0.94_p20210409.patch   |  26 +++++
- app-misc/cpufetch/files/makefile.patch             |  50 ---------
- app-misc/watchexec/Manifest                        |  21 ++++
- app-misc/watchexec/watchexec-1.15.0.ebuild         |  97 ++++++++++++++++
- app-portage/emlop/emlop-0.4.1.ebuild               |   2 +
- app-shells/fish-history-merge/Manifest             |   1 +
- .../fish-history-merge-0_pre20201121.ebuild        |  25 +++++
- app-shells/fish-history-merge/metadata.xml         |  16 +++
- dev-cpp/gsl-lite/Manifest                          |   1 +
- dev-cpp/gsl-lite/gsl-lite-0.38.0.ebuild            |  27 +++++
- dev-cpp/gsl-lite/metadata.xml                      |   8 ++
- dev-lang/fbc-bootstrap/Manifest                    |   1 +
- dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild |  26 +++++
- dev-lang/fbc/Manifest                              |   1 +
- dev-lang/fbc/fbc-1.07.3.ebuild                     |  61 ++++++++++
- dev-lang/gleam/gleam-0.12.1.ebuild                 |  12 ++
- dev-vcs/gitqlient/Manifest                         |   4 +-
- dev-vcs/gitqlient/gitqlient-1.2.0.ebuild           |  59 ----------
- ...nt-1.3.0_beta.ebuild => gitqlient-1.3.1.ebuild} |   7 +-
- dev-vcs/gitqlient/gitqlient-9999.ebuild            |   4 +-
- dev-vcs/lazygit/Manifest                           |   2 +
- dev-vcs/lazygit/lazygit-0.27.3.ebuild              |  36 ++++++
- dev-vcs/lazygit/lazygit-0.27.4.ebuild              |  36 ++++++
- .../duckstation/duckstation-9999.ebuild            |   2 +-
- licenses/Typora-EULA                               |  88 +++++++++++++++
- media-gfx/qview/qview-4.0.ebuild                   |   3 +-
- media-sound/noson-app/noson-app-4.4.9.ebuild       |   1 +
- net-libs/kcgi/Manifest                             |   1 +
- net-libs/kcgi/kcgi-0.12.4.ebuild                   |  54 +++++++++
- net-libs/usockets/Manifest                         |   3 +-
- .../usockets/files/usockets-0.6.0-Makefile.patch   | 124 ---------------------
- net-libs/usockets/usockets-0.7.1.ebuild            |  49 --------
- ...0126.ebuild => usockets-0.7.1_p20210214.ebuild} |   4 +-
- net-misc/kristall/kristall-9999.ebuild             |   4 +-
- net-misc/purritobin/Manifest                       |   3 +-
- net-misc/purritobin/purritobin-0.5.0.ebuild        |  47 --------
- ...itobin-0.4.2.ebuild => purritobin-0.5.2.ebuild} |   0
- sci-libs/chaco/chaco-2.2.ebuild                    |  20 ++--
- sci-libs/chaco/files/makefile.patch                |  26 +++++
- sci-libs/meschach/files/makefile.patch             | 116 +++++++++++++++++++
- sci-libs/meschach/meschach-1.2b.ebuild             |  26 ++---
- sys-apps/dool/Manifest                             |   1 +
- sys-apps/dool/dool-0.8_pre20191010.ebuild          |  59 ++++++++++
- sys-apps/dool/dool-9999.ebuild                     |  59 ++++++++++
- sys-apps/dool/metadata.xml                         |   8 ++
- sys-apps/procs/procs-0.10.10.ebuild                |   2 +
- sys-apps/procs/procs-0.11.3.ebuild                 |   2 +
- sys-apps/procs/procs-0.11.4.ebuild                 |   2 +
- sys-cluster/KVTree/KVTree-1.1.1.ebuild             |  56 ++++++++++
- sys-cluster/KVTree/Manifest                        |   1 +
- sys-cluster/pcs/files/openrc-0.10.7.patch          |  50 ++++-----
- sys-cluster/pcs/files/openrc-0.10.8.patch          |  48 ++++----
- sys-cluster/pcs/files/pcsd-daemon.service.patch    |  10 +-
- sys-cluster/pcs/pcs-0.10.8-r2.ebuild               |   4 +
- sys-fs/dwarfs/Manifest                             |   2 +-
- .../{dwarfs-0.5.2.ebuild => dwarfs-0.5.4.ebuild}   |  13 +--
- sys-power/gwe/Manifest                             |   2 +-
- .../gwe/{gwe-0.15.2.ebuild => gwe-0.15.3.ebuild}   |   0
- www-apps/jackett-bin/Manifest                      |   6 +-
- ...0.17.456.ebuild => jackett-bin-0.17.866.ebuild} |   0
- www-apps/uwebsockets/Manifest                      |   2 +-
- ...ts-18.23.0.ebuild => uwebsockets-19.1.0.ebuild} |   0
- 75 files changed, 1220 insertions(+), 456 deletions(-)
- create mode 100644 app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1.patch
- create mode 100644 app-crypt/tomb/Manifest
- create mode 100644 app-crypt/tomb/files/gtomb.patch
- create mode 100644 app-crypt/tomb/metadata.xml
- create mode 100644 app-crypt/tomb/tomb-2.9.ebuild
- rename app-editors/atom-bin/{atom-bin-1.55.0-r3.ebuild => atom-bin-1.55.0-r4.ebuild} (87%)
- create mode 100644 app-editors/typora-bin/Manifest
- create mode 100644 app-editors/typora-bin/files/Typora.desktop
- create mode 100644 app-editors/typora-bin/metadata.xml
- create mode 100644 app-editors/typora-bin/typora-bin-9999.ebuild
- rename app-misc/cpufetch/{cpufetch-0.94_p20210406.ebuild => cpufetch-0.94_p20210409.ebuild} (83%)
- create mode 100644 app-misc/cpufetch/files/makefile-0.94_p20210409.patch
- delete mode 100644 app-misc/cpufetch/files/makefile.patch
- create mode 100644 app-misc/watchexec/watchexec-1.15.0.ebuild
- create mode 100644 app-shells/fish-history-merge/Manifest
- create mode 100644 app-shells/fish-history-merge/fish-history-merge-0_pre20201121.ebuild
- create mode 100644 app-shells/fish-history-merge/metadata.xml
- create mode 100644 dev-cpp/gsl-lite/Manifest
- create mode 100644 dev-cpp/gsl-lite/gsl-lite-0.38.0.ebuild
- create mode 100644 dev-cpp/gsl-lite/metadata.xml
- create mode 100644 dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
- create mode 100644 dev-lang/fbc/fbc-1.07.3.ebuild
- delete mode 100644 dev-vcs/gitqlient/gitqlient-1.2.0.ebuild
- rename dev-vcs/gitqlient/{gitqlient-1.3.0_beta.ebuild => gitqlient-1.3.1.ebuild} (82%)
- create mode 100644 dev-vcs/lazygit/lazygit-0.27.3.ebuild
- create mode 100644 dev-vcs/lazygit/lazygit-0.27.4.ebuild
- create mode 100644 licenses/Typora-EULA
- create mode 100644 net-libs/kcgi/kcgi-0.12.4.ebuild
- delete mode 100644 net-libs/usockets/files/usockets-0.6.0-Makefile.patch
- delete mode 100644 net-libs/usockets/usockets-0.7.1.ebuild
- rename net-libs/usockets/{usockets-0.6.0_p20210126.ebuild => usockets-0.7.1_p20210214.ebuild} (91%)
- delete mode 100644 net-misc/purritobin/purritobin-0.5.0.ebuild
- rename net-misc/purritobin/{purritobin-0.4.2.ebuild => purritobin-0.5.2.ebuild} (100%)
- create mode 100644 sci-libs/chaco/files/makefile.patch
- create mode 100644 sci-libs/meschach/files/makefile.patch
- create mode 100644 sys-apps/dool/Manifest
- create mode 100644 sys-apps/dool/dool-0.8_pre20191010.ebuild
- create mode 100644 sys-apps/dool/dool-9999.ebuild
- create mode 100644 sys-apps/dool/metadata.xml
- create mode 100644 sys-cluster/KVTree/KVTree-1.1.1.ebuild
- rename sys-fs/dwarfs/{dwarfs-0.5.2.ebuild => dwarfs-0.5.4.ebuild} (89%)
- rename sys-power/gwe/{gwe-0.15.2.ebuild => gwe-0.15.3.ebuild} (100%)
- rename www-apps/jackett-bin/{jackett-bin-0.17.456.ebuild => jackett-bin-0.17.866.ebuild} (100%)
- rename www-apps/uwebsockets/{uwebsockets-18.23.0.ebuild => uwebsockets-19.1.0.ebuild} (100%)
+Already up to date.
 *** synced guru
  * Sync succeeded
 $ git log --format=%ci -1
diff --git a/haarp.html b/haarp.html
index b76128daf9e6..571007393386 100644
--- a/haarp.html
+++ b/haarp.html
@@ -30,51 +30,49 @@
 

             10
$ pmaint sync haarp
 

-            11
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
*** syncing haarp
 

-            12
*** syncing haarp
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
discouraged. You can squelch this message by running one of the following
+            14
commands sometime before your next pull:
 

-            15
commands sometime before your next pull:
+            15
 

-            16
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
  git config pull.rebase true   # rebase
 

-            18
  git config pull.rebase true   # rebase
+            18
  git config pull.ff only       # fast-forward only
 

-            19
  git config pull.ff only       # fast-forward only
+            19
 

-            20
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
You can replace "git config" with "git config --global" to set a default
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
or --ff-only on the command line to override the configured default per
 

-            23
or --ff-only on the command line to override the configured default per
+            23
invocation.
 

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** synced haarp
 

-            27
*** synced haarp
+            27
 * Sync succeeded
 

-            28
 * Sync succeeded
+            28
$ git log --format=%ci -1
 

-            29
$ git log --format=%ci -1
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haarp
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haarp
-

-            32
 * x11-misc/alltray-9999: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            31
 * x11-misc/alltray-9999: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            33
 * Cache regen failed with 1
+            32
 * Cache regen failed with 1
 

 
         
diff --git a/haarp.txt b/haarp.txt
index e765749c9ac7..bc50c2aa1747 100644
--- a/haarp.txt
+++ b/haarp.txt
@@ -8,7 +8,6 @@
  'source': [{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/haarp.git'}],
  'status': 'unofficial'}
 $ pmaint sync haarp
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing haarp
 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/hamper-overlay.html b/hamper-overlay.html
index 06a5a40baea1..e3ff5960fcea 100644
--- a/hamper-overlay.html
+++ b/hamper-overlay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync hamper-overlay
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing hamper-overlay
 

-            16
*** syncing hamper-overlay
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced hamper-overlay
 

-            31
*** synced hamper-overlay
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hamper-overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hamper-overlay
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/hamper-overlay.txt b/hamper-overlay.txt
index 9fe0ab114185..324eabb51270 100644
--- a/hamper-overlay.txt
+++ b/hamper-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git://github.com/hamper/hamper-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hamper-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hamper-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/han.html b/han.html
index d0ad02330079..4147540895c0 100644
--- a/han.html
+++ b/han.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync han
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing han
 

-            16
*** syncing han
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced han
 

-            31
*** synced han
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 han
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 han
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/han.txt b/han.txt
index 676fd01319b4..e8dca7355a2d 100644
--- a/han.txt
+++ b/han.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/hanmertens/han-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync han
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing han
 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/hangul-typing.html b/hangul-typing.html
index f3507f98c1dd..99f36e5fb570 100644
--- a/hangul-typing.html
+++ b/hangul-typing.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync hangul-typing
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing hangul-typing
 

-            16
*** syncing hangul-typing
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced hangul-typing
 

-            31
*** synced hangul-typing
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hangul-typing
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hangul-typing
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/hangul-typing.txt b/hangul-typing.txt
index 7c504aa49497..45189bf80220 100644
--- a/hangul-typing.txt
+++ b/hangul-typing.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git'}],
  'status': 'unofficial'}
 $ pmaint sync hangul-typing
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hangul-typing
 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/haskell.html b/haskell.html
index c8066ec63e8c..fce95ffae946 100644
--- a/haskell.html
+++ b/haskell.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync haskell
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing haskell
 

-            16
*** syncing haskell
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced haskell
 

-            31
*** synced haskell
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haskell
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haskell
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/haskell.txt b/haskell.txt
index 10616c4b47ab..2a33bb4df923 100644
--- a/haskell.txt
+++ b/haskell.txt
@@ -12,7 +12,6 @@
              'uri': 'https://github.com/gentoo-haskell/gentoo-haskell.git'}],
  'status': 'official'}
 $ pmaint sync haskell
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing haskell
 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/heindsight.html b/heindsight.html
index a1ebd51c93fa..077f7eb263d7 100644
--- a/heindsight.html
+++ b/heindsight.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync heindsight
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing heindsight
 

-            16
*** syncing heindsight
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced heindsight
 

-            31
*** synced heindsight
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 heindsight
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 heindsight
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/heindsight.txt b/heindsight.txt
index 46cea25d236a..967b616e319e 100644
--- a/heindsight.txt
+++ b/heindsight.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/heindsight/gentoo_overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync heindsight
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing heindsight
 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/hering-overlay.html b/hering-overlay.html
index 63d965efb121..c0e725832a64 100644
--- a/hering-overlay.html
+++ b/hering-overlay.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync hering-overlay
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing hering-overlay
 

-            14
*** syncing hering-overlay
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced hering-overlay
 

-            29
*** synced hering-overlay
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hering-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hering-overlay
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/hering-overlay.txt b/hering-overlay.txt
index cb09215274ad..0f31fe8c1985 100644
--- a/hering-overlay.txt
+++ b/hering-overlay.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/internethering/hering-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hering-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hering-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/hexedit-overlay.html b/hexedit-overlay.html
index 896ac6881c0c..2a69dfd1f586 100644
--- a/hexedit-overlay.html
+++ b/hexedit-overlay.html
@@ -34,51 +34,49 @@
 

             12
$ pmaint sync hexedit-overlay
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing hexedit-overlay
 

-            14
*** syncing hexedit-overlay
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced hexedit-overlay
 

-            29
*** synced hexedit-overlay
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hexedit-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hexedit-overlay
-

-            34
 * net-misc/asterisk-chan_dongle-9999-r11: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            33
 * net-misc/asterisk-chan_dongle-9999-r11: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            35
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
diff --git a/hexedit-overlay.txt b/hexedit-overlay.txt
index 117bd3622944..71a9e1c66db8 100644
--- a/hexedit-overlay.txt
+++ b/hexedit-overlay.txt
@@ -10,7 +10,6 @@
              'uri': 'https://git.ifproject.ru/hexedit/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hexedit-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hexedit-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/hibiscus.html b/hibiscus.html
index b4fd79131b61..fa14167e0cd3 100644
--- a/hibiscus.html
+++ b/hibiscus.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync hibiscus
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing hibiscus
 

-            18
*** syncing hibiscus
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced hibiscus
 

-            33
*** synced hibiscus
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hibiscus
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hibiscus
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/hibiscus.txt b/hibiscus.txt
index 6f67bfa64674..516323ebca69 100644
--- a/hibiscus.txt
+++ b/hibiscus.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/hibiscus.git'}],
  'status': 'unofficial'}
 $ pmaint sync hibiscus
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hibiscus
 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/holgersson-overlay.html b/holgersson-overlay.html
index 8110ba80ee12..19e7816d7c65 100644
--- a/holgersson-overlay.html
+++ b/holgersson-overlay.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync holgersson-overlay
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing holgersson-overlay
 

-            13
*** syncing holgersson-overlay
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced holgersson-overlay
 

-            28
*** synced holgersson-overlay
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 holgersson-overlay
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 holgersson-overlay
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt
index 27e3479268a0..1311b8e5a06b 100644
--- a/holgersson-overlay.txt
+++ b/holgersson-overlay.txt
@@ -9,7 +9,6 @@
              'uri': 'https://git.holgersson.xyz/foss/holgersson-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync holgersson-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing holgersson-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/hossie.html b/hossie.html
index c4198b77adce..34177c8a035a 100644
--- a/hossie.html
+++ b/hossie.html
@@ -28,49 +28,47 @@
 

             9
$ pmaint sync hossie
 

-            10
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
*** syncing hossie
 

-            11
*** syncing hossie
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
discouraged. You can squelch this message by running one of the following
+            13
commands sometime before your next pull:
 

-            14
commands sometime before your next pull:
+            14
 

-            15
+            15
  git config pull.rebase false  # merge (the default strategy)
 

-            16
  git config pull.rebase false  # merge (the default strategy)
+            16
  git config pull.rebase true   # rebase
 

-            17
  git config pull.rebase true   # rebase
+            17
  git config pull.ff only       # fast-forward only
 

-            18
  git config pull.ff only       # fast-forward only
+            18
 

-            19
+            19
You can replace "git config" with "git config --global" to set a default
 

-            20
You can replace "git config" with "git config --global" to set a default
+            20
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
or --ff-only on the command line to override the configured default per
 

-            22
or --ff-only on the command line to override the configured default per
+            22
invocation.
 

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** synced hossie
 

-            26
*** synced hossie
+            26
 * Sync succeeded
 

-            27
 * Sync succeeded
+            27
$ git log --format=%ci -1
 

-            28
$ git log --format=%ci -1
+            28
$ git show -q --pretty=format:%G? HEAD
 

-            29
$ git show -q --pretty=format:%G? HEAD
+            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hossie
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hossie
-

-            31
 * Cache regenerated successfully
+            30
 * Cache regenerated successfully
 

 
         
diff --git a/hossie.txt b/hossie.txt
index 9bff990269bb..d43cc272c26c 100644
--- a/hossie.txt
+++ b/hossie.txt
@@ -7,7 +7,6 @@
              'uri': 'https://git.hossie.de/scm/gen/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hossie
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hossie
 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/hotstoast.html b/hotstoast.html
index 4fc3e0613dc4..e7796b1d20cf 100644
--- a/hotstoast.html
+++ b/hotstoast.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync hotstoast
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing hotstoast
 

-            16
*** syncing hotstoast
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced hotstoast
 

-            31
*** synced hotstoast
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hotstoast
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hotstoast
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/hotstoast.txt b/hotstoast.txt
index 04f3960c2ae2..3c569e186508 100644
--- a/hotstoast.txt
+++ b/hotstoast.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/TomHotston/hotstoast-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hotstoast
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing hotstoast
 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/ikelos.html b/ikelos.html
index adae5868abea..79e923855898 100644
--- a/ikelos.html
+++ b/ikelos.html
@@ -40,81 +40,79 @@
 

             15
$ pmaint sync ikelos
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing ikelos
 

-            17
*** syncing ikelos
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced ikelos
 

-            32
*** synced ikelos
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ikelos
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ikelos
-

-            37
 * app-accessibility/svox-9999: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            36
 * app-accessibility/svox-9999: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            38
 * dev-libs/libdwarf-20100930: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            37
 * dev-libs/libdwarf-20100930: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            39
 * dev-libs/libdwarf-20110113: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            38
 * dev-libs/libdwarf-20110113: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            40
 * dev-libs/libdwarf-20110605: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            39
 * dev-libs/libdwarf-20110605: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            41
 * dev-libs/libdwarf-20110607: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            40
 * dev-libs/libdwarf-20110607: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            42
 * dev-libs/libdwarf-20110908: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            41
 * dev-libs/libdwarf-20110908: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            43
 * dev-libs/libdwarf-20120410: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            42
 * dev-libs/libdwarf-20120410: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            44
 * dev-python/pfp-0.4.11: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            43
 * dev-python/pfp-0.4.11: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            45
 * dev-python/py010parser-0.1.18: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            44
 * dev-python/py010parser-0.1.18: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            46
 * dev-util/dwarfdump-20100930: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            45
 * dev-util/dwarfdump-20100930: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            47
 * dev-util/dwarfdump-20110113: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            46
 * dev-util/dwarfdump-20110113: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            48
 * dev-util/dwarfdump-20110605: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            47
 * dev-util/dwarfdump-20110605: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            49
 * dev-util/dwarfdump-20110607: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            48
 * dev-util/dwarfdump-20110607: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            50
 * dev-util/dwarfdump-20110908: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            49
 * dev-util/dwarfdump-20110908: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            51
 * dev-util/dwarfdump-20120410: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            50
 * dev-util/dwarfdump-20120410: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            52
 * net-dialup/freeradius-3.0.10: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
+            51
 * net-dialup/freeradius-3.0.10: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
 
[FATAL]
-            53
 * Cache regen failed with 1
+            52
 * Cache regen failed with 1
 

 
         
diff --git a/ikelos.txt b/ikelos.txt
index 32ba17c02b6f..b51cb9d18a03 100644
--- a/ikelos.txt
+++ b/ikelos.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/ikelos.git'}],
  'status': 'unofficial'}
 $ pmaint sync ikelos
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ikelos
 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/index.html b/index.html
index 1e94939df4c8..76c2717e89fa 100644
--- a/index.html
+++ b/index.html
@@ -774,7 +774,7 @@
 
         
 
-        
Generated based on results from 2021-04-12 05:49:46 UTC

+        
Generated based on results from 2021-04-12 06:04:56 UTC

     
 
         
\ No newline at end of file
diff --git a/ixit.html b/ixit.html
index 176a5173dc4a..bdbfae86b13f 100644
--- a/ixit.html
+++ b/ixit.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync ixit
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing ixit
 

-            15
*** syncing ixit
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced ixit
 

-            30
*** synced ixit
+            30
 * Sync succeeded
 

-            31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 

-            32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ixit
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ixit
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/ixit.txt b/ixit.txt
index e18aa0842dd7..9ccf6f230d08 100644
--- a/ixit.txt
+++ b/ixit.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:okias/ixit.git'}],
  'status': 'unofficial'}
 $ pmaint sync ixit
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing ixit
 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/jacendi-overlay.html b/jacendi-overlay.html
index 45a27b2d9119..56a637864cd1 100644
--- a/jacendi-overlay.html
+++ b/jacendi-overlay.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync jacendi-overlay
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing jacendi-overlay
 

-            14
*** syncing jacendi-overlay
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced jacendi-overlay
 

-            29
*** synced jacendi-overlay
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jacendi-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jacendi-overlay
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/jacendi-overlay.txt b/jacendi-overlay.txt
index dc1d8f5c50e8..3ab07f0885f4 100644
--- a/jacendi-overlay.txt
+++ b/jacendi-overlay.txt
@@ -10,7 +10,6 @@
              'uri': 'https://bitbucket.org/jacendi/jacendi-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync jacendi-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jacendi-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/jamesbroadhead.html b/jamesbroadhead.html
index 261478282978..57762d83f57e 100644
--- a/jamesbroadhead.html
+++ b/jamesbroadhead.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync jamesbroadhead
 

-            18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing jamesbroadhead
 

-            19
*** syncing jamesbroadhead
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
commands sometime before your next pull:
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.rebase true   # rebase
 

-            25
  git config pull.rebase true   # rebase
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.ff only       # fast-forward only
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
or --ff-only on the command line to override the configured default per
 

-            30
or --ff-only on the command line to override the configured default per
+            30
invocation.
 

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced jamesbroadhead
 

-            34
*** synced jamesbroadhead
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
-

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/jamesbroadhead.txt b/jamesbroadhead.txt
index cab650fd32b6..6e8587a890fb 100644
--- a/jamesbroadhead.txt
+++ b/jamesbroadhead.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/jamesbroadhead.git'}],
  'status': 'unofficial'}
 $ pmaint sync jamesbroadhead
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jamesbroadhead
 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/java.html b/java.html
index 348e78bbb8e5..5d9d4cd03fce 100644
--- a/java.html
+++ b/java.html
@@ -40,59 +40,57 @@
 

             15
$ pmaint sync java
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing java
 

-            17
*** syncing java
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced java
 

-            32
*** synced java
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java
-

-            37
 * dev-java/java-config-2.2.9999: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            36
 * dev-java/java-config-2.2.9999: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            38
 * dev-java/java-config-2.9999: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            37
 * dev-java/java-config-2.9999: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            39
 * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            38
 * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            40
 * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-r1, (python-r1.eclass, line  34:  called die)
+            39
 * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-r1, (python-r1.eclass, line  34:  called die)
 
[FATAL]
-            41
 * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 2 is too old., (flag-o-matic.eclass, line  14:  called die)
+            40
 * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 2 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            42
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
diff --git a/java.txt b/java.txt
index 245427789ff5..d16bff47785d 100644
--- a/java.txt
+++ b/java.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/java.git'}],
  'status': 'official'}
 $ pmaint sync java
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing java
 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/jboro-overlay.html b/jboro-overlay.html
index 05e16de36cf4..fc86b43c250d 100644
--- a/jboro-overlay.html
+++ b/jboro-overlay.html
@@ -30,49 +30,47 @@
 

             10
$ pmaint sync jboro-overlay
 

-            11
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
*** syncing jboro-overlay
 

-            12
*** syncing jboro-overlay
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
discouraged. You can squelch this message by running one of the following
+            14
commands sometime before your next pull:
 

-            15
commands sometime before your next pull:
+            15
 

-            16
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
  git config pull.rebase true   # rebase
 

-            18
  git config pull.rebase true   # rebase
+            18
  git config pull.ff only       # fast-forward only
 

-            19
  git config pull.ff only       # fast-forward only
+            19
 

-            20
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
You can replace "git config" with "git config --global" to set a default
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
or --ff-only on the command line to override the configured default per
 

-            23
or --ff-only on the command line to override the configured default per
+            23
invocation.
 

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** synced jboro-overlay
 

-            27
*** synced jboro-overlay
+            27
 * Sync succeeded
 

-            28
 * Sync succeeded
+            28
$ git log --format=%ci -1
 

-            29
$ git log --format=%ci -1
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jboro-overlay
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jboro-overlay
-

-            32
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
diff --git a/jboro-overlay.txt b/jboro-overlay.txt
index 51b0d1f48269..f10800a47e30 100644
--- a/jboro-overlay.txt
+++ b/jboro-overlay.txt
@@ -8,7 +8,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/JBoro/portage.git'}],
  'status': 'unofficial'}
 $ pmaint sync jboro-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jboro-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/jkolo.html b/jkolo.html
index c02431fce93c..fa303fcf3d4a 100644
--- a/jkolo.html
+++ b/jkolo.html
@@ -34,21 +34,17 @@
 

             12
$ pmaint sync jkolo
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing jkolo
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'...
 

-            15
*** syncing jkolo
+            15
remote: GitLab is not responding
 

-            16
Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'...
+            16
fatal: unable to access 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git/': The requested URL returned error: 502
 

-            17
remote: GitLab is not responding
+            17
!!! failed syncing jkolo
 

-            18
fatal: unable to access 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git/': The requested URL returned error: 502
-

-            19
!!! failed syncing jkolo
-

-            20
 * Sync failed with 1
+            18
 * Sync failed with 1
 
[FATAL]
 
         
diff --git a/jkolo.txt b/jkolo.txt
index f5f0dab0d6ab..6a20ae8c824f 100644
--- a/jkolo.txt
+++ b/jkolo.txt
@@ -10,8 +10,6 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync jkolo
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jkolo
 Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'...
 remote: GitLab is not responding
diff --git a/jm-overlay.html b/jm-overlay.html
index cda4da6b2a9f..57c3a88c5e60 100644
--- a/jm-overlay.html
+++ b/jm-overlay.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync jm-overlay
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing jm-overlay
 

-            13
*** syncing jm-overlay
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced jm-overlay
 

-            28
*** synced jm-overlay
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/jm-overlay.txt b/jm-overlay.txt
index 9b91df4e5b68..061e4a6e5584 100644
--- a/jm-overlay.txt
+++ b/jm-overlay.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/Jannis234/jm-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jm-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jm-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/jmbsvicetto.html b/jmbsvicetto.html
index e1b4025fb723..85b1dec6fe5b 100644
--- a/jmbsvicetto.html
+++ b/jmbsvicetto.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync jmbsvicetto
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing jmbsvicetto
 

-            18
*** syncing jmbsvicetto
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced jmbsvicetto
 

-            33
*** synced jmbsvicetto
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt
index 3959ae05e092..8436c1d95bd0 100644
--- a/jmbsvicetto.txt
+++ b/jmbsvicetto.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git'}],
  'status': 'official'}
 $ pmaint sync jmbsvicetto
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jmbsvicetto
 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/johnmh.html b/johnmh.html
index d50ab2a3c17b..4dcdcd4f5295 100644
--- a/johnmh.html
+++ b/johnmh.html
@@ -40,51 +40,49 @@
 

             15
$ pmaint sync johnmh
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing johnmh
 

-            17
*** syncing johnmh
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced johnmh
 

-            32
*** synced johnmh
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
-

-            37
 * games-strategy/freeorion-0.4.6: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
+            36
 * games-strategy/freeorion-0.4.6: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
 
[FATAL]
-            38
 * Cache regen failed with 1
+            37
 * Cache regen failed with 1
 

 
         
diff --git a/johnmh.txt b/johnmh.txt
index 06cde58c5f26..75c30a65906b 100644
--- a/johnmh.txt
+++ b/johnmh.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/johnmh.git'}],
  'status': 'unofficial'}
 $ pmaint sync johnmh
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing johnmh
 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/johu.html b/johu.html
index 78224ba89980..b2aaa4fc2e42 100644
--- a/johu.html
+++ b/johu.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync johu
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing johu
 

-            17
*** syncing johu
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced johu
 

-            32
*** synced johu
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johu
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johu
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/johu.txt b/johu.txt
index 92d7bf769b3d..c3d3441b7ec5 100644
--- a/johu.txt
+++ b/johu.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/johu.git'}],
  'status': 'official'}
 $ pmaint sync johu
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing johu
 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/jorgicio.html b/jorgicio.html
index 0e851d1536b9..57e3e4fd49a2 100644
--- a/jorgicio.html
+++ b/jorgicio.html
@@ -42,71 +42,69 @@
 

             16
$ pmaint sync jorgicio
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing jorgicio
 

-            18
*** syncing jorgicio
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced jorgicio
 

-            33
*** synced jorgicio
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jorgicio
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jorgicio
-

-            38
 * dev-python/HTML-0.04: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            37
 * dev-python/HTML-0.04: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            39
 * dev-python/pushbullet-commons-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            38
 * dev-python/pushbullet-commons-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            40
 * media-gfx/noteshrink-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            39
 * media-gfx/noteshrink-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            41
 * media-gfx/noteshrink-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            40
 * media-gfx/noteshrink-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            42
 * media-gfx/noteshrink-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            41
 * media-gfx/noteshrink-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            43
 * media-tv/xawtv-3.107: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line  12:  called die)
+            42
 * media-tv/xawtv-3.107: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line  12:  called die)
 
[FATAL]
-            44
 * net-misc/mininet-2.2.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            43
 * net-misc/mininet-2.2.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            45
 * net-wireless/kickthemout-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            44
 * net-wireless/kickthemout-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            46
 * sci-astronomy/eht-imaging-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            45
 * sci-astronomy/eht-imaging-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            47
 * sci-astronomy/eht-imaging-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            46
 * sci-astronomy/eht-imaging-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            48
 * x11-misc/glipper-2.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            47
 * x11-misc/glipper-2.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            49
 * Cache regen failed with 1
+            48
 * Cache regen failed with 1
 

 
         
diff --git a/jorgicio.txt b/jorgicio.txt
index 9971848ad473..eaed485973d6 100644
--- a/jorgicio.txt
+++ b/jorgicio.txt
@@ -14,7 +14,6 @@
              'uri': 'git@github.com:jorgicio/jorgicio-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync jorgicio
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing jorgicio
 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/jsteward.html b/jsteward.html
index 322017a5e657..8b30cf1cf6bd 100644
--- a/jsteward.html
+++ b/jsteward.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync jsteward
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing jsteward
 

-            16
*** syncing jsteward
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced jsteward
 

-            31
*** synced jsteward
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jsteward
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jsteward
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/jsteward.txt b/jsteward.txt
index e385d15f8aa8..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:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', 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/junkdrawer.html b/junkdrawer.html
index 3e5878231627..dab932ded45d 100644
--- a/junkdrawer.html
+++ b/junkdrawer.html
@@ -34,67 +34,65 @@
 

             12
$ pmaint sync junkdrawer
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing junkdrawer
 

-            14
*** syncing junkdrawer
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced junkdrawer
 

-            29
*** synced junkdrawer
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 junkdrawer
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 junkdrawer
-

-            34
 * dev-python/libzfs-python-0_p20170717: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            33
 * dev-python/libzfs-python-0_p20170717: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            35
 * dev-python/libzfs-python-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            34
 * dev-python/libzfs-python-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            36
 * dev-python/nvidia-ml-py3-7.352.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            35
 * dev-python/nvidia-ml-py3-7.352.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            37
 * dev-python/solrpy-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            36
 * dev-python/solrpy-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            38
 * dev-python/worldcat-0.3.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            37
 * dev-python/worldcat-0.3.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            39
 * sci-libs/mxnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            38
 * sci-libs/mxnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            40
 * sys-cluster/corosync-1.4.8: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            39
 * sys-cluster/corosync-1.4.8: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            41
 * sys-cluster/pyslurm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            40
 * sys-cluster/pyslurm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            42
 * sys-devel/make-4.1-r2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            41
 * sys-devel/make-4.1-r2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            43
 * Cache regen failed with 1
+            42
 * Cache regen failed with 1
 

 
         
diff --git a/junkdrawer.txt b/junkdrawer.txt
index c6b12d85df85..7dc2929bd665 100644
--- a/junkdrawer.txt
+++ b/junkdrawer.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/doctaweeks/junkdrawer-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync junkdrawer
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing junkdrawer
 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/kaa.html b/kaa.html
index 37b440511136..feb55c279bb3 100644
--- a/kaa.html
+++ b/kaa.html
@@ -32,51 +32,49 @@
 

             11
$ pmaint sync kaa
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing kaa
 

-            14
*** syncing kaa
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced kaa
 

-            29
*** synced kaa
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kaa
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kaa
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/kaa.txt b/kaa.txt
index 3685962c93cb..d51d68a7c66b 100644
--- a/kaa.txt
+++ b/kaa.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/Oleh-Kravchenko/kaa-layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync kaa
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing kaa
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/kde.html b/kde.html
index 2bf6309d59e2..5720839082ad 100644
--- a/kde.html
+++ b/kde.html
@@ -38,7 +38,7 @@
 

             14
$ pmaint sync kde
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             16
*** syncing kde
 

diff --git a/kde.txt b/kde.txt
index 74246a8b21bd..954acc571b3d 100644
--- a/kde.txt
+++ b/kde.txt
@@ -12,7 +12,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/kde.git'}],
  'status': 'official'}
 $ pmaint sync kde
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing kde
 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/keepbot-overlay.html b/keepbot-overlay.html
index 4c3d74bf0147..741eda49dbfa 100644
--- a/keepbot-overlay.html
+++ b/keepbot-overlay.html
@@ -38,51 +38,49 @@
 

             14
$ pmaint sync keepbot-overlay
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing keepbot-overlay
 

-            17
*** syncing keepbot-overlay
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced keepbot-overlay
 

-            32
*** synced keepbot-overlay
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 keepbot-overlay
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 keepbot-overlay
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/keepbot-overlay.txt b/keepbot-overlay.txt
index e1419d8cd797..d9e11f4d8cad 100644
--- a/keepbot-overlay.txt
+++ b/keepbot-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync keepbot-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing keepbot-overlay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/khoverlay.html b/khoverlay.html
index a996c978efb4..fd19c8f6a904 100644
--- a/khoverlay.html
+++ b/khoverlay.html
@@ -36,51 +36,49 @@
 

             13
$ pmaint sync khoverlay
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing khoverlay
 

-            16
*** syncing khoverlay
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced khoverlay
 

-            31
*** synced khoverlay
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 khoverlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 khoverlay
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/khoverlay.txt b/khoverlay.txt
index bea1e77c61a3..7ba36ee716c8 100644
--- a/khoverlay.txt
+++ b/khoverlay.txt
@@ -11,7 +11,6 @@
              'uri': 'git+ssh://git@gitlab.com/khumba/khoverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync khoverlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing khoverlay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/klondike.html b/klondike.html
index 682e6247f0a9..b8638e7c9e99 100644
--- a/klondike.html
+++ b/klondike.html
@@ -44,51 +44,49 @@
 

             17
$ pmaint sync klondike
 

-            18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
*** syncing klondike
 

-            20
*** syncing klondike
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
discouraged. You can squelch this message by running one of the following
+            22
commands sometime before your next pull:
 

-            23
commands sometime before your next pull:
+            23
 

-            24
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
  git config pull.rebase true   # rebase
 

-            26
  git config pull.rebase true   # rebase
+            26
  git config pull.ff only       # fast-forward only
 

-            27
  git config pull.ff only       # fast-forward only
+            27
 

-            28
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
You can replace "git config" with "git config --global" to set a default
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
+            30
or --ff-only on the command line to override the configured default per
 

-            31
or --ff-only on the command line to override the configured default per
+            31
invocation.
 

-            32
invocation.
+            32
 

-            33
+            33
Already up to date.
 

-            34
Already up to date.
+            34
*** synced klondike
 

-            35
*** synced klondike
+            35
 * Sync succeeded
 

-            36
 * Sync succeeded
+            36
$ git log --format=%ci -1
 

-            37
$ git log --format=%ci -1
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
$ git show -q --pretty=format:%G? HEAD
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 klondike
 

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 klondike
-

-            40
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/klondike.txt b/klondike.txt
index 7e94289952a9..52938fadc059 100644
--- a/klondike.txt
+++ b/klondike.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/klondike.git'}],
  'status': 'unofficial'}
 $ pmaint sync klondike
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing klondike
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/konsolebox.html b/konsolebox.html
index 3aeb37e54abb..fb3f65f54af7 100644
--- a/konsolebox.html
+++ b/konsolebox.html
@@ -34,51 +34,49 @@
 

             12
$ pmaint sync konsolebox
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing konsolebox
 

-            15
*** syncing konsolebox
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced konsolebox
 

-            30
*** synced konsolebox
+            30
 * Sync succeeded
 

-            31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 

-            32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 konsolebox
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 konsolebox
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/konsolebox.txt b/konsolebox.txt
index 6da659f699c4..953d3c617344 100644
--- a/konsolebox.txt
+++ b/konsolebox.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/konsolebox/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync konsolebox
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing konsolebox
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/kripton-overlay.html b/kripton-overlay.html
index 3733928315cd..f044db2cc991 100644
--- a/kripton-overlay.html
+++ b/kripton-overlay.html
@@ -40,51 +40,49 @@
 

             15
$ pmaint sync kripton-overlay
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing kripton-overlay
 

-            18
*** syncing kripton-overlay
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced kripton-overlay
 

-            33
*** synced kripton-overlay
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kripton-overlay
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kripton-overlay
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/kripton-overlay.txt b/kripton-overlay.txt
index 69c28ceb7b4d..4c1f94c62c2d 100644
--- a/kripton-overlay.txt
+++ b/kripton-overlay.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@github.com/kripton/kripton-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync kripton-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing kripton-overlay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/kske.html b/kske.html
index c57521d7ff48..d7541efaecfd 100644
--- a/kske.html
+++ b/kske.html
@@ -36,51 +36,49 @@
 

             13
$ pmaint sync kske
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing kske
 

-            16
*** syncing kske
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced kske
 

-            31
*** synced kske
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kske
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kske
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/kske.txt b/kske.txt
index 4b5e788e0ff5..db8bdeb73a54 100644
--- a/kske.txt
+++ b/kske.txt
@@ -11,7 +11,6 @@
              'uri': 'ssh://git@git.kske.dev:420/kske/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync kske
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing kske
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/lanodanOverlay.html b/lanodanOverlay.html
index 3afc06cb91d6..5ea99fe895ff 100644
--- a/lanodanOverlay.html
+++ b/lanodanOverlay.html
@@ -44,53 +44,51 @@
 

             17
$ pmaint sync lanodanOverlay
 

-            18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
*** syncing lanodanOverlay
 

-            20
*** syncing lanodanOverlay
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
discouraged. You can squelch this message by running one of the following
+            22
commands sometime before your next pull:
 

-            23
commands sometime before your next pull:
+            23
 

-            24
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
  git config pull.rebase true   # rebase
 

-            26
  git config pull.rebase true   # rebase
+            26
  git config pull.ff only       # fast-forward only
 

-            27
  git config pull.ff only       # fast-forward only
+            27
 

-            28
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
You can replace "git config" with "git config --global" to set a default
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
+            30
or --ff-only on the command line to override the configured default per
 

-            31
or --ff-only on the command line to override the configured default per
+            31
invocation.
 

-            32
invocation.
+            32
 

-            33
+            33
Already up to date.
 

-            34
Already up to date.
+            34
*** synced lanodanOverlay
 

-            35
*** synced lanodanOverlay
+            35
 * Sync succeeded
 

-            36
 * Sync succeeded
+            36
$ git log --format=%ci -1
 

-            37
$ git log --format=%ci -1
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
$ git show -q --pretty=format:%G? HEAD
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lanodanOverlay
 

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lanodanOverlay
-

-            40
 * net-nntp/inn-2.6.4: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-single-r1, (python-single-r1.eclass, line  41:  called die)
+            39
 * net-nntp/inn-2.6.4: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-single-r1, (python-single-r1.eclass, line  41:  called die)
 
[FATAL]
-            41
 * Cache regen failed with 1
+            40
 * Cache regen failed with 1
 

 
         
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt
index 32c6702c51c0..5089db96bc8a 100644
--- a/lanodanOverlay.txt
+++ b/lanodanOverlay.txt
@@ -15,7 +15,6 @@
             {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lanodanOverlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing lanodanOverlay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/leechcraft.html b/leechcraft.html
index ebfbfbc47247..53d16bb2b374 100644
--- a/leechcraft.html
+++ b/leechcraft.html
@@ -38,51 +38,49 @@
 

             14
$ pmaint sync leechcraft
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing leechcraft
 

-            17
*** syncing leechcraft
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced leechcraft
 

-            32
*** synced leechcraft
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leechcraft
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leechcraft
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/leechcraft.txt b/leechcraft.txt
index 785e7567b404..56e3512e141a 100644
--- a/leechcraft.txt
+++ b/leechcraft.txt
@@ -12,7 +12,6 @@
              'uri': 'git://github.com/0xd34df00d/leechcraft-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync leechcraft
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing leechcraft
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/leio.html b/leio.html
index a5ef4d41fa50..5b460547246e 100644
--- a/leio.html
+++ b/leio.html
@@ -40,55 +40,53 @@
 

             15
$ pmaint sync leio
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing leio
 

-            18
*** syncing leio
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced leio
 

-            33
*** synced leio
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leio
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leio
-

-            38
 * media-tv/kodi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
+            37
 * media-tv/kodi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 158:  called die)
 
[FATAL]
-            39
 * net-libs/webkit-gtk-2.4.8: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
+            38
 * net-libs/webkit-gtk-2.4.8: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
 
[FATAL]
-            40
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/leio.txt b/leio.txt
index 6de5b801acd5..e4545b9fa3dc 100644
--- a/leio.txt
+++ b/leio.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/leio.git'}],
  'status': 'official'}
 $ pmaint sync leio
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing leio
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/librepilot.html b/librepilot.html
index 6734766b9536..8b7b4bcb5a0a 100644
--- a/librepilot.html
+++ b/librepilot.html
@@ -38,51 +38,49 @@
 

             14
$ pmaint sync librepilot
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing librepilot
 

-            17
*** syncing librepilot
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced librepilot
 

-            32
*** synced librepilot
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/librepilot.txt b/librepilot.txt
index b31ea65f8d42..7f8750961bec 100644
--- a/librepilot.txt
+++ b/librepilot.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync librepilot
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing librepilot
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/libressl.html b/libressl.html
index a00baaab7fab..7f6b3f3d81a7 100644
--- a/libressl.html
+++ b/libressl.html
@@ -34,51 +34,49 @@
 

             12
$ pmaint sync libressl
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing libressl
 

-            15
*** syncing libressl
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced libressl
 

-            30
*** synced libressl
+            30
 * Sync succeeded
 

-            31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 

-            32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/libressl.txt b/libressl.txt
index b69a8b246e3f..405b3f4265ec 100644
--- a/libressl.txt
+++ b/libressl.txt
@@ -10,7 +10,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/libressl.git'}],
  'status': 'official'}
 $ pmaint sync libressl
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing libressl
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/liftm.html b/liftm.html
index 5fbd3c77b55c..0332fac73da8 100644
--- a/liftm.html
+++ b/liftm.html
@@ -36,53 +36,51 @@
 

             13
$ pmaint sync liftm
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing liftm
 

-            16
*** syncing liftm
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced liftm
 

-            31
*** synced liftm
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
-

-            36
 * net-misc/cjdns-21.1: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-single-r1, (python-single-r1.eclass, line  41:  called die)
+            35
 * net-misc/cjdns-21.1: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-single-r1, (python-single-r1.eclass, line  41:  called die)
 
[FATAL]
-            37
 * Cache regen failed with 1
+            36
 * Cache regen failed with 1
 

 
         
diff --git a/liftm.txt b/liftm.txt
index 821c28056a64..baa9137abfbd 100644
--- a/liftm.txt
+++ b/liftm.txt
@@ -11,7 +11,6 @@
              'uri': 'git+ssh://git@github.com/jcaesar/liftm-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync liftm
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing liftm
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/linux-be.html b/linux-be.html
index a3f3cf236577..d74693649316 100644
--- a/linux-be.html
+++ b/linux-be.html
@@ -42,51 +42,49 @@
 

             16
$ pmaint sync linux-be
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing linux-be
 

-            19
*** syncing linux-be
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
commands sometime before your next pull:
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.rebase true   # rebase
 

-            25
  git config pull.rebase true   # rebase
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.ff only       # fast-forward only
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
or --ff-only on the command line to override the configured default per
 

-            30
or --ff-only on the command line to override the configured default per
+            30
invocation.
 

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced linux-be
 

-            34
*** synced linux-be
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
-

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/linux-be.txt b/linux-be.txt
index 278c02915792..c56554c6fdee 100644
--- a/linux-be.txt
+++ b/linux-be.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@gitlab.com/linux-be/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linux-be
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing linux-be
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/linuxunderground-overlay.html b/linuxunderground-overlay.html
index 12850aef8d75..b70cf66d6830 100644
--- a/linuxunderground-overlay.html
+++ b/linuxunderground-overlay.html
@@ -36,51 +36,49 @@
 

             13
$ pmaint sync linuxunderground-overlay
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing linuxunderground-overlay
 

-            16
*** syncing linuxunderground-overlay
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced linuxunderground-overlay
 

-            31
*** synced linuxunderground-overlay
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linuxunderground-overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linuxunderground-overlay
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/linuxunderground-overlay.txt b/linuxunderground-overlay.txt
index 1765f6d53e40..26bfcceff4f5 100644
--- a/linuxunderground-overlay.txt
+++ b/linuxunderground-overlay.txt
@@ -11,7 +11,6 @@
              'uri': 'https://github.com/linuxunderground/gentoo.overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linuxunderground-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing linuxunderground-overlay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/lisp.html b/lisp.html
index e33487bae3c8..1e92630cbf45 100644
--- a/lisp.html
+++ b/lisp.html
@@ -42,133 +42,131 @@
 

             16
$ pmaint sync lisp
 

-            17
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing lisp
 

-            19
*** syncing lisp
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
commands sometime before your next pull:
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.rebase true   # rebase
 

-            25
  git config pull.rebase true   # rebase
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.ff only       # fast-forward only
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
or --ff-only on the command line to override the configured default per
 

-            30
or --ff-only on the command line to override the configured default per
+            30
invocation.
 

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced lisp
 

-            34
*** synced lisp
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lisp
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lisp
-

-            39
 * dev-chicken/9pfs-200804142117: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            38
 * dev-chicken/9pfs-200804142117: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            40
 * dev-chicken/F-operator-200803110916: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            39
 * dev-chicken/F-operator-200803110916: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            41
 * dev-chicken/advice-200801221415: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            40
 * dev-chicken/advice-200801221415: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            42
 * dev-chicken/args-200802290956: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            41
 * dev-chicken/args-200802290956: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            43
 * dev-chicken/awk-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            42
 * dev-chicken/awk-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            44
 * dev-chicken/datatype-200802252118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            43
 * dev-chicken/datatype-200802252118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            45
 * dev-chicken/doctype-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            44
 * dev-chicken/doctype-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            46
 * dev-chicken/easyffi-200802130216: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            45
 * dev-chicken/easyffi-200802130216: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            47
 * dev-chicken/eggdoc-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            46
 * dev-chicken/eggdoc-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            48
 * dev-chicken/environments-200802252118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            47
 * dev-chicken/environments-200802252118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            49
 * dev-chicken/iset-200803080329: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            48
 * dev-chicken/iset-200803080329: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            50
 * dev-chicken/lazy-ffi-200803230022: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            49
 * dev-chicken/lazy-ffi-200803230022: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            51
 * dev-chicken/loop-200803250926: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            50
 * dev-chicken/loop-200803250926: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            52
 * dev-chicken/loopy-loop-200803230022: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            51
 * dev-chicken/loopy-loop-200803230022: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            53
 * dev-chicken/mailbox-200802252118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            52
 * dev-chicken/mailbox-200802252118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            54
 * dev-chicken/make-200803112120: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            53
 * dev-chicken/make-200803112120: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            55
 * dev-chicken/misc-extn-200803201814: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            54
 * dev-chicken/misc-extn-200803201814: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            56
 * dev-chicken/miscmacros-200803112120: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            55
 * dev-chicken/miscmacros-200803112120: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            57
 * dev-chicken/numbers-200804020317: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            56
 * dev-chicken/numbers-200804020317: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            58
 * dev-chicken/pipeline-200803180316: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            57
 * dev-chicken/pipeline-200803180316: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            59
 * dev-chicken/pyffi-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            58
 * dev-chicken/pyffi-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            60
 * dev-chicken/readline-200803240316: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            59
 * dev-chicken/readline-200803240316: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            61
 * dev-chicken/regex-case-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            60
 * dev-chicken/regex-case-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            62
 * dev-chicken/regex-literals-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            61
 * dev-chicken/regex-literals-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            63
 * dev-chicken/riaxpander-200804042118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            62
 * dev-chicken/riaxpander-200804042118: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            64
 * dev-chicken/runcmd-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            63
 * dev-chicken/runcmd-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            65
 * dev-chicken/silex-200803222148: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            64
 * dev-chicken/silex-200803222148: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            66
 * dev-chicken/ssax-200803150318: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            65
 * dev-chicken/ssax-200803150318: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            67
 * dev-chicken/sxml-tools-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            66
 * dev-chicken/sxml-tools-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            68
 * dev-chicken/sxml-transforms-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            67
 * dev-chicken/sxml-transforms-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            69
 * dev-chicken/syntactic-closures-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            68
 * dev-chicken/syntactic-closures-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            70
 * dev-chicken/syntax-case-200803230022: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            69
 * dev-chicken/syntax-case-200803230022: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            71
 * dev-chicken/tinyclos-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            70
 * dev-chicken/tinyclos-200801162015: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            72
 * dev-chicken/unix-sockets-200801162015-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            71
 * dev-chicken/unix-sockets-200801162015-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            73
 * dev-chicken/unix-test-9999: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            72
 * dev-chicken/unix-test-9999: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            74
 * dev-chicken/unix-test-200804012117: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            73
 * dev-chicken/unix-test-200804012117: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            75
 * dev-chicken/utf8-200803181518: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
+            74
 * dev-chicken/utf8-200803181518: failed sourcing ebuild: flag-o-matic.eclass: EAPI 0 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            76
 * dev-libs/lightning-1.2: failed sourcing ebuild: autotools: EAPI 0 not supported, (autotools.eclass, line  35:  called die)
+            75
 * dev-libs/lightning-1.2: failed sourcing ebuild: autotools: EAPI 0 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            77
 * dev-scheme/bigloo-3.9a: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            76
 * dev-scheme/bigloo-3.9a: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            78
 * dev-scheme/guile-gnome-gtksourceview-1.8.0: failed sourcing ebuild: autotools: EAPI 2 not supported, (autotools.eclass, line  35:  called die)
+            77
 * dev-scheme/guile-gnome-gtksourceview-1.8.0: failed sourcing ebuild: autotools: EAPI 2 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            79
 * dev-scheme/tinyscheme-1.39-r2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 3 is too old., (flag-o-matic.eclass, line  14:  called die)
+            78
 * dev-scheme/tinyscheme-1.39-r2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 3 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            80
 * Cache regen failed with 1
+            79
 * Cache regen failed with 1
 

 
         
diff --git a/lisp.txt b/lisp.txt
index e37562e4e837..2e205cfacac0 100644
--- a/lisp.txt
+++ b/lisp.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/lisp.git'}],
  'status': 'official'}
 $ pmaint sync lisp
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing lisp
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/lmiphay.html b/lmiphay.html
index 50de34994fb1..a9c13a787fd2 100644
--- a/lmiphay.html
+++ b/lmiphay.html
@@ -32,53 +32,51 @@
 

             11
$ pmaint sync lmiphay
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing lmiphay
 

-            14
*** syncing lmiphay
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced lmiphay
 

-            29
*** synced lmiphay
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay
-

-            34
 * media-gfx/sane-backends-1.0.20-r3: failed sourcing ebuild: flag-o-matic.eclass: EAPI 1 is too old., (flag-o-matic.eclass, line  14:  called die)
+            33
 * media-gfx/sane-backends-1.0.20-r3: failed sourcing ebuild: flag-o-matic.eclass: EAPI 1 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            35
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
diff --git a/lmiphay.txt b/lmiphay.txt
index 23366c15c92d..7aea52d30ea6 100644
--- a/lmiphay.txt
+++ b/lmiphay.txt
@@ -9,7 +9,6 @@
              'uri': 'git://anongit.gentoo.org/user/lmiphay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lmiphay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing lmiphay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/lto-overlay.html b/lto-overlay.html
index 6038ffe09e06..4ed19a3017ed 100644
--- a/lto-overlay.html
+++ b/lto-overlay.html
@@ -40,51 +40,49 @@
 

             15
$ pmaint sync lto-overlay
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing lto-overlay
 

-            18
*** syncing lto-overlay
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced lto-overlay
 

-            33
*** synced lto-overlay
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lto-overlay
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lto-overlay
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/lto-overlay.txt b/lto-overlay.txt
index 7f9c01bfb713..9690b7bbc846 100644
--- a/lto-overlay.txt
+++ b/lto-overlay.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@github.com:InBetweenNames/gentooLTO.git'}],
  'status': 'unofficial'}
 $ pmaint sync lto-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing lto-overlay
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/luke-jr.html b/luke-jr.html
index 0ef6eaf3b882..28c5d0f46305 100644
--- a/luke-jr.html
+++ b/luke-jr.html
@@ -28,51 +28,49 @@
 

             9
$ pmaint sync luke-jr
 

-            10
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
*** syncing luke-jr
 

-            12
*** syncing luke-jr
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
discouraged. You can squelch this message by running one of the following
+            14
commands sometime before your next pull:
 

-            15
commands sometime before your next pull:
+            15
 

-            16
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
  git config pull.rebase true   # rebase
 

-            18
  git config pull.rebase true   # rebase
+            18
  git config pull.ff only       # fast-forward only
 

-            19
  git config pull.ff only       # fast-forward only
+            19
 

-            20
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
You can replace "git config" with "git config --global" to set a default
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
or --ff-only on the command line to override the configured default per
 

-            23
or --ff-only on the command line to override the configured default per
+            23
invocation.
 

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** synced luke-jr
 

-            27
*** synced luke-jr
+            27
 * Sync succeeded
 

-            28
 * Sync succeeded
+            28
$ git log --format=%ci -1
 

-            29
$ git log --format=%ci -1
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luke-jr
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luke-jr
-

-            32
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
diff --git a/luke-jr.txt b/luke-jr.txt
index 4dbdc57eb0cf..db590bc573f5 100644
--- a/luke-jr.txt
+++ b/luke-jr.txt
@@ -7,7 +7,6 @@
              'uri': 'https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr'}],
  'status': 'unofficial'}
 $ pmaint sync luke-jr
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing luke-jr
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/luxifer.html b/luxifer.html
index 18dd51f2ddb6..3e2d93536e45 100644
--- a/luxifer.html
+++ b/luxifer.html
@@ -32,51 +32,47 @@
 

             11
$ pmaint sync luxifer
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing luxifer
 

-            13
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
*** syncing luxifer
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
commands sometime before your next pull:
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
 

-            17
commands sometime before your next pull:
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.rebase true   # rebase
+            20
 

-            21
  git config pull.ff only       # fast-forward only
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
or --ff-only on the command line to override the configured default per
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
invocation.
 

-            25
or --ff-only on the command line to override the configured default per
+            25
 

-            26
invocation.
+            26
Already up to date.
 

-            27
+            27
*** synced luxifer
 

-            28
Already up to date.
+            28
 * Sync succeeded
 

-            29
*** synced luxifer
+            29
$ git log --format=%ci -1
 

-            30
 * Sync succeeded
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git log --format=%ci -1
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luxifer
 

-            32
$ git show -q --pretty=format:%G? HEAD
-

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luxifer
-

-            34
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/luxifer.txt b/luxifer.txt
index faeeeb0b5f0d..240d523c4847 100644
--- a/luxifer.txt
+++ b/luxifer.txt
@@ -9,8 +9,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/luxifr/olgentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync luxifer
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing luxifer
 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/maekke.html b/maekke.html
index 0fa080580914..b1d34f642e0f 100644
--- a/maekke.html
+++ b/maekke.html
@@ -40,51 +40,49 @@
 

             15
$ pmaint sync maekke
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
*** syncing maekke
 

-            18
*** syncing maekke
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced maekke
 

-            33
*** synced maekke
+            33
 * Sync succeeded
 

-            34
 * Sync succeeded
+            34
$ git log --format=%ci -1
 

-            35
$ git log --format=%ci -1
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 maekke
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 maekke
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/maekke.txt b/maekke.txt
index b6f47ef3aa84..7e0b442cc023 100644
--- a/maekke.txt
+++ b/maekke.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/maekke.git'}],
  'status': 'official'}
 $ pmaint sync maekke
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing maekke
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/mate-de-gentoo.html b/mate-de-gentoo.html
index f437e41f6426..c7d3ba60c6e5 100644
--- a/mate-de-gentoo.html
+++ b/mate-de-gentoo.html
@@ -32,51 +32,49 @@
 

             11
$ pmaint sync mate-de-gentoo
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing mate-de-gentoo
 

-            14
*** syncing mate-de-gentoo
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced mate-de-gentoo
 

-            29
*** synced mate-de-gentoo
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mate-de-gentoo
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mate-de-gentoo
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/mate-de-gentoo.txt b/mate-de-gentoo.txt
index d0c08ed702a0..cd1c2fe29516 100644
--- a/mate-de-gentoo.txt
+++ b/mate-de-gentoo.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/oz123/mate-de-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync mate-de-gentoo
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mate-de-gentoo
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/megacoffee.html b/megacoffee.html
index 1ac2d738fb23..8eb482cae987 100644
--- a/megacoffee.html
+++ b/megacoffee.html
@@ -56,49 +56,47 @@
 

             23
$ pmaint sync megacoffee
 

-            24
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
*** syncing megacoffee
 

-            25
*** syncing megacoffee
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
discouraged. You can squelch this message by running one of the following
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
commands sometime before your next pull:
 

-            28
commands sometime before your next pull:
+            28
 

-            29
+            29
  git config pull.rebase false  # merge (the default strategy)
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
  git config pull.rebase true   # rebase
 

-            31
  git config pull.rebase true   # rebase
+            31
  git config pull.ff only       # fast-forward only
 

-            32
  git config pull.ff only       # fast-forward only
+            32
 

-            33
+            33
You can replace "git config" with "git config --global" to set a default
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
or --ff-only on the command line to override the configured default per
 

-            36
or --ff-only on the command line to override the configured default per
+            36
invocation.
 

-            37
invocation.
+            37
 

-            38
+            38
Already up to date.
 

-            39
Already up to date.
+            39
*** synced megacoffee
 

-            40
*** synced megacoffee
+            40
 * Sync succeeded
 

-            41
 * Sync succeeded
+            41
$ git log --format=%ci -1
 

-            42
$ git log --format=%ci -1
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
$ git show -q --pretty=format:%G? HEAD
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 megacoffee
 

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 megacoffee
-

-            45
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/megacoffee.txt b/megacoffee.txt
index 225dcf25d8a1..4c36617db070 100644
--- a/megacoffee.txt
+++ b/megacoffee.txt
@@ -21,7 +21,6 @@
              'uri': 'https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync megacoffee
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing megacoffee
 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/menelkir.html b/menelkir.html
index 1466adf64180..f5ce8e79b256 100644
--- a/menelkir.html
+++ b/menelkir.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync menelkir
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing menelkir
 

-            16
*** syncing menelkir
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced menelkir
 

-            31
*** synced menelkir
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/menelkir.txt b/menelkir.txt
index 68475c2ec122..20fbd7190591 100644
--- a/menelkir.txt
+++ b/menelkir.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync menelkir
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing menelkir
 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/metahax.html b/metahax.html
index ebaac5e1950f..ae434c58ae96 100644
--- a/metahax.html
+++ b/metahax.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync metahax
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing metahax
 

-            14
*** syncing metahax
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced metahax
 

-            29
*** synced metahax
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 metahax
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 metahax
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/metahax.txt b/metahax.txt
index 3ea08c77f2e9..33db1cca6fac 100644
--- a/metahax.txt
+++ b/metahax.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/metafarion/metahax.git'}],
  'status': 'unofficial'}
 $ pmaint sync metahax
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing metahax
 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/milos-rs.html b/milos-rs.html
index e5c798289b27..406763eb82e5 100644
--- a/milos-rs.html
+++ b/milos-rs.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync milos-rs
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing milos-rs
 

-            14
*** syncing milos-rs
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced milos-rs
 

-            29
*** synced milos-rs
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 milos-rs
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 milos-rs
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/milos-rs.txt b/milos-rs.txt
index 64997e72ae85..9ad9830599ba 100644
--- a/milos-rs.txt
+++ b/milos-rs.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/milos-rs/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync milos-rs
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing milos-rs
 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/miramir.html b/miramir.html
index cb65e332ffae..e006babf0405 100644
--- a/miramir.html
+++ b/miramir.html
@@ -30,49 +30,47 @@
 

             10
$ pmaint sync miramir
 

-            11
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
*** syncing miramir
 

-            12
*** syncing miramir
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
discouraged. You can squelch this message by running one of the following
+            14
commands sometime before your next pull:
 

-            15
commands sometime before your next pull:
+            15
 

-            16
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
  git config pull.rebase true   # rebase
 

-            18
  git config pull.rebase true   # rebase
+            18
  git config pull.ff only       # fast-forward only
 

-            19
  git config pull.ff only       # fast-forward only
+            19
 

-            20
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
You can replace "git config" with "git config --global" to set a default
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
or --ff-only on the command line to override the configured default per
 

-            23
or --ff-only on the command line to override the configured default per
+            23
invocation.
 

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** synced miramir
 

-            27
*** synced miramir
+            27
 * Sync succeeded
 

-            28
 * Sync succeeded
+            28
$ git log --format=%ci -1
 

-            29
$ git log --format=%ci -1
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 miramir
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 miramir
-

-            32
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
diff --git a/miramir.txt b/miramir.txt
index 3fceb153d9e9..37b1f9953b44 100644
--- a/miramir.txt
+++ b/miramir.txt
@@ -8,7 +8,6 @@
              'uri': 'https://github.com/miramir/miramir-layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync miramir
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing miramir
 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/mkr-overlay.html b/mkr-overlay.html
index b3d4fa1c45dd..311e0738fbaa 100644
--- a/mkr-overlay.html
+++ b/mkr-overlay.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync mkr-overlay
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing mkr-overlay
 

-            14
*** syncing mkr-overlay
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced mkr-overlay
 

-            29
*** synced mkr-overlay
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mkr-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mkr-overlay
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/mkr-overlay.txt b/mkr-overlay.txt
index 14eddad1d2ba..3ea58c82c516 100644
--- a/mkr-overlay.txt
+++ b/mkr-overlay.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git@github.com:MalakymR/mkr-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync mkr-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mkr-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/moaxcp.html b/moaxcp.html
index 42f7686aabf8..61ed414d9bd3 100644
--- a/moaxcp.html
+++ b/moaxcp.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync moaxcp
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing moaxcp
 

-            13
*** syncing moaxcp
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced moaxcp
 

-            28
*** synced moaxcp
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moaxcp
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moaxcp
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/moaxcp.txt b/moaxcp.txt
index ad97e8efad22..cbd8815fbadf 100644
--- a/moaxcp.txt
+++ b/moaxcp.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/moaxcp/moaxcp-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync moaxcp
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing moaxcp
 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/moexiami.html b/moexiami.html
index a54c3ff1d96e..e9c023ff19d6 100644
--- a/moexiami.html
+++ b/moexiami.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync moexiami
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing moexiami
 

-            17
*** syncing moexiami
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced moexiami
 

-            32
*** synced moexiami
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moexiami
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moexiami
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/moexiami.txt b/moexiami.txt
index 18418fdf669e..5a956ede2669 100644
--- a/moexiami.txt
+++ b/moexiami.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git'}],
  'status': 'unofficial'}
 $ pmaint sync moexiami
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing moexiami
 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/moltonel.html b/moltonel.html
index 3a5a6e331112..191adf5ddf7f 100644
--- a/moltonel.html
+++ b/moltonel.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync moltonel
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing moltonel
 

-            13
*** syncing moltonel
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced moltonel
 

-            28
*** synced moltonel
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moltonel
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moltonel
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/moltonel.txt b/moltonel.txt
index 36702a79bf95..8c06b792f483 100644
--- a/moltonel.txt
+++ b/moltonel.txt
@@ -9,7 +9,6 @@
              'uri': 'git://github.com/vincentdephily/moltonel-ebuilds.git'}],
  'status': 'unofficial'}
 $ pmaint sync moltonel
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing moltonel
 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/monero.html b/monero.html
index 9c23c15a0ca9..98f83663a773 100644
--- a/monero.html
+++ b/monero.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync monero
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing monero
 

-            17
*** syncing monero
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced monero
 

-            32
*** synced monero
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 monero
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 monero
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/monero.txt b/monero.txt
index 51240c7a4921..b9429964d453 100644
--- a/monero.txt
+++ b/monero.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@github.com/gentoo-monero/gentoo-monero.git'}],
  'status': 'unofficial'}
 $ pmaint sync monero
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing monero
 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/mschiff.html b/mschiff.html
index e9955c2b12d4..a9671690b723 100644
--- a/mschiff.html
+++ b/mschiff.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync mschiff
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing mschiff
 

-            17
*** syncing mschiff
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced mschiff
 

-            32
*** synced mschiff
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mschiff
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mschiff
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/mschiff.txt b/mschiff.txt
index 1229ac0e2b6c..19c30e99b00f 100644
--- a/mschiff.txt
+++ b/mschiff.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/mschiff.git'}],
  'status': 'official'}
 $ pmaint sync mschiff
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mschiff
 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/multilib-portage.html b/multilib-portage.html
index 609f9f2d8145..dd98f3f89061 100644
--- a/multilib-portage.html
+++ b/multilib-portage.html
@@ -32,57 +32,55 @@
 

             11
$ pmaint sync multilib-portage
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing multilib-portage
 

-            13
*** syncing multilib-portage
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced multilib-portage
 

-            28
*** synced multilib-portage
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 multilib-portage
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 multilib-portage
-

-            33
 * media-plugins/live-2011.12.23: failed sourcing ebuild: flag-o-matic.eclass: EAPI 3 is too old., (flag-o-matic.eclass, line  14:  called die)
+            32
 * media-plugins/live-2011.12.23: failed sourcing ebuild: flag-o-matic.eclass: EAPI 3 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            34
 * media-plugins/live-2012.01.07: failed sourcing ebuild: flag-o-matic.eclass: EAPI 3 is too old., (flag-o-matic.eclass, line  14:  called die)
+            33
 * media-plugins/live-2012.01.07: failed sourcing ebuild: flag-o-matic.eclass: EAPI 3 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            35
 * media-sound/jack-audio-connection-kit-0.121.3: failed sourcing ebuild: autotools: EAPI 2 not supported, (autotools.eclass, line  35:  called die)
+            34
 * media-sound/jack-audio-connection-kit-0.121.3: failed sourcing ebuild: autotools: EAPI 2 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            36
 * sys-apps/abi-wrapper-2.0_pre20120702: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            35
 * sys-apps/abi-wrapper-2.0_pre20120702: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            37
 * Cache regen failed with 1
+            36
 * Cache regen failed with 1
 

 
         
diff --git a/multilib-portage.txt b/multilib-portage.txt
index b865c26f1e66..4d605ccd0d9f 100644
--- a/multilib-portage.txt
+++ b/multilib-portage.txt
@@ -9,7 +9,6 @@
              'uri': 'git://anongit.gentoo.org/proj/multilib-portage.git'}],
  'status': 'official'}
 $ pmaint sync multilib-portage
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing multilib-portage
 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/musl-clang.html b/musl-clang.html
index 82ae675bdd6f..b5691dcd7739 100644
--- a/musl-clang.html
+++ b/musl-clang.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync musl-clang
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing musl-clang
 

-            14
*** syncing musl-clang
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced musl-clang
 

-            29
*** synced musl-clang
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl-clang
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl-clang
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/musl-clang.txt b/musl-clang.txt
index 0f370e603329..179e348ebb3e 100644
--- a/musl-clang.txt
+++ b/musl-clang.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git://github.com/karlguy/musl-clang'}],
  'status': 'unofficial'}
 $ pmaint sync musl-clang
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing musl-clang
 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/musl.html b/musl.html
index 56e562ca576a..b133125ee720 100644
--- a/musl.html
+++ b/musl.html
@@ -40,67 +40,65 @@
 

             15
$ pmaint sync musl
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing musl
 

-            17
*** syncing musl
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced musl
 

-            32
*** synced musl
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl
-

-            37
 * mail-filter/libspf2-1.2.9-r3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            36
 * mail-filter/libspf2-1.2.9-r3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            38
 * sys-apps/tcp-wrappers-7.6.22-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            37
 * sys-apps/tcp-wrappers-7.6.22-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            39
 * sys-libs/libapparmor-2.11.1: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            38
 * sys-libs/libapparmor-2.11.1: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            40
 * sys-libs/libapparmor-2.12.0: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            39
 * sys-libs/libapparmor-2.12.0: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            41
 * sys-libs/libnih-1.0.3-r3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            40
 * sys-libs/libnih-1.0.3-r3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            42
 * sys-libs/libutempter-1.1.6-r2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            41
 * sys-libs/libutempter-1.1.6-r2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            43
 * x11-libs/libpciaccess-0.13.4: failed sourcing ebuild: inherit requires unknown eclass: autotools-multilib.eclass
+            42
 * x11-libs/libpciaccess-0.13.4: failed sourcing ebuild: inherit requires unknown eclass: autotools-multilib.eclass
 
[FATAL]
-            44
 * x11-libs/libpciaccess-0.14: failed sourcing ebuild: inherit requires unknown eclass: autotools-multilib.eclass
+            43
 * x11-libs/libpciaccess-0.14: failed sourcing ebuild: inherit requires unknown eclass: autotools-multilib.eclass
 
[FATAL]
-            45
 * x11-libs/xcb-util-xrm-1.3: failed sourcing ebuild: inherit requires unknown eclass: autotools-multilib.eclass
+            44
 * x11-libs/xcb-util-xrm-1.3: failed sourcing ebuild: inherit requires unknown eclass: autotools-multilib.eclass
 
[FATAL]
-            46
 * Cache regen failed with 1
+            45
 * Cache regen failed with 1
 

 
         
diff --git a/musl.txt b/musl.txt
index 7e54efd7d5fa..45585531a6ad 100644
--- a/musl.txt
+++ b/musl.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/musl.git'}],
  'status': 'official'}
 $ pmaint sync musl
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing musl
 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/mv.html b/mv.html
index 225c19dabd44..17b2336e729b 100644
--- a/mv.html
+++ b/mv.html
@@ -46,49 +46,47 @@
 

             18
$ pmaint sync mv
 

-            19
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
*** syncing mv
 

-            20
*** syncing mv
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
discouraged. You can squelch this message by running one of the following
+            22
commands sometime before your next pull:
 

-            23
commands sometime before your next pull:
+            23
 

-            24
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
  git config pull.rebase true   # rebase
 

-            26
  git config pull.rebase true   # rebase
+            26
  git config pull.ff only       # fast-forward only
 

-            27
  git config pull.ff only       # fast-forward only
+            27
 

-            28
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
You can replace "git config" with "git config --global" to set a default
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
+            30
or --ff-only on the command line to override the configured default per
 

-            31
or --ff-only on the command line to override the configured default per
+            31
invocation.
 

-            32
invocation.
+            32
 

-            33
+            33
Already up to date.
 

-            34
Already up to date.
+            34
*** synced mv
 

-            35
*** synced mv
+            35
 * Sync succeeded
 

-            36
 * Sync succeeded
+            36
$ git log --format=%ci -1
 

-            37
$ git log --format=%ci -1
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
$ git show -q --pretty=format:%G? HEAD
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mv
 

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mv
-

-            40
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/mv.txt b/mv.txt
index cee415a84caa..f756a9757f8a 100644
--- a/mv.txt
+++ b/mv.txt
@@ -16,7 +16,6 @@
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/mv.git'}],
  'status': 'unofficial'}
 $ pmaint sync mv
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mv
 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/mva.html b/mva.html
index e3f88718ad88..64807d0471ee 100644
--- a/mva.html
+++ b/mva.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync mva
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing mva
 

-            14
*** syncing mva
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced mva
 

-            29
*** synced mva
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mva
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mva
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/mva.txt b/mva.txt
index d03748d05640..57db7e67e0ac 100644
--- a/mva.txt
+++ b/mva.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git://github.com/msva/mva-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync mva
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mva
 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/myrvolay.html b/myrvolay.html
index bf46818aea3e..03a085033d9c 100644
--- a/myrvolay.html
+++ b/myrvolay.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync myrvolay
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing myrvolay
 

-            15
*** syncing myrvolay
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced myrvolay
 

-            30
*** synced myrvolay
+            30
 * Sync succeeded
 

-            31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 

-            32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 myrvolay
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 myrvolay
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/myrvolay.txt b/myrvolay.txt
index b4827c063277..fe446e06740f 100644
--- a/myrvolay.txt
+++ b/myrvolay.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:myrvogna/myrvolay.git'}],
  'status': 'unofficial'}
 $ pmaint sync myrvolay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing myrvolay
 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/mysql.html b/mysql.html
index f05112b035f4..81031fac10a6 100644
--- a/mysql.html
+++ b/mysql.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync mysql
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing mysql
 

-            17
*** syncing mysql
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced mysql
 

-            32
*** synced mysql
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mysql
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mysql
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/mysql.txt b/mysql.txt
index a89aa4bf9976..4df20ff72e5c 100644
--- a/mysql.txt
+++ b/mysql.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/mysql.git'}],
  'status': 'official'}
 $ pmaint sync mysql
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing mysql
 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/natinst.html b/natinst.html
index f8789bf30bdc..5ef730a7b96b 100644
--- a/natinst.html
+++ b/natinst.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync natinst
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing natinst
 

-            16
*** syncing natinst
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced natinst
 

-            31
*** synced natinst
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 natinst
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 natinst
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/natinst.txt b/natinst.txt
index c98c94f4b17f..34c1264d00cf 100644
--- a/natinst.txt
+++ b/natinst.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/AndrewAmmerlaan/natinst.git'}],
  'status': 'unofficial'}
 $ pmaint sync natinst
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing natinst
 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/nelson-graca.html b/nelson-graca.html
index fb179eab4c84..5faf78393c4d 100644
--- a/nelson-graca.html
+++ b/nelson-graca.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync nelson-graca
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing nelson-graca
 

-            16
*** syncing nelson-graca
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced nelson-graca
 

-            31
*** synced nelson-graca
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nelson-graca
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nelson-graca
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/nelson-graca.txt b/nelson-graca.txt
index 2805517d0fd1..7d6f21a9e1a4 100644
--- a/nelson-graca.txt
+++ b/nelson-graca.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/nelsongraca/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync nelson-graca
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nelson-graca
 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/nest.html b/nest.html
index c6744a5df603..d4e80e7bc8dd 100644
--- a/nest.html
+++ b/nest.html
@@ -38,53 +38,51 @@
 

             14
$ pmaint sync nest
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing nest
 

-            16
*** syncing nest
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced nest
 

-            31
*** synced nest
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nest
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nest
-

-            36
 * dev-ml/ocaml-inotify-2.3: failed sourcing ebuild: inherit requires unknown eclass: oasis.eclass
+            35
 * dev-ml/ocaml-inotify-2.3: failed sourcing ebuild: inherit requires unknown eclass: oasis.eclass
 
[FATAL]
-            37
 * dev-ml/ocaml-inotify-9999: failed sourcing ebuild: inherit requires unknown eclass: oasis.eclass
+            36
 * dev-ml/ocaml-inotify-9999: failed sourcing ebuild: inherit requires unknown eclass: oasis.eclass
 
[FATAL]
-            38
 * Cache regen failed with 1
+            37
 * Cache regen failed with 1
 

 
         
diff --git a/nest.txt b/nest.txt
index 3b1c5117c918..e46b3707fca8 100644
--- a/nest.txt
+++ b/nest.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/SpiderX/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync nest
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nest
 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/nico.html b/nico.html
index 46870b8a04f3..5afe72d56b5e 100644
--- a/nico.html
+++ b/nico.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync nico
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing nico
 

-            17
*** syncing nico
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced nico
 

-            32
*** synced nico
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nico
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nico
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/nico.txt b/nico.txt
index 6f2f1bad198e..34758b0c95a3 100644
--- a/nico.txt
+++ b/nico.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/nico.git'}],
  'status': 'unofficial'}
 $ pmaint sync nico
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nico
 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/nitratesky.html b/nitratesky.html
index 572d931ea141..56fd71fd2716 100644
--- a/nitratesky.html
+++ b/nitratesky.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync nitratesky
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing nitratesky
 

-            16
*** syncing nitratesky
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced nitratesky
 

-            31
*** synced nitratesky
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nitratesky
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nitratesky
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/nitratesky.txt b/nitratesky.txt
index 9c892fc5b90b..edc3256cc587 100644
--- a/nitratesky.txt
+++ b/nitratesky.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/VTimofeenko/nitratesky.git'}],
  'status': 'unofficial'}
 $ pmaint sync nitratesky
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nitratesky
 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/nix-guix.html b/nix-guix.html
index 2bff96d00b6d..839d793c11f5 100644
--- a/nix-guix.html
+++ b/nix-guix.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync nix-guix
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing nix-guix
 

-            14
*** syncing nix-guix
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced nix-guix
 

-            29
*** synced nix-guix
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nix-guix
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nix-guix
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/nix-guix.txt b/nix-guix.txt
index a689e8437e96..16d03fedcaf9 100644
--- a/nix-guix.txt
+++ b/nix-guix.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/trofi/nix-guix-gentoo.git'}],
  'status': 'official'}
 $ pmaint sync nix-guix
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nix-guix
 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/np-hardass-overlay.html b/np-hardass-overlay.html
index e9f9748d3640..74d8f3d0dced 100644
--- a/np-hardass-overlay.html
+++ b/np-hardass-overlay.html
@@ -32,53 +32,51 @@
 

             11
$ pmaint sync np-hardass-overlay
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing np-hardass-overlay
 

-            13
*** syncing np-hardass-overlay
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced np-hardass-overlay
 

-            28
*** synced np-hardass-overlay
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 np-hardass-overlay
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 np-hardass-overlay
-

-            33
 * dev-python/demjson-2.2.4-r2: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            32
 * dev-python/demjson-2.2.4-r2: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            34
 * x11-misc/lightdm-gtk-greeter-settings-1.2.2: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
+            33
 * x11-misc/lightdm-gtk-greeter-settings-1.2.2: failed sourcing ebuild: Unsupported EAPI=5 (too old) for distutils-r1, (distutils-r1.eclass, line  48:  called die)
 
[FATAL]
-            35
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
diff --git a/np-hardass-overlay.txt b/np-hardass-overlay.txt
index c3456a879baa..c478d7b77de2 100644
--- a/np-hardass-overlay.txt
+++ b/np-hardass-overlay.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/np-hardass/np-hardass-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync np-hardass-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing np-hardass-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/nx.html b/nx.html
index ba85887fce40..deefe3e60e99 100644
--- a/nx.html
+++ b/nx.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync nx
 

-            13
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
*** syncing nx
 

-            14
*** syncing nx
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 

-            17
commands sometime before your next pull:
+            17
 

-            18
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 

-            20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 

-            21
  git config pull.ff only       # fast-forward only
+            21
 

-            22
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 

-            25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** synced nx
 

-            29
*** synced nx
+            29
 * Sync succeeded
 

-            30
 * Sync succeeded
+            30
$ git log --format=%ci -1
 

-            31
$ git log --format=%ci -1
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nx
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nx
-

-            34
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/nx.txt b/nx.txt
index b3b3a351758c..0c8dd369dcb1 100644
--- a/nx.txt
+++ b/nx.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/nx.git'}],
  'status': 'official'}
 $ pmaint sync nx
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nx
 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/nymphos.html b/nymphos.html
index 57aab3d7c535..ec9b3b8ffbab 100644
--- a/nymphos.html
+++ b/nymphos.html
@@ -28,49 +28,47 @@
 

             9
$ pmaint sync nymphos
 

-            10
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
*** syncing nymphos
 

-            11
*** syncing nymphos
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
discouraged. You can squelch this message by running one of the following
+            13
commands sometime before your next pull:
 

-            14
commands sometime before your next pull:
+            14
 

-            15
+            15
  git config pull.rebase false  # merge (the default strategy)
 

-            16
  git config pull.rebase false  # merge (the default strategy)
+            16
  git config pull.rebase true   # rebase
 

-            17
  git config pull.rebase true   # rebase
+            17
  git config pull.ff only       # fast-forward only
 

-            18
  git config pull.ff only       # fast-forward only
+            18
 

-            19
+            19
You can replace "git config" with "git config --global" to set a default
 

-            20
You can replace "git config" with "git config --global" to set a default
+            20
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
or --ff-only on the command line to override the configured default per
 

-            22
or --ff-only on the command line to override the configured default per
+            22
invocation.
 

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** synced nymphos
 

-            26
*** synced nymphos
+            26
 * Sync succeeded
 

-            27
 * Sync succeeded
+            27
$ git log --format=%ci -1
 

-            28
$ git log --format=%ci -1
+            28
$ git show -q --pretty=format:%G? HEAD
 

-            29
$ git show -q --pretty=format:%G? HEAD
+            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nymphos
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nymphos
-

-            31
 * Cache regenerated successfully
+            30
 * Cache regenerated successfully
 

 
         
diff --git a/nymphos.txt b/nymphos.txt
index 3ab3d536e4c1..5cb02ed7471e 100644
--- a/nymphos.txt
+++ b/nymphos.txt
@@ -7,7 +7,6 @@
  'source': [{'type': 'git', 'uri': 'https://git.nymphos.ga/anon/nymphos'}],
  'status': 'unofficial'}
 $ pmaint sync nymphos
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing nymphos
 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/octopus.html b/octopus.html
index d937e1dfd569..734b987fa1e9 100644
--- a/octopus.html
+++ b/octopus.html
@@ -28,51 +28,49 @@
 

             9
$ pmaint sync octopus
 

-            10
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
*** syncing octopus
 

-            11
*** syncing octopus
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
discouraged. You can squelch this message by running one of the following
+            13
commands sometime before your next pull:
 

-            14
commands sometime before your next pull:
+            14
 

-            15
+            15
  git config pull.rebase false  # merge (the default strategy)
 

-            16
  git config pull.rebase false  # merge (the default strategy)
+            16
  git config pull.rebase true   # rebase
 

-            17
  git config pull.rebase true   # rebase
+            17
  git config pull.ff only       # fast-forward only
 

-            18
  git config pull.ff only       # fast-forward only
+            18
 

-            19
+            19
You can replace "git config" with "git config --global" to set a default
 

-            20
You can replace "git config" with "git config --global" to set a default
+            20
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
or --ff-only on the command line to override the configured default per
 

-            22
or --ff-only on the command line to override the configured default per
+            22
invocation.
 

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** synced octopus
 

-            26
*** synced octopus
+            26
 * Sync succeeded
 

-            27
 * Sync succeeded
+            27
$ git log --format=%ci -1
 

-            28
$ git log --format=%ci -1
+            28
$ git show -q --pretty=format:%G? HEAD
 

-            29
$ git show -q --pretty=format:%G? HEAD
+            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
-

-            31
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            30
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            32
 * Cache regen failed with 1
+            31
 * Cache regen failed with 1
 

 
         
diff --git a/octopus.txt b/octopus.txt
index 31d9062539d6..253d8e75226a 100644
--- a/octopus.txt
+++ b/octopus.txt
@@ -7,7 +7,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/Bfgeshka/octopus.git'}],
  'status': 'unofficial'}
 $ pmaint sync octopus
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing octopus
 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/oddlama.html b/oddlama.html
index b1e065379236..e78367e0cb72 100644
--- a/oddlama.html
+++ b/oddlama.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync oddlama
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing oddlama
 

-            15
*** syncing oddlama
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced oddlama
 

-            30
*** synced oddlama
+            30
 * Sync succeeded
 

-            31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 

-            32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oddlama
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oddlama
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/oddlama.txt b/oddlama.txt
index d72e487e05b8..697b78c26089 100644
--- a/oddlama.txt
+++ b/oddlama.txt
@@ -11,7 +11,6 @@
              'uri': 'git+ssh://git@github.com/oddlama/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync oddlama
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing oddlama
 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/olifre.html b/olifre.html
index afa548e9fcba..b6292237ffe3 100644
--- a/olifre.html
+++ b/olifre.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync olifre
 

-            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing olifre
 

-            17
*** syncing olifre
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

-            24
  git config pull.ff only       # fast-forward only
+            24
 

-            25
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

-            28
or --ff-only on the command line to override the configured default per
+            28
invocation.
 

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced olifre
 

-            32
*** synced olifre
+            32
 * Sync succeeded
 

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 olifre
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 olifre
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/olifre.txt b/olifre.txt
index 748c759f95aa..9bfd0fb1941d 100644
--- a/olifre.txt
+++ b/olifre.txt
@@ -13,7 +13,6 @@
             {'type': 'git', 'uri': 'git@github.com:olifre/olifre-portage.git'}],
  'status': 'unofficial'}
 $ pmaint sync olifre
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing olifre
 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/openclonk.html b/openclonk.html
index 5c99fe4088bf..391eaeab79cf 100644
--- a/openclonk.html
+++ b/openclonk.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync openclonk
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing openclonk
 

-            16
*** syncing openclonk
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced openclonk
 

-            31
*** synced openclonk
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openclonk
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openclonk
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/openclonk.txt b/openclonk.txt
index 219ed04ab424..8875e205255c 100644
--- a/openclonk.txt
+++ b/openclonk.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/jcaesar/openclonk-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync openclonk
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing openclonk
 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/openwrt.html b/openwrt.html
index d63564a3267a..635d986fa61d 100644
--- a/openwrt.html
+++ b/openwrt.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync openwrt
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
*** syncing openwrt
 

-            13
*** syncing openwrt
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
commands sometime before your next pull:
 

-            16
commands sometime before your next pull:
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase true   # rebase
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.ff only       # fast-forward only
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
or --ff-only on the command line to override the configured default per
 

-            24
or --ff-only on the command line to override the configured default per
+            24
invocation.
 

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

-            27
Already up to date.
+            27
*** synced openwrt
 

-            28
*** synced openwrt
+            28
 * Sync succeeded
 

-            29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 

-            30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openwrt
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openwrt
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/openwrt.txt b/openwrt.txt
index e123bbbfd6e3..3d1e75af882e 100644
--- a/openwrt.txt
+++ b/openwrt.txt
@@ -9,7 +9,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-openwrt'}],
  'status': 'unofficial'}
 $ pmaint sync openwrt
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing openwrt
 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/overseerr-overlay.html b/overseerr-overlay.html
index 1eb271506dfc..ced2886d008e 100644
--- a/overseerr-overlay.html
+++ b/overseerr-overlay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync overseerr-overlay
 

-            15
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing overseerr-overlay
 

-            16
*** syncing overseerr-overlay
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
commands sometime before your next pull:
 

-            19
commands sometime before your next pull:
+            19
 

-            20
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase true   # rebase
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.ff only       # fast-forward only
+            23
 

-            24
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
or --ff-only on the command line to override the configured default per
 

-            27
or --ff-only on the command line to override the configured default per
+            27
invocation.
 

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** synced overseerr-overlay
 

-            31
*** synced overseerr-overlay
+            31
 * Sync succeeded
 

-            32
 * Sync succeeded
+            32
$ git log --format=%ci -1
 

-            33
$ git log --format=%ci -1
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git show -q --pretty=format:%G? HEAD
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 overseerr-overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 overseerr-overlay
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/overseerr-overlay.txt b/overseerr-overlay.txt
index 068c93aa9cc3..febdddb88833 100644
--- a/overseerr-overlay.txt
+++ b/overseerr-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync overseerr-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing overseerr-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/palemoon.html b/palemoon.html
index 72a2811c7ab4..47ed47699dec 100644
--- a/palemoon.html
+++ b/palemoon.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync palemoon
 

-            14
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing palemoon
 

-            15
*** syncing palemoon
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced palemoon
 

-            30
*** synced palemoon
+            30
 * Sync succeeded
 

-            31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 

-            32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 palemoon
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 palemoon
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/palemoon.txt b/palemoon.txt
index 6b16e246e3aa..8c9ed0e3a0bd 100644
--- a/palemoon.txt
+++ b/palemoon.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:deu/palemoon-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync palemoon
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 *** syncing palemoon
 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 1559abbcfb12..f95f6dd2ad1f 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -114,7 +114,7 @@
 

             52
 

-            53
sent 85 bytes  received 132 bytes  62.00 bytes/sec
+            53
sent 85 bytes  received 132 bytes  86.80 bytes/sec
 

             54
total size is 32  speedup is 0.15
 

diff --git a/poly-c.txt b/poly-c.txt
index 40782d4a49db..8d02d00ed3f9 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -50,7 +50,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 132
 
-sent 85 bytes  received 132 bytes  62.00 bytes/sec
+sent 85 bytes  received 132 bytes  86.80 bytes/sec
 total size is 32  speedup is 0.15
 *** synced poly-c
  * Sync succeeded
diff --git a/xwing.html b/xwing.html
index 6de5514ceacc..3a2c5bf0ce13 100644
--- a/xwing.html
+++ b/xwing.html
@@ -84,15 +84,57 @@
 

             37
total size is 32  speedup is 0.15
 

-            38
*** synced xwing
+            38
This is xwing.info / alderaan.xwing.info
 

-            39
 * Sync succeeded
+            39
 

-            40
$ stat --format=%y .
+            40
Contact Name   : webmaster@xwing.info
 

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
+            41
 

-            42
 * Cache regenerated successfully
+            42
+

+            43
Number of files: 176 (reg: 115, dir: 61)
+

+            44
Number of created files: 0
+

+            45
Number of deleted files: 0
+

+            46
Number of regular files transferred: 24
+

+            47
Total file size: 136.31K bytes
+

+            48
Total transferred file size: 29.11K bytes
+

+            49
Literal data: 29.11K bytes
+

+            50
Matched data: 0 bytes
+

+            51
File list size: 5.78K
+

+            52
File list generation time: 0.001 seconds
+

+            53
File list transfer time: 0.000 seconds
+

+            54
Total bytes sent: 643
+

+            55
Total bytes received: 21.29K
+

+            56
+

+            57
sent 643 bytes  received 21.29K bytes  8.77K bytes/sec
+

+            58
total size is 136.31K  speedup is 6.22
+

+            59
*** synced xwing
+

+            60
 * Sync succeeded
+

+            61
$ stat --format=%y .
+

+            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
+

+            63
 * Cache regenerated successfully
 

 
         
diff --git a/xwing.txt b/xwing.txt
index e6f09688228f..b2a97abe2b63 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -35,6 +35,27 @@ Total bytes received: 134
 
 sent 85 bytes  received 134 bytes  87.60 bytes/sec
 total size is 32  speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Contact Name   : webmaster@xwing.info
+
+
+Number of files: 176 (reg: 115, dir: 61)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 24
+Total file size: 136.31K bytes
+Total transferred file size: 29.11K bytes
+Literal data: 29.11K bytes
+Matched data: 0 bytes
+File list size: 5.78K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 643
+Total bytes received: 21.29K
+
+sent 643 bytes  received 21.29K bytes  8.77K bytes/sec
+total size is 136.31K  speedup is 6.22
 *** synced xwing
  * Sync succeeded
 $ stat --format=%y .
diff --git a/zugaina.html b/zugaina.html
index e862ed55caa6..755cbadd5a25 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -50,19 +50,19 @@
 

             20
Matched data: 0 bytes
 

-            21
File list size: 31.07K
+            21
File list size: 40.12K
 

             22
File list generation time: 0.001 seconds
 

             23
File list transfer time: 0.000 seconds
 

-            24
Total bytes sent: 486
+            24
Total bytes sent: 482
 

-            25
Total bytes received: 44.28K
+            25
Total bytes received: 44.29K
 

             26
 

-            27
sent 486 bytes  received 44.28K bytes  17.91K bytes/sec
+            27
sent 482 bytes  received 44.29K bytes  12.79K bytes/sec
 

             28
total size is 2.01M  speedup is 44.91
 

diff --git a/zugaina.txt b/zugaina.txt
index 2132051d7922..76316b25d171 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -18,13 +18,13 @@ Total file size: 2.01M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 31.07K
+File list size: 40.12K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 486
-Total bytes received: 44.28K
+Total bytes sent: 482
+Total bytes received: 44.29K
 
-sent 486 bytes  received 44.28K bytes  17.91K bytes/sec
+sent 482 bytes  received 44.29K bytes  12.79K bytes/sec
 total size is 2.01M  speedup is 44.91
 *** synced zugaina
  * Sync succeeded
-- 
cgit v1.2.3-65-gdbad