From 0171c50fab9c4a7dca6b42f8fba45db07667effc Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 6 Mar 2021 19:36:51 +0000 Subject: 2021-03-06T19:30:01Z --- R_Overlay.html | 4 +-- R_Overlay.txt | 4 +-- dequbed.html | 46 ++++++++++++++++--------------- dequbed.txt | 1 + dilfridge.html | 44 +++++++++++++++--------------- dilfridge.txt | 1 + djc.html | 44 +++++++++++++++--------------- djc.txt | 1 - dlang.html | 44 +++++++++++++++--------------- dlang.txt | 1 - dm9pZCAq.html | 44 +++++++++++++++--------------- dm9pZCAq.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 - gentoo.html | 26 ++++++------------ gentoo.txt | 7 +---- index.html | 2 +- swegener.html | 6 ++--- swegener.txt | 6 ++--- vifino-overlay.html | 44 +++++++++++++++--------------- vifino-overlay.txt | 1 + vklimovs.html | 44 +++++++++++++++--------------- vklimovs.txt | 1 + vmacs.html | 44 +++++++++++++++--------------- vmacs.txt | 1 + webos.html | 44 +++++++++++++++--------------- webos.txt | 1 + what4-java.html | 44 +++++++++++++++--------------- what4-java.txt | 1 - wine.html | 44 +++++++++++++++--------------- wine.txt | 1 - zugaina.html | 6 ++--- zugaina.txt | 6 ++--- 39 files changed, 377 insertions(+), 401 deletions(-) diff --git a/R_Overlay.html b/R_Overlay.html index 3ddcb0e735bb..cff878237267 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -50,7 +50,7 @@ 20
Matched data: 0 bytes
- 21
File list size: 2.42M
+            21
File list size: 2.29M
 

             22
File list generation time: 0.001 seconds
 

@@ -62,7 +62,7 @@
26
- 27
sent 17.64K bytes  received 2.63M bytes  1.77M bytes/sec
+            27
sent 17.64K bytes  received 2.63M bytes  1.06M bytes/sec
 

             28
total size is 61.67M  speedup is 23.25
 

diff --git a/R_Overlay.txt b/R_Overlay.txt
index 1e1418ddf2e9..d3643e1825f3 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 61.67M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.42M
+File list size: 2.29M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
 Total bytes sent: 17.64K
 Total bytes received: 2.63M
 
-sent 17.64K bytes  received 2.63M bytes  1.77M bytes/sec
+sent 17.64K bytes  received 2.63M bytes  1.06M bytes/sec
 total size is 61.67M  speedup is 23.25
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/dequbed.html b/dequbed.html
index 150f7fe838b3..ccff0ce4ff5a 100644
--- a/dequbed.html
+++ b/dequbed.html
@@ -34,49 +34,51 @@
12
$ pmaint sync dequbed
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            16
+            16
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            25
+            25
invocation.
 

-            26
Already up to date.
+            26
 

-            27
*** syncing dequbed
+            27
Already up to date.
 

-            28
*** synced dequbed
+            28
*** syncing dequbed
 

-            29
 * Sync succeeded
+            29
*** synced dequbed
 

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

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

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

-            33
 * x11-misc/compton-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dequbed
+

+            34
 * x11-misc/compton-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            34
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

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

             17
$ pmaint sync dilfridge
 

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

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

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

-            21
+            21
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            30
+            30
invocation.
 

-            31
Already up to date.
+            31
 

-            32
*** syncing dilfridge
+            32
Already up to date.
 

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

-            34
 * Sync succeeded
+            34
*** synced dilfridge
 

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

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

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

-            38
 * Cache regenerated successfully
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dilfridge
+

+            39
 * Cache regenerated successfully
 

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

             13
$ pmaint sync djc
 

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

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

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

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

             12
$ pmaint sync dlang
 

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

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

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

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

             10
$ pmaint sync dm9pZCAq
 

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

-            26
*** syncing dm9pZCAq
+            26
*** synced dm9pZCAq
 

-            27
*** synced dm9pZCAq
+            27
 * Sync succeeded
 

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

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

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

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

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

 
         
diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt
index 21f3a91a03b9..811950b4f272 100644
--- a/dm9pZCAq.txt
+++ b/dm9pZCAq.txt
@@ -8,7 +8,6 @@
              'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dm9pZCAq
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dmchurch.html b/dmchurch.html
index b06ed7e23b07..bfe6d865f129 100644
--- a/dmchurch.html
+++ b/dmchurch.html
@@ -42,49 +42,47 @@
 

             16
$ pmaint sync dmchurch
 

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

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

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

 
         
diff --git a/dmchurch.txt b/dmchurch.txt
index 20c9a8feb418..9b4af70e302f 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:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/docker.html b/docker.html
index 46f3d7566846..58d987f10401 100644
--- a/docker.html
+++ b/docker.html
@@ -40,83 +40,81 @@
 

             15
$ pmaint sync docker
 

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

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 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 bc05b0a7e596..dfeaf29f0af0 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:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dotnet.html b/dotnet.html
index 7e9b6c485eb1..bffb9ff1d972 100644
--- a/dotnet.html
+++ b/dotnet.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync dotnet
 

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

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

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

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

             14
$ pmaint sync drdim
 

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

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

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

 
         
diff --git a/drdim.txt b/drdim.txt
index b4e46479dda1..68f4b01219ba 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:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo.html b/gentoo.html
index 0fae8c14ece6..ac6f7bf766b1 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -64,31 +64,21 @@
 

             27
 

-            28
From https://anongit.gentoo.org/git/repo/gentoo
+            28
Already up to date.
 

-            29
   49d6eac33c5..26f2fd143a3  master     -> origin/master
+            29
*** syncing gentoo
 

-            30
Updating 49d6eac33c5..26f2fd143a3
+            30
*** synced gentoo
 

-            31
Fast-forward
+            31
 * Sync succeeded
 

-            32
 media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild | 10 ++++++----
+            32
$ git log --format=%ci -1
 

-            33
 1 file changed, 6 insertions(+), 4 deletions(-)
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
*** syncing gentoo
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
 

-            35
*** synced gentoo
-

-            36
 * Sync succeeded
-

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

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

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

-            40
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/gentoo.txt b/gentoo.txt
index 204840aa2b96..8058c350aba2 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -25,12 +25,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://anongit.gentoo.org/git/repo/gentoo
-   49d6eac33c5..26f2fd143a3  master     -> origin/master
-Updating 49d6eac33c5..26f2fd143a3
-Fast-forward
- media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
+Already up to date.
 *** syncing gentoo
 *** synced gentoo
  * Sync succeeded
diff --git a/index.html b/index.html
index 0a29f4953898..6464ccbd2f77 100644
--- a/index.html
+++ b/index.html
@@ -921,7 +921,7 @@
 
         
 
-        
Generated based on results from 2021-03-06 19:21:42 UTC

+        
Generated based on results from 2021-03-06 19:36:44 UTC

     
 
         
\ No newline at end of file
diff --git a/swegener.html b/swegener.html
index 295911c7342e..cda54dd3a9c4 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.38K
 

             45
 

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

-            47
total size is 105.64K  speedup is 19.10
+            47
total size is 105.64K  speedup is 19.12
 

             48
*** syncing swegener
 

diff --git a/swegener.txt b/swegener.txt
index 82ab456d2b61..7190ea096659 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.38K
 
-sent 147 bytes  received 5.38K bytes  2.21K bytes/sec
-total size is 105.64K  speedup is 19.10
+sent 143 bytes  received 5.38K bytes  2.21K bytes/sec
+total size is 105.64K  speedup is 19.12
 *** syncing swegener
 *** synced swegener
  * Sync succeeded
diff --git a/vifino-overlay.html b/vifino-overlay.html
index 6e160c224a66..abbb9d4861fc 100644
--- a/vifino-overlay.html
+++ b/vifino-overlay.html
@@ -40,47 +40,49 @@
 

             15
$ pmaint sync vifino-overlay
 

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

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

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

-            19
+            19
commands sometime before your next pull:
 

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

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

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

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

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

-            25
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
 

-            26
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,
 

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

-            28
+            28
invocation.
 

-            29
Already up to date.
+            29
 

-            30
*** syncing vifino-overlay
+            30
Already up to date.
 

-            31
*** synced vifino-overlay
+            31
*** syncing vifino-overlay
 

-            32
 * Sync succeeded
+            32
*** synced vifino-overlay
 

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

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

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

-            36
 * Cache regenerated successfully
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
+

+            37
 * Cache regenerated successfully
 

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

             14
$ pmaint sync vklimovs
 

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

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

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

-            18
+            18
commands sometime before your next pull:
 

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

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

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

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

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

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
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
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

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

-            27
+            27
invocation.
 

-            28
Already up to date.
+            28
 

-            29
*** syncing vklimovs
+            29
Already up to date.
 

-            30
*** synced vklimovs
+            30
*** syncing vklimovs
 

-            31
 * Sync succeeded
+            31
*** synced vklimovs
 

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

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

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

-            35
 * Cache regenerated successfully
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs
+

+            36
 * Cache regenerated successfully
 

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

             15
$ pmaint sync vmacs
 

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

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

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

-            19
+            19
commands sometime before your next pull:
 

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

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

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

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

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

-            25
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
 

-            26
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,
 

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

-            28
+            28
invocation.
 

-            29
Already up to date.
+            29
 

-            30
*** syncing vmacs
+            30
Already up to date.
 

-            31
*** synced vmacs
+            31
*** syncing vmacs
 

-            32
 * Sync succeeded
+            32
*** synced vmacs
 

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

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

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

-            36
 * Cache regenerated successfully
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vmacs
+

+            37
 * Cache regenerated successfully
 

 
         
diff --git a/vmacs.txt b/vmacs.txt
index 82100ff3383e..1fced5b6a9bc 100644
--- a/vmacs.txt
+++ b/vmacs.txt
@@ -13,6 +13,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/vmacs.git'}],
  'status': 'unofficial'}
 $ pmaint sync vmacs
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/webos.html b/webos.html
index 141611afa300..566dcbf8467b 100644
--- a/webos.html
+++ b/webos.html
@@ -40,47 +40,49 @@
 

             15
$ pmaint sync webos
 

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

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

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

-            19
+            19
commands sometime before your next pull:
 

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

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

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

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

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

-            25
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
 

-            26
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,
 

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

-            28
+            28
invocation.
 

-            29
Already up to date.
+            29
 

-            30
*** syncing webos
+            30
Already up to date.
 

-            31
*** synced webos
+            31
*** syncing webos
 

-            32
 * Sync succeeded
+            32
*** synced webos
 

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

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

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

-            36
 * Cache regenerated successfully
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 webos
+

+            37
 * Cache regenerated successfully
 

 
         
diff --git a/webos.txt b/webos.txt
index 5420d4b5d41c..8e9ef5d5a3f7 100644
--- a/webos.txt
+++ b/webos.txt
@@ -13,6 +13,7 @@
             {'type': 'git', 'uri': 'git@github.com:feniksa/webos-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync webos
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/what4-java.html b/what4-java.html
index 0d38588f86c1..af879c3084ec 100644
--- a/what4-java.html
+++ b/what4-java.html
@@ -34,49 +34,47 @@
 

             12
$ pmaint sync what4-java
 

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

-            28
*** syncing what4-java
+            28
*** synced what4-java
 

-            29
*** synced what4-java
+            29
 * Sync succeeded
 

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

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

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

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

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

 
         
diff --git a/what4-java.txt b/what4-java.txt
index 5352b7973162..a7537d7a7074 100644
--- a/what4-java.txt
+++ b/what4-java.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/kwhat/gentoo-what4-java-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync what4-java
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/wine.html b/wine.html
index 5db9eb1ccf68..ba0fa2370481 100644
--- a/wine.html
+++ b/wine.html
@@ -38,49 +38,47 @@
 

             14
$ pmaint sync wine
 

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

-            30
*** syncing wine
+            30
*** synced wine
 

-            31
*** synced wine
+            31
 * Sync succeeded
 

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

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

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

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

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

 
         
diff --git a/wine.txt b/wine.txt
index 3696a95f7358..c87a56a5cfe6 100644
--- a/wine.txt
+++ b/wine.txt
@@ -12,7 +12,6 @@
              'uri': 'git://anongit.gentoo.org/repo/proj/wine.git'}],
  'status': 'official'}
 $ pmaint sync wine
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/zugaina.html b/zugaina.html
index 41d5b2b52557..1b5983d6ffaa 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -54,15 +54,15 @@
 

             22
File list transfer time: 0.000 seconds
 

-            23
Total bytes sent: 487
+            23
Total bytes sent: 491
 

             24
Total bytes received: 46.52K
 

             25
 

-            26
sent 487 bytes  received 46.52K bytes  18.80K bytes/sec
+            26
sent 491 bytes  received 46.52K bytes  18.80K bytes/sec
 

-            27
total size is 2.19M  speedup is 46.58
+            27
total size is 2.19M  speedup is 46.57
 

             28
*** syncing zugaina
 

diff --git a/zugaina.txt b/zugaina.txt
index a2408d643fb2..3d1a8c14c862 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -20,11 +20,11 @@ Matched data: 0 bytes
 File list size: 42.16K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 487
+Total bytes sent: 491
 Total bytes received: 46.52K
 
-sent 487 bytes  received 46.52K bytes  18.80K bytes/sec
-total size is 2.19M  speedup is 46.58
+sent 491 bytes  received 46.52K bytes  18.80K bytes/sec
+total size is 2.19M  speedup is 46.57
 *** syncing zugaina
 *** synced zugaina
  * Sync succeeded
-- 
cgit v1.2.3-18-g5258