2020-09-03T09:00:01Z

1 files changed, 21 insertions, 19 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 7bf205cda6ca..03b50701753d 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:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', 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:
@@ -28,25 +26,29 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://anongit.gentoo.org/git/repo/gentoo
-   8d6ed17600e..19b88534226  master     -> origin/master
-You are not currently on a branch.
-Please specify which branch you want to merge with.
-See git-pull(1) for details.
-
-    git pull <remote> <branch>
-
-*** syncing gentoo
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files:  17% (15223/89193)
Updating files:  18% (16055/89193)
Updating files:  19% (16947/89193)
Updating files:  20% (17839/89193)
Updating files:  21% (18731/89193)
Updating files:  22% (19623/89193)
Updating files:  23% (20515/89193)
Updating files:  24% (21407/89193)
Updating files:  25% (22299/89193)
Updating files:  26% (23191/89193)
Updating files:  27% (24083/89193)
Updating files:  28% (24975/89193)
Updating files:  29% (25866/89193)
Updating files:  30% (26758/89193)
Updating files:  31% (27650/89193)
Updating files:  32% (28542/89193)
Updating files:  33% (29434/89193)
Updating files:  34% (30326/89193)
Updating files:  35% (31218/89193)
Updating files:  36% (32110/89193)
Updating files:  36% (32828/89193)
Updating files:  37% (33002/89193)
Updating files:  38% (33894/89193)
Updating files:  39% (34786/89193)
Updating files:  40% (35678/89193)
Updating files:  41% (36570/89193)
Updating files:  42% (37462/89193)
Updating files:  43% (38353/89193)
Updating files:  44% (39245/89193)
Updating files:  45% (40137/89193)
Updating files:  46% (41029/89193)
Updating files:  47% (41921/89193)
Updating files:  48% (42813/89193)
Updating files:  49% (43705/89193)
Updating files:  50% (44597/89193)
Updating files:  51% (45489/89193)
Updating files:  52% (46381/89193)
Updating files:  53% (47273/89193)
Updating files:  54% (48165/89193)
Updating files:  55% (49057/89193)
Updating files:  56% (49949/89193)
Updating files:  56% (50753/89193)
Updating files:  57% (50841/89193)
Updating files:  58% (51732/89193)
Updating files:  59% (52624/89193)
Updating files:  60% (53516/89193)
Updating files:  61% (54408/89193)
Updating files:  62% (55300/89193)
Updating files:  63% (56192/89193)
Updating files:  64% (57084/89193)
Updating files:  65% (57976/89193)
Updating files:  66% (58868/89193)
Updating files:  67% (59760/89193)
Updating files:  68% (60652/89193)
Updating files:  69% (61544/89193)
Updating files:  70% (62436/89193)
Updating files:  71% (63328/89193)
Updating files:  72% (64219/89193)
Updating files:  73% (65111/89193)
Updating files:  74% (66003/89193)
Updating files:  75% (66895/89193)
Updating files:  76% (67787/89193)
Updating files:  76% (68453/89193)
Updating files:  77% (68679/89193)
Updating files:  78% (69571/89193)
Updating files:  79% (70463/89193)
Updating files:  80% (71355/89193)
Updating files:  81% (72247/89193)
Updating files:  82% (73139/89193)
Updating files:  83% (74031/89193)
Updating files:  84% (74923/89193)
Updating files:  85% (75815/89193)
Updating files:  86% (76706/89193)
Updating files:  87% (77598/89193)
Updating files:  88% (78490/89193)
Updating files:  89% (79382/89193)
Updating files:  90% (80274/89193)
Updating files:  91% (81166/89193)
Updating files:  92% (82058/89193)
Updating files:  92% (82927/89193)
Updating files:  93% (82950/89193)
Updating files:  94% (83842/89193)
Updating files:  95% (84734/89193)
Updating files:  96% (85626/89193)
Updating files:  97% (86518/89193)
Updating files:  98% (87410/89193)
Updating files:  99% (88302/89193)
Updating files: 100% (89193/89193)
Updating files: 100% (89193/89193), done.
+   19b88534226..d675113d42a  master     -> origin/master
+Updating 19b88534226..d675113d42a
+Fast-forward
+ dev-python/python-nbxmpp/Manifest                  |  1 +
+ .../python-nbxmpp/python-nbxmpp-1.0.2.ebuild       | 17 +++++
+ .../cmt-plugins/cmt-plugins-1.17-r1.ebuild         |  1 +
+ .../cmt-plugins/files/cmt-plugins-1.17-clang.patch | 13 ++++
+ .../files/cmt-plugins-1.17-makefile.patch          |  2 +-
+ net-im/gajim/Manifest                              |  3 +-
+ net-im/gajim/gajim-1.1.3-r1.ebuild                 | 88 ----------------------
+ net-im/gajim/gajim-1.1.3-r2.ebuild                 | 83 --------------------
+ .../{gajim-1.2.0.ebuild => gajim-1.2.2.ebuild}     |  6 +-
+ net-im/gajim/metadata.xml                          |  1 -
+ profiles/arch/riscv/package.use.mask               |  3 +-
+ 11 files changed, 40 insertions(+), 178 deletions(-)
+ create mode 100644 dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
+ create mode 100644 media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch
+ delete mode 100644 net-im/gajim/gajim-1.1.3-r1.ebuild
+ delete mode 100644 net-im/gajim/gajim-1.1.3-r2.ebuild
+ rename net-im/gajim/{gajim-1.2.0.ebuild => gajim-1.2.2.ebuild} (93%)
 *** syncing gentoo
 *** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo