From bf0bf4098cf2473ec7b4b1196e207693b2636d82 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 30 Oct 2020 11:05:10 +0000 Subject: 2020-10-30T11:00:01Z --- R_Overlay.html | 6 +-- R_Overlay.txt | 6 +-- brave-overlay.html | 44 +++++++++++++++----- brave-overlay.txt | 16 +++++++- ceamac.html | 44 ++++++++++---------- ceamac.txt | 1 - chrisadr.html | 44 ++++++++++---------- chrisadr.txt | 1 - chrytoo.html | 44 ++++++++++---------- chrytoo.txt | 1 - chutzpah.html | 46 ++++++++++----------- chutzpah.txt | 1 - chymeric.html | 44 ++++++++++---------- chymeric.txt | 1 - cj-overlay.html | 44 ++++++++++---------- cj-overlay.txt | 1 - concaveoverlay.html | 44 ++++++++++---------- concaveoverlay.txt | 1 - crocket-overlay.html | 44 ++++++++++---------- crocket-overlay.txt | 1 - crossdev.html | 44 ++++++++++---------- crossdev.txt | 1 - cynede.html | 44 ++++++++++---------- cynede.txt | 1 - dMaggot.html | 44 ++++++++++---------- dMaggot.txt | 1 - darkelf.html | 44 ++++++++++---------- darkelf.txt | 1 - darthgandalf-overlay.html | 44 ++++++++++---------- darthgandalf-overlay.txt | 1 - deadbeef-overlay.html | 44 ++++++++++---------- deadbeef-overlay.txt | 1 - decent-im.html | 44 ++++++++++---------- decent-im.txt | 1 - deepin.html | 44 ++++++++++---------- deepin.txt | 1 - defiance.html | 44 ++++++++++---------- defiance.txt | 1 - delicious-absurdities.html | 44 ++++++++++---------- delicious-absurdities.txt | 1 - deter.html | 46 ++++++++++----------- deter.txt | 1 - dev1990-overlay.html | 44 ++++++++++---------- dev1990-overlay.txt | 1 - devpump-gor.html | 44 ++++++++++---------- devpump-gor.txt | 1 - didactic-duck.html | 44 ++++++++++---------- didactic-duck.txt | 1 - dilfridge.html | 44 ++++++++++---------- dilfridge.txt | 1 - displacer.html | 44 ++++++++++---------- displacer.txt | 1 - distros.html | 44 ++++++++++---------- distros.txt | 1 - djc.html | 44 ++++++++++---------- djc.txt | 1 - dlang.html | 44 ++++++++++---------- dlang.txt | 1 - dmchurch.html | 44 ++++++++++---------- dmchurch.txt | 1 - docker.html | 78 +++++++++++++++++------------------ docker.txt | 1 - dotnet.html | 44 ++++++++++---------- dotnet.txt | 1 - drdim.html | 44 ++++++++++---------- drdim.txt | 1 - dwfreed.html | 44 ++++++++++---------- dwfreed.txt | 1 - dwosky.html | 44 ++++++++++---------- dwosky.txt | 1 - earshark.html | 44 ++++++++++---------- earshark.txt | 1 - eclipse.html | 44 ++++++++++---------- eclipse.txt | 1 - edgets.html | 44 ++++++++++---------- edgets.txt | 1 - eigenlay.html | 44 ++++++++++---------- eigenlay.txt | 1 - einflay.html | 44 ++++++++++---------- einflay.txt | 1 - ejabberd.html | 44 ++++++++++---------- ejabberd.txt | 1 - elementary.html | 44 ++++++++++---------- elementary.txt | 1 - elopez-r-overlay.html | 44 ++++++++++---------- elopez-r-overlay.txt | 1 - emacs.html | 44 ++++++++++---------- emacs.txt | 1 - enlightenment-live.html | 44 ++++++++++---------- enlightenment-live.txt | 1 - ennui.html | 44 ++++++++++---------- ennui.txt | 1 - equaeghe.html | 44 ++++++++++---------- equaeghe.txt | 1 - erayd.html | 44 ++++++++++---------- erayd.txt | 1 - ethereum.html | 44 ++++++++++---------- ethereum.txt | 1 - flow.html | 44 +++++++++++++++----- flow.txt | 16 +++++++- fusion809.html | 44 ++++++++++---------- fusion809.txt | 1 - fuverlay.html | 44 ++++++++++---------- fuverlay.txt | 1 - gamarouns.html | 44 ++++++++++---------- gamarouns.txt | 1 - gambas-overlay.html | 44 ++++++++++---------- gambas-overlay.txt | 1 - gamerlay.html | 44 ++++++++++---------- gamerlay.txt | 1 - gcarq.html | 44 ++++++++++---------- gcarq.txt | 1 - genthree.html | 44 ++++++++++---------- genthree.txt | 1 - gentoo-clang.html | 44 ++++++++++---------- gentoo-clang.txt | 1 - gentoo-mate.html | 44 ++++++++++---------- gentoo-mate.txt | 1 - gentoo-playground.html | 50 +++++++++++------------ gentoo-playground.txt | 1 - gentoo-zh.html | 44 ++++++++++---------- gentoo-zh.txt | 1 - gentoo.html | 46 ++++++++++----------- gentoo.txt | 2 - gerislay.html | 44 ++++++++++---------- gerislay.txt | 1 - gig.html | 44 ++++++++++---------- gig.txt | 1 - gitlab.html | 44 ++++++++++---------- gitlab.txt | 1 - glarbs-overlay.html | 44 ++++++++++---------- glarbs-overlay.txt | 1 - glicOne.html | 52 ++++++++++++----------- glicOne.txt | 1 - gnome-next.html | 44 ++++++++++---------- gnome-next.txt | 1 - gnome.html | 44 ++++++++++---------- gnome.txt | 1 - gnuradio.html | 44 ++++++++++---------- gnuradio.txt | 1 - gnustep.html | 44 ++++++++++---------- gnustep.txt | 1 - gnux32.html | 44 ++++++++++---------- gnux32.txt | 1 - go-overlay.html | 44 ++++++++++---------- go-overlay.txt | 1 - godin.html | 44 ++++++++++---------- godin.txt | 1 - goris.html | 44 ++++++++++---------- goris.txt | 1 - graaff.html | 44 ++++++++++---------- graaff.txt | 1 - grub2-themes.html | 44 ++++++++++---------- grub2-themes.txt | 1 - index.html | 2 +- myov.html | 26 ++++-------- myov.txt | 7 +--- poly-c.html | 100 ++++----------------------------------------- poly-c.txt | 45 +------------------- swegener.html | 6 +-- swegener.txt | 6 +-- xwing.html | 64 +++++++++++++++++++++++++---- xwing.txt | 29 +++++++++++-- zugaina.html | 6 +-- zugaina.txt | 6 +-- 165 files changed, 1793 insertions(+), 2021 deletions(-) diff --git a/R_Overlay.html b/R_Overlay.html index 0158f07abf67..11e5b34f4a79 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -50,19 +50,19 @@ 20
Matched data: 0 bytes
- 21
File list size: 2.97M
+            21
File list size: 2.82M
 

             22
File list generation time: 0.001 seconds
 

             23
File list transfer time: 0.000 seconds
 

-            24
Total bytes sent: 22.41K
+            24
Total bytes sent: 22.34K
 

             25
Total bytes received: 3.58M
 

             26
 

-            27
sent 22.41K bytes  received 3.58M bytes  1.44M bytes/sec
+            27
sent 22.34K bytes  received 3.58M bytes  1.44M bytes/sec
 

             28
total size is 96.79M  speedup is 26.89
 

diff --git a/R_Overlay.txt b/R_Overlay.txt
index 0069b0b2f0ee..8d2b599cbf33 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 96.79M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.97M
+File list size: 2.82M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 22.41K
+Total bytes sent: 22.34K
 Total bytes received: 3.58M
 
-sent 22.41K bytes  received 3.58M bytes  1.44M bytes/sec
+sent 22.34K bytes  received 3.58M bytes  1.44M bytes/sec
 total size is 96.79M  speedup is 26.89
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/brave-overlay.html b/brave-overlay.html
index e9c0236a8471..ef03357c7c91 100644
--- a/brave-overlay.html
+++ b/brave-overlay.html
@@ -32,25 +32,49 @@
 

             11
 'status': 'unofficial'}
 

-            12
 * Adding new repository
+            12
$ pmaint sync brave-overlay
 

-            13
$ pmaint sync brave-overlay
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
Cloning into '/var/lib/repo-mirror-ci/sync/brave-overlay'...
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
*** syncing brave-overlay
+            15
commands sometime before your next pull:
 

-            16
*** synced brave-overlay
+            16
 

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

-            18
$ git log --format=%ci -1
+            18
  git config pull.rebase true   # rebase
 

-            19
$ git show -q --pretty=format:%G? HEAD
+            19
  git config pull.ff only       # fast-forward only
 

-            20
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brave-overlay
+            20
 

-            21
 * Cache regenerated successfully
+            21
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
or --ff-only on the command line to override the configured default per
+

+            24
invocation.
+

+            25
+

+            26
Already up to date.
+

+            27
*** syncing brave-overlay
+

+            28
*** synced brave-overlay
+

+            29
 * Sync succeeded
+

+            30
$ git log --format=%ci -1
+

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

+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brave-overlay
+

+            33
 * Cache regenerated successfully
 

 
         
diff --git a/brave-overlay.txt b/brave-overlay.txt
index 37191faf7bd6..533dc2e9d846 100644
--- a/brave-overlay.txt
+++ b/brave-overlay.txt
@@ -9,9 +9,21 @@
  'source': [{'type': 'git',
              'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync brave-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/brave-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+  git config pull.rebase false  # merge (the default strategy)
+  git config pull.rebase true   # rebase
+  git config pull.ff only       # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+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.
+
+Already up to date.
 *** syncing brave-overlay
 *** synced brave-overlay
  * Sync succeeded
diff --git a/ceamac.html b/ceamac.html
index cde32089a4c0..6e99d45b6167 100644
--- a/ceamac.html
+++ b/ceamac.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync ceamac
 

-            16
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing ceamac
 

-            31
*** syncing ceamac
+            31
*** synced ceamac
 

-            32
*** synced ceamac
+            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 1 ceamac
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ceamac
-

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

 
         
diff --git a/ceamac.txt b/ceamac.txt
index dbdee7de40ff..38df804a1dcd 100644
--- a/ceamac.txt
+++ b/ceamac.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@github.com/ceamac/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ceamac
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/chrisadr.html b/chrisadr.html
index 3bcb81b87dba..02246a1d1da6 100644
--- a/chrisadr.html
+++ b/chrisadr.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync chrisadr
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing chrisadr
 

-            30
*** syncing chrisadr
+            30
*** synced chrisadr
 

-            31
*** synced chrisadr
+            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 1 chrisadr
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrisadr
-

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

 
         
diff --git a/chrisadr.txt b/chrisadr.txt
index 017780b5292c..fc599e1547a0 100644
--- a/chrisadr.txt
+++ b/chrisadr.txt
@@ -12,7 +12,6 @@
              'uri': 'git@github.com:ChrisADR/chrisadr-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync chrisadr
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/chrytoo.html b/chrytoo.html
index cdc800c3829a..9a0f28d3b066 100644
--- a/chrytoo.html
+++ b/chrytoo.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync chrytoo
 

-            18
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing chrytoo
 

-            33
*** syncing chrytoo
+            33
*** synced chrytoo
 

-            34
*** synced chrytoo
+            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 1 chrytoo
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrytoo
-

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

 
         
diff --git a/chrytoo.txt b/chrytoo.txt
index 21677c03c043..a7f1ffa6da29 100644
--- a/chrytoo.txt
+++ b/chrytoo.txt
@@ -15,7 +15,6 @@
              'uri': 'git@github.com:chrytoo/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync chrytoo
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/chutzpah.html b/chutzpah.html
index fe21545ee693..97f2bc9af0d4 100644
--- a/chutzpah.html
+++ b/chutzpah.html
@@ -42,51 +42,49 @@
 

             16
$ pmaint sync chutzpah
 

-            17
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing chutzpah
 

-            32
*** syncing chutzpah
+            32
*** synced chutzpah
 

-            33
*** synced chutzpah
+            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 1 chutzpah
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chutzpah
-

-            38
 * app-vim/jedi-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
 * app-vim/jedi-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            39
 * Cache regen failed with 1
+            38
 * Cache regen failed with 1
 

 
         
diff --git a/chutzpah.txt b/chutzpah.txt
index 63b52c89c288..9b4fbaba2fd1 100644
--- a/chutzpah.txt
+++ b/chutzpah.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/chutzpah.git'}],
  'status': 'official'}
 $ pmaint sync chutzpah
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/chymeric.html b/chymeric.html
index 7dbdaea97cb5..c2734d5de87d 100644
--- a/chymeric.html
+++ b/chymeric.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync chymeric
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing chymeric
 

-            30
*** syncing chymeric
+            30
*** synced chymeric
 

-            31
*** synced chymeric
+            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 1 chymeric
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chymeric
-

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

 
         
diff --git a/chymeric.txt b/chymeric.txt
index 25fc84a6c2a1..9f8e1a8e95af 100644
--- a/chymeric.txt
+++ b/chymeric.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/TheChymera/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync chymeric
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/cj-overlay.html b/cj-overlay.html
index 4b1b9b02f9b8..51396f0eb1e4 100644
--- a/cj-overlay.html
+++ b/cj-overlay.html
@@ -28,49 +28,47 @@
 

             9
$ pmaint sync cj-overlay
 

-            10
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            13
commands sometime before your next pull:
+            13
 

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

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

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

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

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

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

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

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

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

-            24
Already up to date.
+            24
*** syncing cj-overlay
 

-            25
*** syncing cj-overlay
+            25
*** synced cj-overlay
 

-            26
*** synced cj-overlay
+            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 1 cj-overlay
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cj-overlay
-

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

 
         
diff --git a/cj-overlay.txt b/cj-overlay.txt
index 7fd066a6ba5a..f2cfadbd6d94 100644
--- a/cj-overlay.txt
+++ b/cj-overlay.txt
@@ -7,7 +7,6 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/junghans/cj-overlay'}],
  'status': 'official'}
 $ pmaint sync cj-overlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/concaveoverlay.html b/concaveoverlay.html
index bf75614eb580..2226ad39e4bd 100644
--- a/concaveoverlay.html
+++ b/concaveoverlay.html
@@ -30,49 +30,47 @@
 

             10
$ pmaint sync concaveoverlay
 

-            11
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing concaveoverlay
 

-            26
*** syncing concaveoverlay
+            26
*** synced concaveoverlay
 

-            27
*** synced concaveoverlay
+            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 1 concaveoverlay
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 concaveoverlay
-

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

 
         
diff --git a/concaveoverlay.txt b/concaveoverlay.txt
index 410ab1716f88..cd5d2017c5b0 100644
--- a/concaveoverlay.txt
+++ b/concaveoverlay.txt
@@ -8,7 +8,6 @@
              'uri': 'https://gitlab.com/concavegit/concaveoverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync concaveoverlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/crocket-overlay.html b/crocket-overlay.html
index 9439d010bad8..0b38f6a3c2ba 100644
--- a/crocket-overlay.html
+++ b/crocket-overlay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync crocket-overlay
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing crocket-overlay
 

-            30
*** syncing crocket-overlay
+            30
*** synced crocket-overlay
 

-            31
*** synced crocket-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 1 crocket-overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 crocket-overlay
-

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

 
         
diff --git a/crocket-overlay.txt b/crocket-overlay.txt
index 64d59997676b..68014e7704ec 100644
--- a/crocket-overlay.txt
+++ b/crocket-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/crocket/crocket-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync crocket-overlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/crossdev.html b/crossdev.html
index 0211cd70bac1..c8ffdb3c61c6 100644
--- a/crossdev.html
+++ b/crossdev.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync crossdev
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing crossdev
 

-            28
*** syncing crossdev
+            28
*** synced crossdev
 

-            29
*** synced crossdev
+            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 1 crossdev
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 crossdev
-

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

 
         
diff --git a/crossdev.txt b/crossdev.txt
index f5a84697d842..0e096c597ed9 100644
--- a/crossdev.txt
+++ b/crossdev.txt
@@ -10,7 +10,6 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/alphallc/crossdev'}],
  'status': 'unofficial'}
 $ pmaint sync crossdev
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/cynede.html b/cynede.html
index 5645bfcbbd4b..e9dba83a8cd6 100644
--- a/cynede.html
+++ b/cynede.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync cynede
 

-            16
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing cynede
 

-            31
*** syncing cynede
+            31
*** synced cynede
 

-            32
*** synced cynede
+            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 1 cynede
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cynede
-

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

 
         
diff --git a/cynede.txt b/cynede.txt
index 9df73f31c984..380ad714beca 100644
--- a/cynede.txt
+++ b/cynede.txt
@@ -13,7 +13,6 @@
             {'type': 'git', 'uri': 'git@github.com:Heather/gentoo-cynede.git'}],
  'status': 'unofficial'}
 $ pmaint sync cynede
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dMaggot.html b/dMaggot.html
index e31e7d9ecdd9..74a35b974b64 100644
--- a/dMaggot.html
+++ b/dMaggot.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync dMaggot
 

-            16
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing dMaggot
 

-            31
*** syncing dMaggot
+            31
*** synced dMaggot
 

-            32
*** synced dMaggot
+            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 1 dMaggot
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dMaggot
-

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

 
         
diff --git a/dMaggot.txt b/dMaggot.txt
index b2ac53244516..095627d5082a 100644
--- a/dMaggot.txt
+++ b/dMaggot.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/dMaggot.git'}],
  'status': 'unofficial'}
 $ pmaint sync dMaggot
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/darkelf.html b/darkelf.html
index d91f25c948c4..e77dccaa4202 100644
--- a/darkelf.html
+++ b/darkelf.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync darkelf
 

-            14
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing darkelf
 

-            29
*** syncing darkelf
+            29
*** synced darkelf
 

-            30
*** synced darkelf
+            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 1 darkelf
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 darkelf
-

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

 
         
diff --git a/darkelf.txt b/darkelf.txt
index 7f2f177bce79..5e0ebbec102e 100644
--- a/darkelf.txt
+++ b/darkelf.txt
@@ -11,7 +11,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/darkelf.git'}],
  'status': 'unofficial'}
 $ pmaint sync darkelf
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/darthgandalf-overlay.html b/darthgandalf-overlay.html
index 082f064d6e80..fce5c05c57e4 100644
--- a/darthgandalf-overlay.html
+++ b/darthgandalf-overlay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync darthgandalf-overlay
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing darthgandalf-overlay
 

-            30
*** syncing darthgandalf-overlay
+            30
*** synced darthgandalf-overlay
 

-            31
*** synced darthgandalf-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 1 darthgandalf-overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 darthgandalf-overlay
-

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

 
         
diff --git a/darthgandalf-overlay.txt b/darthgandalf-overlay.txt
index 11df3d1e8351..9b215a0746dc 100644
--- a/darthgandalf-overlay.txt
+++ b/darthgandalf-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync darthgandalf-overlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/deadbeef-overlay.html b/deadbeef-overlay.html
index b95e7c702cad..10b66df7ed25 100644
--- a/deadbeef-overlay.html
+++ b/deadbeef-overlay.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync deadbeef-overlay
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing deadbeef-overlay
 

-            28
*** syncing deadbeef-overlay
+            28
*** synced deadbeef-overlay
 

-            29
*** synced deadbeef-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 1 deadbeef-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deadbeef-overlay
-

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

 
         
diff --git a/deadbeef-overlay.txt b/deadbeef-overlay.txt
index 4de37589443c..af5fc749480c 100644
--- a/deadbeef-overlay.txt
+++ b/deadbeef-overlay.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/damex/deadbeef-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync deadbeef-overlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/decent-im.html b/decent-im.html
index 170514a9aad1..4fda689eeb2a 100644
--- a/decent-im.html
+++ b/decent-im.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync decent-im
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing decent-im
 

-            30
*** syncing decent-im
+            30
*** synced decent-im
 

-            31
*** synced decent-im
+            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 1 decent-im
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 decent-im
-

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

 
         
diff --git a/decent-im.txt b/decent-im.txt
index 7de52a1a504c..62ce4ea7b37a 100644
--- a/decent-im.txt
+++ b/decent-im.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/decent-im/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync decent-im
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/deepin.html b/deepin.html
index 5c5053fe77aa..2cf4efe08ad5 100644
--- a/deepin.html
+++ b/deepin.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync deepin
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing deepin
 

-            28
*** syncing deepin
+            28
*** synced deepin
 

-            29
*** synced deepin
+            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 1 deepin
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deepin
-

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

 
         
diff --git a/deepin.txt b/deepin.txt
index b5ad232d8c71..fe5e6db13fe0 100644
--- a/deepin.txt
+++ b/deepin.txt
@@ -10,7 +10,6 @@
              'uri': 'git://github.com/zhtengw/deepin-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync deepin
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/defiance.html b/defiance.html
index 244ae912e26c..a95932d59824 100644
--- a/defiance.html
+++ b/defiance.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync defiance
 

-            14
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing defiance
 

-            29
*** syncing defiance
+            29
*** synced defiance
 

-            30
*** synced defiance
+            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 1 defiance
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 defiance
-

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

 
         
diff --git a/defiance.txt b/defiance.txt
index 1bede1cdfa88..634fa9d70331 100644
--- a/defiance.txt
+++ b/defiance.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:d3fy/defiance-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync defiance
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/delicious-absurdities.html b/delicious-absurdities.html
index 2c4511f6e10c..8c6dbafb040a 100644
--- a/delicious-absurdities.html
+++ b/delicious-absurdities.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync delicious-absurdities
 

-            17
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing delicious-absurdities
 

-            32
*** syncing delicious-absurdities
+            32
*** synced delicious-absurdities
 

-            33
*** synced delicious-absurdities
+            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 1 delicious-absurdities
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 delicious-absurdities
-

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

 
         
diff --git a/delicious-absurdities.txt b/delicious-absurdities.txt
index 8ed559ee4b1e..6c8f96398355 100644
--- a/delicious-absurdities.txt
+++ b/delicious-absurdities.txt
@@ -14,7 +14,6 @@
              'uri': 'git@github.com:paraenggu/delicious-absurdities-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync delicious-absurdities
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/deter.html b/deter.html
index 650dbd74bf20..0e4fd46ef9f6 100644
--- a/deter.html
+++ b/deter.html
@@ -36,51 +36,49 @@
 

             13
$ pmaint sync deter
 

-            14
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing deter
 

-            29
*** syncing deter
+            29
*** synced deter
 

-            30
*** synced deter
+            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 1 deter
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deter
-

-            35
 * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
+            34
 * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
 
[FATAL]
-            36
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
diff --git a/deter.txt b/deter.txt
index 3ae9057387dc..59486ffd6a37 100644
--- a/deter.txt
+++ b/deter.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:deterenkelt/deter.git'}],
  'status': 'unofficial'}
 $ pmaint sync deter
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dev1990-overlay.html b/dev1990-overlay.html
index 0519a7ab8d2a..837ff7b6079b 100644
--- a/dev1990-overlay.html
+++ b/dev1990-overlay.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync dev1990-overlay
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing dev1990-overlay
 

-            28
*** syncing dev1990-overlay
+            28
*** synced dev1990-overlay
 

-            29
*** synced dev1990-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 1 dev1990-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dev1990-overlay
-

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

 
         
diff --git a/dev1990-overlay.txt b/dev1990-overlay.txt
index 469768cdbc0e..abc538165167 100644
--- a/dev1990-overlay.txt
+++ b/dev1990-overlay.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/dev-0x7C6/dev1990-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dev1990-overlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/devpump-gor.html b/devpump-gor.html
index 385b0215e615..1c1256f39216 100644
--- a/devpump-gor.html
+++ b/devpump-gor.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync devpump-gor
 

-            12
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing devpump-gor
 

-            27
*** syncing devpump-gor
+            27
*** synced devpump-gor
 

-            28
*** synced devpump-gor
+            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 1 devpump-gor
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 devpump-gor
-

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

 
         
diff --git a/devpump-gor.txt b/devpump-gor.txt
index bfc9a9f035b4..a2e0d37545b8 100644
--- a/devpump-gor.txt
+++ b/devpump-gor.txt
@@ -9,7 +9,6 @@
              'uri': 'https://github.com/DevPump/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync devpump-gor
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/didactic-duck.html b/didactic-duck.html
index 27e59a917749..9a6f9268fe8a 100644
--- a/didactic-duck.html
+++ b/didactic-duck.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync didactic-duck
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing didactic-duck
 

-            28
*** syncing didactic-duck
+            28
*** synced didactic-duck
 

-            29
*** synced didactic-duck
+            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 1 didactic-duck
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 didactic-duck
-

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

 
         
diff --git a/didactic-duck.txt b/didactic-duck.txt
index 674a2093099b..333ca7466e83 100644
--- a/didactic-duck.txt
+++ b/didactic-duck.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/lucianposton/didactic-duck.git'}],
  'status': 'unofficial'}
 $ pmaint sync didactic-duck
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dilfridge.html b/dilfridge.html
index b8671ec38559..c9245b7075cb 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync dilfridge
 

-            18
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing dilfridge
 

-            33
*** syncing dilfridge
+            33
*** synced dilfridge
 

-            34
*** synced dilfridge
+            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 1 dilfridge
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
-

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

 
         
diff --git a/dilfridge.txt b/dilfridge.txt
index 3fc44bb895f4..f0834ba70225 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/dilfridge.git'}],
  'status': 'official'}
 $ pmaint sync dilfridge
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/displacer.html b/displacer.html
index f5a65ca3d10a..dbede2a977ba 100644
--- a/displacer.html
+++ b/displacer.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync displacer
 

-            17
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing displacer
 

-            32
*** syncing displacer
+            32
*** synced displacer
 

-            33
*** synced displacer
+            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 1 displacer
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 displacer
-

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

 
         
diff --git a/displacer.txt b/displacer.txt
index 16de8a028348..77e026527810 100644
--- a/displacer.txt
+++ b/displacer.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/displacer.git'}],
  'status': 'unofficial'}
 $ pmaint sync displacer
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/distros.html b/distros.html
index 72d39d86a7fe..8561bce50036 100644
--- a/distros.html
+++ b/distros.html
@@ -28,49 +28,47 @@
 

             9
$ pmaint sync distros
 

-            10
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            13
commands sometime before your next pull:
+            13
 

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

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

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

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

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

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

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

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

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

-            24
Already up to date.
+            24
*** syncing distros
 

-            25
*** syncing distros
+            25
*** synced distros
 

-            26
*** synced distros
+            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 1 distros
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 distros
-

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

 
         
diff --git a/distros.txt b/distros.txt
index 21c792e55f53..8f378df4fb06 100644
--- a/distros.txt
+++ b/distros.txt
@@ -7,7 +7,6 @@
              'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync distros
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/djc.html b/djc.html
index 41ba64b78b34..817f6b2b2fa7 100644
--- a/djc.html
+++ b/djc.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync djc
 

-            14
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing djc
 

-            29
*** syncing djc
+            29
*** synced djc
 

-            30
*** synced djc
+            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 1 djc
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 djc
-

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

 
         
diff --git a/djc.txt b/djc.txt
index d61015556cea..984c64400bd5 100644
--- a/djc.txt
+++ b/djc.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync djc
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dlang.html b/dlang.html
index 5a5161d78567..7b4ba26033aa 100644
--- a/dlang.html
+++ b/dlang.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync dlang
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing dlang
 

-            28
*** syncing dlang
+            28
*** synced dlang
 

-            29
*** synced dlang
+            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 1 dlang
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dlang
-

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

 
         
diff --git a/dlang.txt b/dlang.txt
index 3d9acbc5dc2a..a51eae08a300 100644
--- a/dlang.txt
+++ b/dlang.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}],
  'status': 'unofficial'}
 $ pmaint sync dlang
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dmchurch.html b/dmchurch.html
index dc4bb209ab29..0d11dc8a45d2 100644
--- a/dmchurch.html
+++ b/dmchurch.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync dmchurch
 

-            17
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing dmchurch
 

-            32
*** syncing dmchurch
+            32
*** synced dmchurch
 

-            33
*** synced dmchurch
+            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 1 dmchurch
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dmchurch
-

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

 
         
diff --git a/dmchurch.txt b/dmchurch.txt
index 030ac680cf33..40079bdc2f4e 100644
--- a/dmchurch.txt
+++ b/dmchurch.txt
@@ -14,7 +14,6 @@
              'uri': 'git@github.com:dmchurch/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dmchurch
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/docker.html b/docker.html
index 190fd9d76417..1faba69b9ea9 100644
--- a/docker.html
+++ b/docker.html
@@ -40,83 +40,81 @@
 

             15
$ pmaint sync docker
 

-            16
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing docker
 

-            31
*** syncing docker
+            31
*** synced docker
 

-            32
*** synced docker
+            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 1 docker
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 docker
-

-            37
 * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            36
 * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            38
 * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
 * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            39
 * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            40
 * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            41
 * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            42
 * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            43
 * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            44
 * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            45
 * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            46
 * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            47
 * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            46
 * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            48
 * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            47
 * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            49
 * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            48
 * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            50
 * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            49
 * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            51
 * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            50
 * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            52
 * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            51
 * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            53
 * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            52
 * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            54
 * Cache regen failed with 1
+            53
 * Cache regen failed with 1
 

 
         
diff --git a/docker.txt b/docker.txt
index d71f84534bdd..691379aa1d2e 100644
--- a/docker.txt
+++ b/docker.txt
@@ -13,7 +13,6 @@
             {'type': 'git', 'uri': 'git@github.com:tianon/docker-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync docker
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dotnet.html b/dotnet.html
index 1f405d89adf4..2f5e230e6024 100644
--- a/dotnet.html
+++ b/dotnet.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync dotnet
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing dotnet
 

-            28
*** syncing dotnet
+            28
*** synced dotnet
 

-            29
*** synced dotnet
+            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 1 dotnet
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dotnet
-

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

 
         
diff --git a/dotnet.txt b/dotnet.txt
index 8de685d4ccac..56d6fb059d44 100644
--- a/dotnet.txt
+++ b/dotnet.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git@github.com:gentoo/dotnet.git'}],
  'status': 'official'}
 $ pmaint sync dotnet
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/drdim.html b/drdim.html
index 0b5690ba9156..59448fb592db 100644
--- a/drdim.html
+++ b/drdim.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync drdim
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing drdim
 

-            30
*** syncing drdim
+            30
*** synced drdim
 

-            31
*** synced drdim
+            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 1 drdim
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 drdim
-

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

 
         
diff --git a/drdim.txt b/drdim.txt
index f037346c3d01..583ca29f5343 100644
--- a/drdim.txt
+++ b/drdim.txt
@@ -12,7 +12,6 @@
             {'type': 'git', 'uri': 'git@github.com:drdim/layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync drdim
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dwfreed.html b/dwfreed.html
index c7d311adf2fc..40d1ed0c3c0d 100644
--- a/dwfreed.html
+++ b/dwfreed.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync dwfreed
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing dwfreed
 

-            28
*** syncing dwfreed
+            28
*** synced dwfreed
 

-            29
*** synced dwfreed
+            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 1 dwfreed
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dwfreed
-

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

 
         
diff --git a/dwfreed.txt b/dwfreed.txt
index 517df04cc383..0966c718b132 100644
--- a/dwfreed.txt
+++ b/dwfreed.txt
@@ -10,7 +10,6 @@
              'uri': 'https://bitbucket.org/dwfreed/dwfreed.gentoo'}],
  'status': 'unofficial'}
 $ pmaint sync dwfreed
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dwosky.html b/dwosky.html
index 9a5f5621a9c0..dc0016a0edbf 100644
--- a/dwosky.html
+++ b/dwosky.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync dwosky
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing dwosky
 

-            30
*** syncing dwosky
+            30
*** synced dwosky
 

-            31
*** synced dwosky
+            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 1 dwosky
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dwosky
-

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

 
         
diff --git a/dwosky.txt b/dwosky.txt
index 39e5b7ed73c4..a1a7ae936c19 100644
--- a/dwosky.txt
+++ b/dwosky.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/Dwosky/Dwosky-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dwosky
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/earshark.html b/earshark.html
index 52f6c8b1a0d0..d8ebeb13c40b 100644
--- a/earshark.html
+++ b/earshark.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync earshark
 

-            13
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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
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
*** syncing earshark
 

-            28
*** syncing earshark
+            28
*** synced earshark
 

-            29
*** synced earshark
+            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 1 earshark
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 earshark
-

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

 
         
diff --git a/earshark.txt b/earshark.txt
index 32c4baf0b873..5186b9d97b7d 100644
--- a/earshark.txt
+++ b/earshark.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git://github.com/Chemrat/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync earshark
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/eclipse.html b/eclipse.html
index 666cc6802d49..c49af4fc7c2f 100644
--- a/eclipse.html
+++ b/eclipse.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync eclipse
 

-            17
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing eclipse
 

-            32
*** syncing eclipse
+            32
*** synced eclipse
 

-            33
*** synced eclipse
+            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 1 eclipse
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eclipse
-

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

 
         
diff --git a/eclipse.txt b/eclipse.txt
index fe6626fa0ffc..bd8c8da9c134 100644
--- a/eclipse.txt
+++ b/eclipse.txt
@@ -14,7 +14,6 @@
              'uri': 'git@github.com:gentoo/eclipse-overlay.git'}],
  'status': 'official'}
 $ pmaint sync eclipse
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/edgets.html b/edgets.html
index 21bedb6d9e4d..7c28c8168da4 100644
--- a/edgets.html
+++ b/edgets.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync edgets
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing edgets
 

-            30
*** syncing edgets
+            30
*** synced edgets
 

-            31
*** synced edgets
+            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 1 edgets
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 edgets
-

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

 
         
diff --git a/edgets.txt b/edgets.txt
index 5c43052031bc..78dcadb6a053 100644
--- a/edgets.txt
+++ b/edgets.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/BlueManCZ/edgets.git'}],
  'status': 'unofficial'}
 $ pmaint sync edgets
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/eigenlay.html b/eigenlay.html
index 9949c764e769..ee3ed740d175 100644
--- a/eigenlay.html
+++ b/eigenlay.html
@@ -30,49 +30,47 @@
 

             10
$ pmaint sync eigenlay
 

-            11
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing eigenlay
 

-            26
*** syncing eigenlay
+            26
*** synced eigenlay
 

-            27
*** synced eigenlay
+            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 1 eigenlay
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eigenlay
-

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

 
         
diff --git a/eigenlay.txt b/eigenlay.txt
index c4a6452384f4..bffc533deb4d 100644
--- a/eigenlay.txt
+++ b/eigenlay.txt
@@ -8,7 +8,6 @@
  'source': [{'type': 'git', 'uri': 'https://gitlab.com/eigennet/eigenlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync eigenlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/einflay.html b/einflay.html
index 44a27456fe4d..20e1355d5f2b 100644
--- a/einflay.html
+++ b/einflay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync einflay
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing einflay
 

-            30
*** syncing einflay
+            30
*** synced einflay
 

-            31
*** synced einflay
+            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 1 einflay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 einflay
-

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

 
         
diff --git a/einflay.txt b/einflay.txt
index 4ddb64c9577e..064bec280e5d 100644
--- a/einflay.txt
+++ b/einflay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/EinstokFair/einflay.git'}],
  'status': 'unofficial'}
 $ pmaint sync einflay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/ejabberd.html b/ejabberd.html
index 6506fa148da3..7c0bd9cf8c3c 100644
--- a/ejabberd.html
+++ b/ejabberd.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync ejabberd
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing ejabberd
 

-            30
*** syncing ejabberd
+            30
*** synced ejabberd
 

-            31
*** synced ejabberd
+            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 1 ejabberd
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ejabberd
-

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

 
         
diff --git a/ejabberd.txt b/ejabberd.txt
index ff8edfbe5fa0..33b0330525ac 100644
--- a/ejabberd.txt
+++ b/ejabberd.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ejabberd
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/elementary.html b/elementary.html
index afd914769676..52610d0efeb1 100644
--- a/elementary.html
+++ b/elementary.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync elementary
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing elementary
 

-            30
*** syncing elementary
+            30
*** synced elementary
 

-            31
*** synced elementary
+            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 1 elementary
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 elementary
-

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

 
         
diff --git a/elementary.txt b/elementary.txt
index 29780b4ff88c..a46f2268f372 100644
--- a/elementary.txt
+++ b/elementary.txt
@@ -12,7 +12,6 @@
              'uri': 'git://github.com/pimvullers/elementary.git'}],
  'status': 'unofficial'}
 $ pmaint sync elementary
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/elopez-r-overlay.html b/elopez-r-overlay.html
index 96cc7a57a0f4..c43fb649127d 100644
--- a/elopez-r-overlay.html
+++ b/elopez-r-overlay.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync elopez-r-overlay
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing elopez-r-overlay
 

-            30
*** syncing elopez-r-overlay
+            30
*** synced elopez-r-overlay
 

-            31
*** synced elopez-r-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 1 elopez-r-overlay
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 elopez-r-overlay
-

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

 
         
diff --git a/elopez-r-overlay.txt b/elopez-r-overlay.txt
index 6684fe31d98c..dac4be66ce03 100644
--- a/elopez-r-overlay.txt
+++ b/elopez-r-overlay.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync elopez-r-overlay
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/emacs.html b/emacs.html
index 159078dd6d13..509b52af368b 100644
--- a/emacs.html
+++ b/emacs.html
@@ -48,49 +48,47 @@
 

             19
$ pmaint sync emacs
 

-            20
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing emacs
 

-            35
*** syncing emacs
+            35
*** synced emacs
 

-            36
*** synced emacs
+            36
 * Sync succeeded
 

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

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

-            39
$ git show -q --pretty=format:%G? HEAD
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 emacs
 

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 emacs
-

-            41
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/emacs.txt b/emacs.txt
index 1dd22e480bae..5a28747499b0 100644
--- a/emacs.txt
+++ b/emacs.txt
@@ -17,7 +17,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/emacs.git'}],
  'status': 'official'}
 $ pmaint sync emacs
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/enlightenment-live.html b/enlightenment-live.html
index 880688617f1a..5e6c92e6bf38 100644
--- a/enlightenment-live.html
+++ b/enlightenment-live.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync enlightenment-live
 

-            14
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing enlightenment-live
 

-            29
*** syncing enlightenment-live
+            29
*** synced enlightenment-live
 

-            30
*** synced enlightenment-live
+            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 1 enlightenment-live
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 enlightenment-live
-

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

 
         
diff --git a/enlightenment-live.txt b/enlightenment-live.txt
index 433148e90e74..d84ad363d500 100644
--- a/enlightenment-live.txt
+++ b/enlightenment-live.txt
@@ -11,7 +11,6 @@
              'uri': 'https://github.com/rafspiny/enlightenment-live.git'}],
  'status': 'unofficial'}
 $ pmaint sync enlightenment-live
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/ennui.html b/ennui.html
index 843c27627663..a802fb8b1348 100644
--- a/ennui.html
+++ b/ennui.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync ennui
 

-            16
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing ennui
 

-            31
*** syncing ennui
+            31
*** synced ennui
 

-            32
*** synced ennui
+            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 1 ennui
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ennui
-

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

 
         
diff --git a/ennui.txt b/ennui.txt
index 267415d6fb51..e91538d0c6d7 100644
--- a/ennui.txt
+++ b/ennui.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/ennui.git'}],
  'status': 'unofficial'}
 $ pmaint sync ennui
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/equaeghe.html b/equaeghe.html
index da4a36a311ea..ab5bfea3db27 100644
--- a/equaeghe.html
+++ b/equaeghe.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync equaeghe
 

-            15
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing equaeghe
 

-            30
*** syncing equaeghe
+            30
*** synced equaeghe
 

-            31
*** synced equaeghe
+            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 1 equaeghe
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 equaeghe
-

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

 
         
diff --git a/equaeghe.txt b/equaeghe.txt
index 4e6af53775ad..d7cfed390ba6 100644
--- a/equaeghe.txt
+++ b/equaeghe.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/equaeghe/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync equaeghe
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/erayd.html b/erayd.html
index f7b7155ed0d7..18343d87daf4 100644
--- a/erayd.html
+++ b/erayd.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync erayd
 

-            14
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing erayd
 

-            29
*** syncing erayd
+            29
*** synced erayd
 

-            30
*** synced erayd
+            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 1 erayd
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 erayd
-

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

 
         
diff --git a/erayd.txt b/erayd.txt
index 4f12a39ce246..c20f84a0de6f 100644
--- a/erayd.txt
+++ b/erayd.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:erayd/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync erayd
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/ethereum.html b/ethereum.html
index 3c889141c8b5..d1247f0a6dc6 100644
--- a/ethereum.html
+++ b/ethereum.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync ethereum
 

-            16
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing ethereum
 

-            31
*** syncing ethereum
+            31
*** synced ethereum
 

-            32
*** synced ethereum
+            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 1 ethereum
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ethereum
-

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

 
         
diff --git a/ethereum.txt b/ethereum.txt
index 3e1e30bc8301..b9515bd13665 100644
--- a/ethereum.txt
+++ b/ethereum.txt
@@ -13,7 +13,6 @@
              'uri': 'git@github.com:coolparadox/ethereum-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ethereum
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/flow.html b/flow.html
index 861f75a28729..859ce58ad97e 100644
--- a/flow.html
+++ b/flow.html
@@ -30,25 +30,49 @@
 

             10
 'status': 'unofficial'}
 

-            11
 * Adding new repository
+            11
$ pmaint sync flow
 

-            12
$ pmaint sync flow
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
Cloning into '/var/lib/repo-mirror-ci/sync/flow'...
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
*** syncing flow
+            14
commands sometime before your next pull:
 

-            15
*** synced flow
+            15
 

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

-            17
$ git log --format=%ci -1
+            17
  git config pull.rebase true   # rebase
 

-            18
$ git show -q --pretty=format:%G? HEAD
+            18
  git config pull.ff only       # fast-forward only
 

-            19
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flow
+            19
 

-            20
 * Cache regenerated successfully
+            20
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
or --ff-only on the command line to override the configured default per
+

+            23
invocation.
+

+            24
+

+            25
Already up to date.
+

+            26
*** syncing flow
+

+            27
*** synced flow
+

+            28
 * Sync succeeded
+

+            29
$ git log --format=%ci -1
+

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

+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flow
+

+            32
 * Cache regenerated successfully
 

 
         
diff --git a/flow.txt b/flow.txt
index badb6fb7b361..cc30eb4f5183 100644
--- a/flow.txt
+++ b/flow.txt
@@ -8,9 +8,21 @@
  'source': [{'type': 'git',
              'uri': 'https://gitlab.com/Flow/flow-s-ebuilds.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync flow
-Cloning into '/var/lib/repo-mirror-ci/sync/flow'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+  git config pull.rebase false  # merge (the default strategy)
+  git config pull.rebase true   # rebase
+  git config pull.ff only       # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+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.
+
+Already up to date.
 *** syncing flow
 *** synced flow
  * Sync succeeded
diff --git a/fusion809.html b/fusion809.html
index bdc2cfa2e089..c428ad18322a 100644
--- a/fusion809.html
+++ b/fusion809.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync fusion809
 

-            15
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing fusion809
 

-            30
*** syncing fusion809
+            30
*** synced fusion809
 

-            31
*** synced fusion809
+            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 1 fusion809
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fusion809
-

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

 
         
diff --git a/fusion809.txt b/fusion809.txt
index a330d41755c9..eef3b663b7a8 100644
--- a/fusion809.txt
+++ b/fusion809.txt
@@ -12,7 +12,6 @@
              'uri': 'git://github.com/fusion809/fusion809-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fusion809
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/fuverlay.html b/fuverlay.html
index 7d1d51baf8df..50eff27f6f27 100644
--- a/fuverlay.html
+++ b/fuverlay.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync fuverlay
 

-            12
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing fuverlay
 

-            27
*** syncing fuverlay
+            27
*** synced fuverlay
 

-            28
*** synced fuverlay
+            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 1 fuverlay
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fuverlay
-

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

 
         
diff --git a/fuverlay.txt b/fuverlay.txt
index 9a4d74226368..c45e80c3a4f4 100644
--- a/fuverlay.txt
+++ b/fuverlay.txt
@@ -9,7 +9,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/funkill/fuverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fuverlay
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gamarouns.html b/gamarouns.html
index d4f20cb0f40d..87ceb5c37bfe 100644
--- a/gamarouns.html
+++ b/gamarouns.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync gamarouns
 

-            12
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gamarouns
 

-            27
*** syncing gamarouns
+            27
*** synced gamarouns
 

-            28
*** synced gamarouns
+            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 1 gamarouns
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamarouns
-

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

 
         
diff --git a/gamarouns.txt b/gamarouns.txt
index 2258b0e00f21..b9658e044181 100644
--- a/gamarouns.txt
+++ b/gamarouns.txt
@@ -9,7 +9,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/Amaroun/gamarouns.git'}],
  'status': 'unofficial'}
 $ pmaint sync gamarouns
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gambas-overlay.html b/gambas-overlay.html
index ac0895e03519..39e6525b2456 100644
--- a/gambas-overlay.html
+++ b/gambas-overlay.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync gambas-overlay
 

-            13
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', 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
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
*** syncing gambas-overlay
 

-            28
*** syncing gambas-overlay
+            28
*** synced gambas-overlay
 

-            29
*** synced gambas-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 1 gambas-overlay
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gambas-overlay
-

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

 
         
diff --git a/gambas-overlay.txt b/gambas-overlay.txt
index b6c33361f4f3..bd3cb9892bc7 100644
--- a/gambas-overlay.txt
+++ b/gambas-overlay.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/damex/gambas-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gambas-overlay
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gamerlay.html b/gamerlay.html
index bd94febf27ea..3a6f8ff75dc5 100644
--- a/gamerlay.html
+++ b/gamerlay.html
@@ -48,49 +48,47 @@
 

             19
$ pmaint sync gamerlay
 

-            20
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gamerlay
 

-            35
*** syncing gamerlay
+            35
*** synced gamerlay
 

-            36
*** synced gamerlay
+            36
 * Sync succeeded
 

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

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

-            39
$ git show -q --pretty=format:%G? HEAD
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamerlay
 

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamerlay
-

-            41
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/gamerlay.txt b/gamerlay.txt
index 3b8203344e30..2ad3afafaa34 100644
--- a/gamerlay.txt
+++ b/gamerlay.txt
@@ -17,7 +17,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/gamerlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gamerlay
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gcarq.html b/gcarq.html
index 18a880360827..5f390263c806 100644
--- a/gcarq.html
+++ b/gcarq.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync gcarq
 

-            15
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gcarq
 

-            30
*** syncing gcarq
+            30
*** synced gcarq
 

-            31
*** synced gcarq
+            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 1 gcarq
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gcarq
-

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

 
         
diff --git a/gcarq.txt b/gcarq.txt
index c29b30002ab3..a1dc50bd3f9f 100644
--- a/gcarq.txt
+++ b/gcarq.txt
@@ -12,7 +12,6 @@
              'uri': 'git+ssh://git@github.com/gcarq/gcarq-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gcarq
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/genthree.html b/genthree.html
index 7b79b9b190ee..8927014c24f1 100644
--- a/genthree.html
+++ b/genthree.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync genthree
 

-            12
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing genthree
 

-            27
*** syncing genthree
+            27
*** synced genthree
 

-            28
*** synced genthree
+            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 1 genthree
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 genthree
-

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

 
         
diff --git a/genthree.txt b/genthree.txt
index 845da47e84d4..4ba707179aff 100644
--- a/genthree.txt
+++ b/genthree.txt
@@ -9,7 +9,6 @@
  'source': [{'type': 'git', 'uri': 'https://gitlab.com/genthree/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync genthree
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo-clang.html b/gentoo-clang.html
index 280ac1890c63..ff277082e4dd 100644
--- a/gentoo-clang.html
+++ b/gentoo-clang.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync gentoo-clang
 

-            16
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gentoo-clang
 

-            31
*** syncing gentoo-clang
+            31
*** synced gentoo-clang
 

-            32
*** synced gentoo-clang
+            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 1 gentoo-clang
 

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

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

 
         
diff --git a/gentoo-clang.txt b/gentoo-clang.txt
index 9ddbee4df32e..36f3a6012ea3 100644
--- a/gentoo-clang.txt
+++ b/gentoo-clang.txt
@@ -13,7 +13,6 @@
             {'type': 'git', 'uri': 'git@github.com:BilyakA/gentoo-clang.git'}],
  'status': 'unofficial'}
 $ pmaint sync gentoo-clang
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo-mate.html b/gentoo-mate.html
index 4e78c0669e91..c380d0f6354d 100644
--- a/gentoo-mate.html
+++ b/gentoo-mate.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync gentoo-mate
 

-            17
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gentoo-mate
 

-            32
*** syncing gentoo-mate
+            32
*** synced gentoo-mate
 

-            33
*** synced gentoo-mate
+            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 1 gentoo-mate
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-mate
-

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

 
         
diff --git a/gentoo-mate.txt b/gentoo-mate.txt
index cf7af17a7dad..c335c71e0101 100644
--- a/gentoo-mate.txt
+++ b/gentoo-mate.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/gentoo-mate.git'}],
  'status': 'official'}
 $ pmaint sync gentoo-mate
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo-playground.html b/gentoo-playground.html
index 4c8ab3840378..d177a7ca31e7 100644
--- a/gentoo-playground.html
+++ b/gentoo-playground.html
@@ -44,55 +44,53 @@
 

             17
$ pmaint sync gentoo-playground
 

-            18
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gentoo-playground
 

-            33
*** syncing gentoo-playground
+            33
*** synced gentoo-playground
 

-            34
*** synced gentoo-playground
+            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 1 gentoo-playground
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-playground
-

-            39
 * app-arch/xz-utils-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * app-arch/xz-utils-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            40
 * games-strategy/ufo-ai-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * games-strategy/ufo-ai-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            41
 * x11-themes/e-gtk-theme-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * x11-themes/e-gtk-theme-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            42
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
diff --git a/gentoo-playground.txt b/gentoo-playground.txt
index 3bd877468959..c8d82520f0bc 100644
--- a/gentoo-playground.txt
+++ b/gentoo-playground.txt
@@ -15,7 +15,6 @@
              'uri': 'git@github.com:sjnewbury/gentoo-playground.git'}],
  'status': 'unofficial'}
 $ pmaint sync gentoo-playground
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo-zh.html b/gentoo-zh.html
index 4dde11de204d..642024c3cdbb 100644
--- a/gentoo-zh.html
+++ b/gentoo-zh.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync gentoo-zh
 

-            12
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gentoo-zh
 

-            27
*** syncing gentoo-zh
+            27
*** synced gentoo-zh
 

-            28
*** synced gentoo-zh
+            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 1 gentoo-zh
 

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

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

 
         
diff --git a/gentoo-zh.txt b/gentoo-zh.txt
index 95712f3802a2..9c2507f6e52e 100644
--- a/gentoo-zh.txt
+++ b/gentoo-zh.txt
@@ -9,7 +9,6 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/microcai/gentoo-zh.git'}],
  'status': 'unofficial'}
 $ pmaint sync gentoo-zh
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo.html b/gentoo.html
index 66b5c596e8d6..6255f3b5617b 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -38,51 +38,47 @@
 

             14
$ pmaint sync gentoo
 

-            15
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
commands sometime before your next pull:
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
 

-            19
commands sometime before your next pull:
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
+            20
  git config pull.rebase true   # rebase
 

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

-            22
  git config pull.rebase true   # rebase
+            22
 

-            23
  git config pull.ff only       # fast-forward only
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
or --ff-only on the command line to override the configured default per
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
invocation.
 

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

-            28
invocation.
+            28
Already up to date.
 

-            29
+            29
*** syncing gentoo
 

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

-            31
*** syncing gentoo
+            31
 * Sync succeeded
 

-            32
*** synced gentoo
+            32
$ git log --format=%ci -1
 

-            33
 * Sync succeeded
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
$ git log --format=%ci -1
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
 

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

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

-            37
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/gentoo.txt b/gentoo.txt
index a2863f07fa05..106eb8ffaef8 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,8 +12,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
  'status': 'official'}
 $ pmaint sync gentoo
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gerislay.html b/gerislay.html
index c1adbb198e06..629082883819 100644
--- a/gerislay.html
+++ b/gerislay.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync gerislay
 

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

-            33
*** syncing gerislay
+            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 1 gerislay
 

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

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

 
         
diff --git a/gerislay.txt b/gerislay.txt
index 318c346ccd30..e4b41b678217 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gig.html b/gig.html
index b876a26dfbc4..588b2cbb47ae 100644
--- a/gig.html
+++ b/gig.html
@@ -28,49 +28,47 @@
 

             9
$ pmaint sync gig
 

-            10
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            13
commands sometime before your next pull:
+            13
 

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

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

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

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

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

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

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

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

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

-            24
Already up to date.
+            24
*** syncing gig
 

-            25
*** syncing gig
+            25
*** synced gig
 

-            26
*** synced gig
+            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 1 gig
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gig
-

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

 
         
diff --git a/gig.txt b/gig.txt
index 2aa2d122bd42..39a3790b4311 100644
--- a/gig.txt
+++ b/gig.txt
@@ -7,7 +7,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/Gig-OS/gig.git'}],
  'status': 'unofficial'}
 $ pmaint sync gig
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gitlab.html b/gitlab.html
index 9239b8557caf..7668f4f4c0ca 100644
--- a/gitlab.html
+++ b/gitlab.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync gitlab
 

-            12
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gitlab
 

-            27
*** syncing gitlab
+            27
*** synced gitlab
 

-            28
*** synced gitlab
+            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 1 gitlab
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gitlab
-

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

 
         
diff --git a/gitlab.txt b/gitlab.txt
index 7b6b5f1c4731..6e8aed52fbf4 100644
--- a/gitlab.txt
+++ b/gitlab.txt
@@ -9,7 +9,6 @@
              'uri': 'https://gitlab.awesome-it.de/overlays/gitlab.git'}],
  'status': 'unofficial'}
 $ pmaint sync gitlab
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/glarbs-overlay.html b/glarbs-overlay.html
index e56298595e68..0f4e371862ff 100644
--- a/glarbs-overlay.html
+++ b/glarbs-overlay.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync glarbs-overlay
 

-            14
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing glarbs-overlay
 

-            29
*** syncing glarbs-overlay
+            29
*** synced glarbs-overlay
 

-            30
*** synced glarbs-overlay
+            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 1 glarbs-overlay
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 glarbs-overlay
-

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

 
         
diff --git a/glarbs-overlay.txt b/glarbs-overlay.txt
index 62ba82e78831..ad22c6b49dee 100644
--- a/glarbs-overlay.txt
+++ b/glarbs-overlay.txt
@@ -11,7 +11,6 @@
              'uri': 'https://gitlab.com/et-8/glarbs-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync glarbs-overlay
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/glicOne.html b/glicOne.html
index 7b3ac3336b06..3b0dfb9e9d78 100644
--- a/glicOne.html
+++ b/glicOne.html
@@ -38,57 +38,55 @@
 

             14
$ pmaint sync glicOne
 

-            15
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing glicOne
 

-            30
*** syncing glicOne
+            30
*** synced glicOne
 

-            31
*** synced glicOne
+            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 1 glicOne
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 glicOne
-

-            36
 * dev-python/phply-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            35
 * dev-python/phply-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            37
 * dev-ruby/hashicorp-checkpoint-0.1.5: failed parsing REQUIRED_USE: '|| ( )' is unparseable
+            36
 * dev-ruby/hashicorp-checkpoint-0.1.5: failed parsing REQUIRED_USE: '|| ( )' is unparseable
 
[FATAL]
-            38
 * net-analyzer/whatweb-0.4.9: failed parsing REQUIRED_USE: '|| ( )' is unparseable
+            37
 * net-analyzer/whatweb-0.4.9: failed parsing REQUIRED_USE: '|| ( )' is unparseable
 
[FATAL]
-            39
 * x11-libs/bamf-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            38
 * x11-libs/bamf-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            40
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/glicOne.txt b/glicOne.txt
index 60682df96f45..8fbe6f57f975 100644
--- a/glicOne.txt
+++ b/glicOne.txt
@@ -12,7 +12,6 @@
              'uri': 'git@gitlab.com:glicOne/glicOne-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync glicOne
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gnome-next.html b/gnome-next.html
index 99281d9f82e1..7018e6dd9f06 100644
--- a/gnome-next.html
+++ b/gnome-next.html
@@ -36,49 +36,47 @@
 

             13
$ pmaint sync gnome-next
 

-            14
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gnome-next
 

-            29
*** syncing gnome-next
+            29
*** synced gnome-next
 

-            30
*** synced gnome-next
+            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 1 gnome-next
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnome-next
-

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

 
         
diff --git a/gnome-next.txt b/gnome-next.txt
index 068ebb1254e5..b63cda98e534 100644
--- a/gnome-next.txt
+++ b/gnome-next.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:Heather/gentoo-gnome.git'}],
  'status': 'unofficial'}
 $ pmaint sync gnome-next
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gnome.html b/gnome.html
index 2d25bd8e57a6..f54f8240f345 100644
--- a/gnome.html
+++ b/gnome.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync gnome
 

-            16
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing gnome
 

-            31
*** syncing gnome
+            31
*** synced gnome
 

-            32
*** synced gnome
+            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 1 gnome
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnome
-

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

 
         
diff --git a/gnome.txt b/gnome.txt
index c6bad18f7a11..a8800c4b313c 100644
--- a/gnome.txt
+++ b/gnome.txt
@@ -13,7 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/gnome.git'}],
  'status': 'official'}
 $ pmaint sync gnome
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gnuradio.html b/gnuradio.html
index 5e4000ea1351..b42210f19856 100644
--- a/gnuradio.html
+++ b/gnuradio.html
@@ -30,49 +30,47 @@
 

             10
$ pmaint sync gnuradio
 

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

-            26
*** syncing gnuradio
+            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 1 gnuradio
 

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

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

 
         
diff --git a/gnuradio.txt b/gnuradio.txt
index a56629792f34..da7f9efd45c9 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gnustep.html b/gnustep.html
index 8da3b61982cc..987d1b092207 100644
--- a/gnustep.html
+++ b/gnustep.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync gnustep
 

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

-            30
*** syncing gnustep
+            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 1 gnustep
 

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

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

 
         
diff --git a/gnustep.txt b/gnustep.txt
index f3383180f9e7..8362b4140d27 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gnux32.html b/gnux32.html
index bde61565e5ce..fe84631cd956 100644
--- a/gnux32.html
+++ b/gnux32.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync gnux32
 

-            13
WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', 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
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
*** syncing gnux32
 

-            28
*** syncing gnux32
+            28
*** synced gnux32
 

-            29
*** synced gnux32
+            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 1 gnux32
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnux32
-

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

 
         
diff --git a/gnux32.txt b/gnux32.txt
index 3ceced3e92e4..41058dae024d 100644
--- a/gnux32.txt
+++ b/gnux32.txt
@@ -10,7 +10,6 @@
             {'type': 'git', 'uri': 'git://github.com/1camper/gnux32.git'}],
  'status': 'unofficial'}
 $ pmaint sync gnux32
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/go-overlay.html b/go-overlay.html
index c9fc5ef25d39..99ee0669019c 100644
--- a/go-overlay.html
+++ b/go-overlay.html
@@ -32,49 +32,47 @@
 

             11
$ pmaint sync go-overlay
 

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

-            27
*** syncing go-overlay
+            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 1 go-overlay
 

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

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

 
         
diff --git a/go-overlay.txt b/go-overlay.txt
index d4c305a4a52f..23572a295f4f 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/godin.html b/godin.html
index e82dbfef049a..c334a97d6d03 100644
--- a/godin.html
+++ b/godin.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync godin
 

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

-            30
*** syncing godin
+            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 1 godin
 

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

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

 
         
diff --git a/godin.txt b/godin.txt
index 5207e12a0f3d..96a194bf3355 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/goris.html b/goris.html
index f740a8831be4..4db76f058a98 100644
--- a/goris.html
+++ b/goris.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync goris
 

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

-            32
*** syncing goris
+            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 1 goris
 

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

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

 
         
diff --git a/goris.txt b/goris.txt
index 1ecc5236623e..eb8766f33e5f 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/graaff.html b/graaff.html
index 719952b3f30c..dd766e38c2c9 100644
--- a/graaff.html
+++ b/graaff.html
@@ -44,49 +44,47 @@
 

             17
$ pmaint sync graaff
 

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

-            33
*** syncing graaff
+            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 1 graaff
 

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

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

 
         
diff --git a/graaff.txt b/graaff.txt
index fd6fa81e0137..2f2b261fa897 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/grub2-themes.html b/grub2-themes.html
index b27cec251c22..376acd9e466b 100644
--- a/grub2-themes.html
+++ b/grub2-themes.html
@@ -40,49 +40,47 @@
 

             15
$ pmaint sync grub2-themes
 

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

-            31
*** syncing grub2-themes
+            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 1 grub2-themes
 

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

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

 
         
diff --git a/grub2-themes.txt b/grub2-themes.txt
index 39b9cedab2bd..55d03df9fbdf 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:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/index.html b/index.html
index 1049024939c6..6c57c80b949c 100644
--- a/index.html
+++ b/index.html
@@ -899,7 +899,7 @@
 
         
 
-        
Generated based on results from 2020-10-30 10:34:56 UTC

+        
Generated based on results from 2020-10-30 11:05:00 UTC

     
 
         
\ No newline at end of file
diff --git a/myov.html b/myov.html
index 394d9787bde7..96047613a2d8 100644
--- a/myov.html
+++ b/myov.html
@@ -56,31 +56,21 @@
 

             23
 

-            24
From https://gitlab.com/xgqt/myov
+            24
Already up to date.
 

-            25
   34222be..400bb56  master     -> origin/master
+            25
*** syncing myov
 

-            26
Updating 34222be..400bb56
+            26
*** synced myov
 

-            27
Fast-forward
+            27
 * Sync succeeded
 

-            28
 scripts/prep-commit | 5 +++++
+            28
$ git log --format=%ci -1
 

-            29
 1 file changed, 5 insertions(+)
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
*** syncing myov
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 myov
 

-            31
*** synced myov
-

-            32
 * Sync succeeded
-

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

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

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 myov
-

-            36
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
diff --git a/myov.txt b/myov.txt
index c6137b38e22d..a61fedabf9a8 100644
--- a/myov.txt
+++ b/myov.txt
@@ -21,12 +21,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://gitlab.com/xgqt/myov
-   34222be..400bb56  master     -> origin/master
-Updating 34222be..400bb56
-Fast-forward
- scripts/prep-commit | 5 +++++
- 1 file changed, 5 insertions(+)
+Already up to date.
 *** syncing myov
 *** synced myov
  * Sync succeeded
diff --git a/poly-c.html b/poly-c.html
index 099729fccbd5..f84591178839 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -112,107 +112,21 @@
 

             51
 

-            52
sent 85 bytes  received 134 bytes  62.57 bytes/sec
+            52
sent 85 bytes  received 134 bytes  87.60 bytes/sec
 

             53
total size is 32  speedup is 0.15
 

-            54
-------------------------------------------------------------------------------
+            54
*** syncing poly-c
 

-            55
Welcome to rsync.gentoofan.org:873
+            55
*** synced poly-c
 

-            56
This is the gentoo portage-overlay of Polynomial-C
+            56
 * Sync succeeded
 

-            57
+            57
$ stat --format=%y .
 

-            58
-------------------------------------------------------------------------------
+            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 poly-c
 

-            59
-

-            60
  ,-~~-.___.
-

-            61
 / |  '     \
-

-            62
(  )        0
-

-            63
 \_/-, ,----'
-

-            64
    ====           //
-

-            65
   /  \-'~;    /~~~(O)
-

-            66
  /  __/~|   /       |
-

-            67
=(  _____| (_________|
-

-            68
-

-            69
-server specs:
-

-            70
    -CPU		Intel Core i7 
-

-            71
    -RAM		8 GB
-

-            72
    -OS			Gentoo GNU/Linux (Kernel 4.x)
-

-            73
    -BANDWIDTH		100 MBit
-

-            74
    -LIMIT		10 users (concurrently)
-

-            75
    -LOCATION		Nuernberg/Germany
-

-            76
    -CONTACT		polynomial-c@gentoo.org
-

-            77
-

-            78
-------------------------------------------------------------------------------
-

-            79
-

-            80
-

-            81
Number of files: 1,668 (reg: 1,199, dir: 469)
-

-            82
Number of created files: 8 (reg: 6, dir: 2)
-

-            83
Number of deleted files: 0
-

-            84
Number of regular files transferred: 7
-

-            85
Total file size: 3.92M bytes
-

-            86
Total transferred file size: 9.62K bytes
-

-            87
Literal data: 9.62K bytes
-

-            88
Matched data: 0 bytes
-

-            89
File list size: 48.33K
-

-            90
File list generation time: 0.001 seconds
-

-            91
File list transfer time: 0.000 seconds
-

-            92
Total bytes sent: 709
-

-            93
Total bytes received: 59.16K
-

-            94
-

-            95
sent 709 bytes  received 59.16K bytes  17.11K bytes/sec
-

-            96
total size is 3.92M  speedup is 65.55
-

-            97
*** syncing poly-c
-

-            98
*** synced poly-c
-

-            99
 * Sync succeeded
-

-            100
$ stat --format=%y .
-

-            101
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 poly-c
-

-            102
 * Cache regenerated successfully
+            59
 * Cache regenerated successfully
 

 
         
diff --git a/poly-c.txt b/poly-c.txt
index d60c04c278ed..eed3928e049d 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -49,51 +49,8 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 134
 
-sent 85 bytes  received 134 bytes  62.57 bytes/sec
+sent 85 bytes  received 134 bytes  87.60 bytes/sec
 total size is 32  speedup is 0.15
--------------------------------------------------------------------------------
-Welcome to rsync.gentoofan.org:873
-This is the gentoo portage-overlay of Polynomial-C
-
--------------------------------------------------------------------------------
-
-  ,-~~-.___.
- / |  '     \
-(  )        0
- \_/-, ,----'
-    ====           //
-   /  \-'~;    /~~~(O)
-  /  __/~|   /       |
-=(  _____| (_________|
-
--server specs:
-    -CPU		Intel Core i7 
-    -RAM		8 GB
-    -OS			Gentoo GNU/Linux (Kernel 4.x)
-    -BANDWIDTH		100 MBit
-    -LIMIT		10 users (concurrently)
-    -LOCATION		Nuernberg/Germany
-    -CONTACT		polynomial-c@gentoo.org
-
--------------------------------------------------------------------------------
-
-
-Number of files: 1,668 (reg: 1,199, dir: 469)
-Number of created files: 8 (reg: 6, dir: 2)
-Number of deleted files: 0
-Number of regular files transferred: 7
-Total file size: 3.92M bytes
-Total transferred file size: 9.62K bytes
-Literal data: 9.62K bytes
-Matched data: 0 bytes
-File list size: 48.33K
-File list generation time: 0.001 seconds
-File list transfer time: 0.000 seconds
-Total bytes sent: 709
-Total bytes received: 59.16K
-
-sent 709 bytes  received 59.16K bytes  17.11K bytes/sec
-total size is 3.92M  speedup is 65.55
 *** syncing poly-c
 *** synced poly-c
  * Sync succeeded
diff --git a/swegener.html b/swegener.html
index 041fbd2e1e19..143b1e8dd19a 100644
--- a/swegener.html
+++ b/swegener.html
@@ -94,15 +94,15 @@
 

             42
File list transfer time: 0.000 seconds
 

-            43
Total bytes sent: 147
+            43
Total bytes sent: 143
 

             44
Total bytes received: 5.39K
 

             45
 

-            46
sent 147 bytes  received 5.39K bytes  2.21K bytes/sec
+            46
sent 143 bytes  received 5.39K bytes  1.58K bytes/sec
 

-            47
total size is 110.19K  speedup is 19.91
+            47
total size is 110.19K  speedup is 19.93
 

             48
*** syncing swegener
 

diff --git a/swegener.txt b/swegener.txt
index 2d29f41ab546..7d225f0df763 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -40,11 +40,11 @@ Matched data: 0 bytes
 File list size: 5.29K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 147
+Total bytes sent: 143
 Total bytes received: 5.39K
 
-sent 147 bytes  received 5.39K bytes  2.21K bytes/sec
-total size is 110.19K  speedup is 19.91
+sent 143 bytes  received 5.39K bytes  1.58K bytes/sec
+total size is 110.19K  speedup is 19.93
 *** syncing swegener
 *** synced swegener
  * Sync succeeded
diff --git a/xwing.html b/xwing.html
index 37ea9ca90585..2eef397c2885 100644
--- a/xwing.html
+++ b/xwing.html
@@ -70,7 +70,7 @@
 

             30
Matched data: 0 bytes
 

-            31
File list size: 48
+            31
File list size: 47
 

             32
File list generation time: 0.001 seconds
 

@@ -78,25 +78,71 @@
 

             34
Total bytes sent: 85
 

-            35
Total bytes received: 132
+            35
Total bytes received: 133
 

             36
 

-            37
sent 85 bytes  received 132 bytes  86.80 bytes/sec
+            37
sent 85 bytes  received 133 bytes  87.20 bytes/sec
 

             38
total size is 32  speedup is 0.15
 

-            39
*** syncing xwing
+            39
This is xwing.info / alderaan.xwing.info
 

-            40
*** synced xwing
+            40
 

-            41
 * Sync succeeded
+            41
Server Address : 91.134.139.206
 

-            42
$ stat --format=%y .
+            42
Contact Name   : webmaster@xwing.info
 

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+            43
Hardware       : VPS 2016 SSD 3
 

-            44
 * Cache regenerated successfully
+            44
+

+            45
+

+            46
Number of files: 164 (reg: 110, dir: 54)
+

+            47
Number of created files: 0
+

+            48
Number of deleted files: 0
+

+            49
Number of regular files transferred: 25
+

+            50
Total file size: 127.59K bytes
+

+            51
Total transferred file size: 32.85K bytes
+

+            52
Literal data: 32.85K bytes
+

+            53
Matched data: 0 bytes
+

+            54
File list size: 5.29K
+

+            55
File list generation time: 0.001 seconds
+

+            56
File list transfer time: 0.000 seconds
+

+            57
Total bytes sent: 634
+

+            58
Total bytes received: 23.60K
+

+            59
+

+            60
sent 634 bytes  received 23.60K bytes  9.69K bytes/sec
+

+            61
total size is 127.59K  speedup is 5.26
+

+            62
*** syncing xwing
+

+            63
*** synced xwing
+

+            64
 * Sync succeeded
+

+            65
$ stat --format=%y .
+

+            66
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+

+            67
 * Cache regenerated successfully
 

 
         
diff --git a/xwing.txt b/xwing.txt
index a7e6ca8ae0de..27079aacd558 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -28,14 +28,37 @@ Total file size: 32 bytes
 Total transferred file size: 32 bytes
 Literal data: 32 bytes
 Matched data: 0 bytes
-File list size: 48
+File list size: 47
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
 Total bytes sent: 85
-Total bytes received: 132
+Total bytes received: 133
 
-sent 85 bytes  received 132 bytes  86.80 bytes/sec
+sent 85 bytes  received 133 bytes  87.20 bytes/sec
 total size is 32  speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Server Address : 91.134.139.206
+Contact Name   : webmaster@xwing.info
+Hardware       : VPS 2016 SSD 3
+
+
+Number of files: 164 (reg: 110, dir: 54)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 25
+Total file size: 127.59K bytes
+Total transferred file size: 32.85K bytes
+Literal data: 32.85K bytes
+Matched data: 0 bytes
+File list size: 5.29K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 634
+Total bytes received: 23.60K
+
+sent 634 bytes  received 23.60K bytes  9.69K bytes/sec
+total size is 127.59K  speedup is 5.26
 *** syncing xwing
 *** synced xwing
  * Sync succeeded
diff --git a/zugaina.html b/zugaina.html
index 45b8909eaa43..4e74f1d786f8 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -54,15 +54,15 @@
 

             22
File list transfer time: 0.000 seconds
 

-            23
Total bytes sent: 479
+            23
Total bytes sent: 483
 

             24
Total bytes received: 47.16K
 

             25
 

-            26
sent 479 bytes  received 47.16K bytes  19.06K bytes/sec
+            26
sent 483 bytes  received 47.16K bytes  13.61K bytes/sec
 

-            27
total size is 2.24M  speedup is 46.93
+            27
total size is 2.24M  speedup is 46.92
 

             28
*** syncing zugaina
 

diff --git a/zugaina.txt b/zugaina.txt
index b0ef660292a5..8e3839f0e2dc 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -20,11 +20,11 @@ Matched data: 0 bytes
 File list size: 35.38K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 479
+Total bytes sent: 483
 Total bytes received: 47.16K
 
-sent 479 bytes  received 47.16K bytes  19.06K bytes/sec
-total size is 2.24M  speedup is 46.93
+sent 483 bytes  received 47.16K bytes  13.61K bytes/sec
+total size is 2.24M  speedup is 46.92
 *** syncing zugaina
 *** synced zugaina
  * Sync succeeded
-- 
cgit v1.2.3