2020-01-27T19:40:01Z

1 files changed, 15 insertions, 33 deletions

diff --git a/gentoo.txt b/gentoo.txt
index bd02734b7bca..c09af6f7366b 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,41 +13,23 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   1a97fa93304..3e7fd31ae2b  master     -> origin/master
-Updating 1a97fa93304..3e7fd31ae2b
-Fast-forward
- acct-group/squid/metadata.xml                      |  8 ++
- acct-group/squid/squid-0.ebuild                    |  8 ++
- acct-user/squid/metadata.xml                       |  8 ++
- acct-user/squid/squid-0.ebuild                     | 13 +++
- dev-lang/orc/orc-0.4.31.ebuild                     | 16 +++-
- kde-misc/latte-dock/Manifest                       |  2 -
- kde-misc/latte-dock/latte-dock-0.9.2.ebuild        | 53 ------------
- kde-misc/latte-dock/latte-dock-0.9.4.ebuild        | 53 ------------
- kde-misc/latte-dock/latte-dock-0.9.7-r1.ebuild     |  2 +-
- net-analyzer/argus/argus-3.0.8.2-r2.ebuild         | 93 ++++++++++++++++++++++
- .../argus/files/argus-3.0.8.2-fno-common.patch     | 45 +++++++++++
- net-proxy/squid/squid-4.10.ebuild                  | 16 ++--
- net-proxy/squid/squid-4.9.ebuild                   | 16 ++--
- x11-wm/wmfs/files/wmfs-99999999-Debian.patch       | 11 +++
- x11-wm/wmfs/files/wmfs-99999999-fno-common.patch   | 92 +++++++++++++++++++++
- x11-wm/wmfs/files/wmfs-99999999-strncat.patch      | 20 +++++
- x11-wm/wmfs/wmfs-99999999.ebuild                   | 19 +++--
- 17 files changed, 336 insertions(+), 139 deletions(-)
- create mode 100644 acct-group/squid/metadata.xml
- create mode 100644 acct-group/squid/squid-0.ebuild
- create mode 100644 acct-user/squid/metadata.xml
- create mode 100644 acct-user/squid/squid-0.ebuild
- delete mode 100644 kde-misc/latte-dock/latte-dock-0.9.2.ebuild
- delete mode 100644 kde-misc/latte-dock/latte-dock-0.9.4.ebuild
- create mode 100644 net-analyzer/argus/argus-3.0.8.2-r2.ebuild
- create mode 100644 net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch
- create mode 100644 x11-wm/wmfs/files/wmfs-99999999-Debian.patch
- create mode 100644 x11-wm/wmfs/files/wmfs-99999999-fno-common.patch
- create mode 100644 x11-wm/wmfs/files/wmfs-99999999-strncat.patch
+   3e7fd31ae2b..ea1e3585809  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:  16% (15314/92310)
Updating files:  17% (15693/92310)
Updating files:  18% (16616/92310)
Updating files:  19% (17539/92310)
Updating files:  20% (18462/92310)
Updating files:  21% (19386/92310)
Updating files:  22% (20309/92310)
Updating files:  23% (21232/92310)
Updating files:  24% (22155/92310)
Updating files:  25% (23078/92310)
Updating files:  26% (24001/92310)
Updating files:  27% (24924/92310)
Updating files:  28% (25847/92310)
Updating files:  29% (26770/92310)
Updating files:  30% (27693/92310)
Updating files:  31% (28617/92310)
Updating files:  32% (29540/92310)
Updating files:  33% (30463/92310)
Updating files:  33% (30784/92310)
Updating files:  34% (31386/92310)
Updating files:  35% (32309/92310)
Updating files:  36% (33232/92310)
Updating files:  37% (34155/92310)
Updating files:  38% (35078/92310)
Updating files:  39% (36001/92310)
Updating files:  40% (36924/92310)
Updating files:  41% (37848/92310)
Updating files:  42% (38771/92310)
Updating files:  43% (39694/92310)
Updating files:  44% (40617/92310)
Updating files:  45% (41540/92310)
Updating files:  46% (42463/92310)
Updating files:  47% (43386/92310)
Updating files:  48% (44309/92310)
Updating files:  49% (45232/92310)
Updating files:  49% (45867/92310)
Updating files:  50% (46155/92310)
Updating files:  51% (47079/92310)
Updating files:  52% (48002/92310)
Updating files:  53% (48925/92310)
Updating files:  54% (49848/92310)
Updating files:  55% (50771/92310)
Updating files:  56% (51694/92310)
Updating files:  57% (52617/92310)
Updating files:  58% (53540/92310)
Updating files:  59% (54463/92310)
Updating files:  60% (55386/92310)
Updating files:  61% (56310/92310)
Updating files:  62% (57233/92310)
Updating files:  63% (58156/92310)
Updating files:  64% (59079/92310)
Updating files:  65% (60002/92310)
Updating files:  66% (60925/92310)
Updating files:  66% (60969/92310)
Updating files:  67% (61848/92310)
Updating files:  68% (62771/92310)
Updating files:  69% (63694/92310)
Updating files:  70% (64617/92310)
Updating files:  71% (65541/92310)
Updating files:  72% (66464/92310)
Updating files:  73% (67387/92310)
Updating files:  74% (68310/92310)
Updating files:  75% (69233/92310)
Updating files:  76% (70156/92310)
Updating files:  76% (71051/92310)
Updating files:  77% (71079/92310)
Updating files:  78% (72002/92310)
Updating files:  79% (72925/92310)
Updating files:  80% (73848/92310)
Updating files:  81% (74772/92310)
Updating files:  82% (75695/92310)
Updating files:  83% (76618/92310)
Updating files:  84% (77541/92310)
Updating files:  85% (78464/92310)
Updating files:  86% (79387/92310)
Updating files:  87% (80310/92310)
Updating files:  88% (81233/92310)
Updating files:  89% (82156/92310)
Updating files:  90% (83079/92310)
Updating files:  91% (84003/92310)
Updating files:  92% (84926/92310)
Updating files:  93% (85849/92310)
Updating files:  94% (86772/92310)
Updating files:  94% (87287/92310)
Updating files:  95% (87695/92310)
Updating files:  96% (88618/92310)
Updating files:  97% (89541/92310)
Updating files:  98% (90464/92310)
Updating files:  99% (91387/92310)
Updating files: 100% (92310/92310)
Updating files: 100% (92310/92310), 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