2020-01-27T17:00:01Z

1 files changed, 15 insertions, 30 deletions

diff --git a/gentoo.txt b/gentoo.txt
index c95034e5afa1..8148a6c6cea1 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,38 +13,23 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   f6ed877eb64..dece1ba0c3f  master     -> origin/master
-Updating f6ed877eb64..dece1ba0c3f
-Fast-forward
- app-benchmarks/geekbench/geekbench-5.1.0.ebuild    |   2 +-
- app-misc/rpick/rpick-0.5.0.ebuild                  |   2 +-
- app-text/jo/Manifest                               |   1 +
- app-text/jo/jo-1.3.ebuild                          |  18 ++
- dev-python/mccabe/mccabe-0.6.1-r1.ebuild           |   2 +-
- dev-python/pillow/pillow-6.2.2.ebuild              |   2 +-
- .../pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild      |   4 +-
- dev-python/pypy-exe/pypy-exe-7.3.0.ebuild          |   2 +-
- dev-python/pypy/pypy-7.3.0.ebuild                  |   2 +-
- .../pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild    |   4 +-
- dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild        |   2 +-
- dev-python/pypy3/pypy3-7.3.0.ebuild                |   2 +-
- dev-scheme/guile/guile-2.2.4.ebuild                |   4 +-
- kde-misc/latte-dock/latte-dock-0.9.7-r1.ebuild     |   2 +-
- .../gentoo-vdr-scripts-2.8.ebuild                  |   2 +-
- net-analyzer/munin/munin-2.0.52.ebuild             |   2 +-
- net-proxy/squid/Manifest                           |   1 +
- net-proxy/squid/squid-4.10.ebuild                  | 276 +++++++++++++++++++++
- sys-fs/cryptmount/cryptmount-5.3.2.ebuild          |   4 +-
- sys-kernel/gentoo-sources/Manifest                 |   3 +
- .../gentoo-sources/gentoo-sources-4.19.99.ebuild   |  28 +++
- x11-misc/mugshot/mugshot-0.4.2-r1.ebuild           |   2 +-
- 22 files changed, 347 insertions(+), 20 deletions(-)
- create mode 100644 app-text/jo/jo-1.3.ebuild
- create mode 100644 net-proxy/squid/squid-4.10.ebuild
- create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-4.19.99.ebuild
+   dece1ba0c3f..bf021bd0f5a  master     -> origin/master
+You are not currently on a branch.
+Please specify which branch you want to merge with.
+See git-pull(1) for details.
+
+    git pull <remote> <branch>
+
+*** syncing gentoo
+!!! failed syncing gentoo
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint sync gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files:  17% (15739/92302)
Updating files:  18% (16615/92302)
Updating files:  19% (17538/92302)
Updating files:  20% (18461/92302)
Updating files:  21% (19384/92302)
Updating files:  22% (20307/92302)
Updating files:  23% (21230/92302)
Updating files:  24% (22153/92302)
Updating files:  25% (23076/92302)
Updating files:  26% (23999/92302)
Updating files:  27% (24922/92302)
Updating files:  28% (25845/92302)
Updating files:  29% (26768/92302)
Updating files:  30% (27691/92302)
Updating files:  31% (28614/92302)
Updating files:  32% (29537/92302)
Updating files:  33% (30460/92302)
Updating files:  34% (31383/92302)
Updating files:  34% (32000/92302)
Updating files:  35% (32306/92302)
Updating files:  36% (33229/92302)
Updating files:  37% (34152/92302)
Updating files:  38% (35075/92302)
Updating files:  39% (35998/92302)
Updating files:  40% (36921/92302)
Updating files:  41% (37844/92302)
Updating files:  42% (38767/92302)
Updating files:  43% (39690/92302)
Updating files:  44% (40613/92302)
Updating files:  45% (41536/92302)
Updating files:  46% (42459/92302)
Updating files:  47% (43382/92302)
Updating files:  48% (44305/92302)
Updating files:  49% (45228/92302)
Updating files:  50% (46151/92302)
Updating files:  51% (47075/92302)
Updating files:  51% (47705/92302)
Updating files:  52% (47998/92302)
Updating files:  53% (48921/92302)
Updating files:  54% (49844/92302)
Updating files:  55% (50767/92302)
Updating files:  56% (51690/92302)
Updating files:  57% (52613/92302)
Updating files:  58% (53536/92302)
Updating files:  59% (54459/92302)
Updating files:  60% (55382/92302)
Updating files:  61% (56305/92302)
Updating files:  62% (57228/92302)
Updating files:  63% (58151/92302)
Updating files:  64% (59074/92302)
Updating files:  65% (59997/92302)
Updating files:  66% (60920/92302)
Updating files:  67% (61843/92302)
Updating files:  68% (62766/92302)
Updating files:  68% (63068/92302)
Updating files:  69% (63689/92302)
Updating files:  70% (64612/92302)
Updating files:  71% (65535/92302)
Updating files:  72% (66458/92302)
Updating files:  73% (67381/92302)
Updating files:  74% (68304/92302)
Updating files:  75% (69227/92302)
Updating files:  76% (70150/92302)
Updating files:  77% (71073/92302)
Updating files:  78% (71996/92302)
Updating files:  79% (72919/92302)
Updating files:  80% (73842/92302)
Updating files:  81% (74765/92302)
Updating files:  81% (75608/92302)
Updating files:  82% (75688/92302)
Updating files:  83% (76611/92302)
Updating files:  84% (77534/92302)
Updating files:  85% (78457/92302)
Updating files:  86% (79380/92302)
Updating files:  87% (80303/92302)
Updating files:  88% (81226/92302)
Updating files:  89% (82149/92302)
Updating files:  90% (83072/92302)
Updating files:  91% (83995/92302)
Updating files:  92% (84918/92302)
Updating files:  93% (85841/92302)
Updating files:  94% (86764/92302)
Updating files:  95% (87687/92302)
Updating files:  96% (88610/92302)
Updating files:  97% (89533/92302)
Updating files:  98% (90456/92302)
Updating files:  99% (91379/92302)
Updating files: 100% (92302/92302)
Updating files: 100% (92302/92302), done.
 *** syncing gentoo
 *** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo