2021-04-05T18:45:01Z

1 files changed, 34 insertions, 15 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 94b5c64b3e31..d05066a96ad3 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -29,22 +29,41 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://anongit.gentoo.org/git/repo/gentoo
-   21ae18a1d34..a07d25d48f4  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>
-
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-*** syncing gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files:  17% (14704/85711)
Updating files:  18% (15428/85711)
Updating files:  19% (16286/85711)
Updating files:  20% (17143/85711)
Updating files:  21% (18000/85711)
Updating files:  22% (18857/85711)
Updating files:  23% (19714/85711)
Updating files:  24% (20571/85711)
Updating files:  25% (21428/85711)
Updating files:  26% (22285/85711)
Updating files:  27% (23142/85711)
Updating files:  28% (24000/85711)
Updating files:  29% (24857/85711)
Updating files:  30% (25714/85711)
Updating files:  31% (26571/85711)
Updating files:  32% (27428/85711)
Updating files:  33% (28285/85711)
Updating files:  34% (29142/85711)
Updating files:  35% (29999/85711)
Updating files:  35% (30253/85711)
Updating files:  36% (30856/85711)
Updating files:  37% (31714/85711)
Updating files:  38% (32571/85711)
Updating files:  39% (33428/85711)
Updating files:  40% (34285/85711)
Updating files:  41% (35142/85711)
Updating files:  42% (35999/85711)
Updating files:  43% (36856/85711)
Updating files:  44% (37713/85711)
Updating files:  45% (38570/85711)
Updating files:  46% (39428/85711)
Updating files:  47% (40285/85711)
Updating files:  48% (41142/85711)
Updating files:  49% (41999/85711)
Updating files:  50% (42856/85711)
Updating files:  51% (43713/85711)
Updating files:  52% (44570/85711)
Updating files:  52% (45236/85711)
Updating files:  53% (45427/85711)
Updating files:  54% (46284/85711)
Updating files:  55% (47142/85711)
Updating files:  56% (47999/85711)
Updating files:  57% (48856/85711)
Updating files:  58% (49713/85711)
Updating files:  59% (50570/85711)
Updating files:  60% (51427/85711)
Updating files:  61% (52284/85711)
Updating files:  62% (53141/85711)
Updating files:  63% (53998/85711)
Updating files:  64% (54856/85711)
Updating files:  65% (55713/85711)
Updating files:  66% (56570/85711)
Updating files:  67% (57427/85711)
Updating files:  68% (58284/85711)
Updating files:  69% (59141/85711)
Updating files:  70% (59998/85711)
Updating files:  70% (60173/85711)
Updating files:  71% (60855/85711)
Updating files:  72% (61712/85711)
Updating files:  73% (62570/85711)
Updating files:  74% (63427/85711)
Updating files:  75% (64284/85711)
Updating files:  76% (65141/85711)
Updating files:  77% (65998/85711)
Updating files:  78% (66855/85711)
Updating files:  79% (67712/85711)
Updating files:  80% (68569/85711)
Updating files:  81% (69426/85711)
Updating files:  82% (70284/85711)
Updating files:  83% (71141/85711)
Updating files:  83% (71413/85711)
Updating files:  84% (71998/85711)
Updating files:  85% (72855/85711)
Updating files:  86% (73712/85711)
Updating files:  87% (74569/85711)
Updating files:  88% (75426/85711)
Updating files:  89% (76283/85711)
Updating files:  90% (77140/85711)
Updating files:  91% (77998/85711)
Updating files:  92% (78855/85711)
Updating files:  93% (79712/85711)
Updating files:  94% (80569/85711)
Updating files:  95% (81426/85711)
Updating files:  96% (82283/85711)
Updating files:  97% (83140/85711)
Updating files:  98% (83997/85711)
Updating files:  99% (84854/85711)
Updating files: 100% (85711/85711)
Updating files: 100% (85711/85711), done.
+   a07d25d48f4..29f039efa0c  master     -> origin/master
+Updating a07d25d48f4..29f039efa0c
+Fast-forward
+ ....250.0.ebuild => Time-Period-1.250.0-r1.ebuild} | 10 ++---
+ dev-python/defusedxml/Manifest                     |  2 -
+ dev-python/defusedxml/defusedxml-0.7.0.ebuild      | 34 --------------
+ dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild  | 34 --------------
+ dev-python/importlib_resources/Manifest            |  2 -
+ .../importlib_resources-5.1.0.ebuild               | 30 -------------
+ .../importlib_resources-5.1.1.ebuild               | 30 -------------
+ dev-python/incremental/Manifest                    |  1 -
+ dev-python/incremental/incremental-17.5.0.ebuild   | 22 ---------
+ dev-python/inflect/Manifest                        |  1 -
+ dev-python/inflect/inflect-5.2.0.ebuild            | 25 -----------
+ dev-python/jsonpatch/Manifest                      |  3 --
+ dev-python/jsonpatch/jsonpatch-1.28.ebuild         | 28 ------------
+ dev-python/jsonpatch/jsonpatch-1.30.ebuild         | 28 ------------
+ dev-python/jsonpatch/jsonpatch-1.31.ebuild         | 28 ------------
+ dev-python/prettytable/Manifest                    |  1 -
+ dev-python/prettytable/prettytable-2.0.0.ebuild    | 35 ---------------
+ eclass/font-ebdftopcf.eclass                       | 52 +++++++++++++---------
+ 18 files changed, 35 insertions(+), 331 deletions(-)
+ rename dev-perl/Time-Period/{Time-Period-1.250.0.ebuild => Time-Period-1.250.0-r1.ebuild} (63%)
+ delete mode 100644 dev-python/defusedxml/defusedxml-0.7.0.ebuild
+ delete mode 100644 dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+ delete mode 100644 dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
+ delete mode 100644 dev-python/importlib_resources/importlib_resources-5.1.1.ebuild
+ delete mode 100644 dev-python/incremental/incremental-17.5.0.ebuild
+ delete mode 100644 dev-python/inflect/inflect-5.2.0.ebuild
+ delete mode 100644 dev-python/jsonpatch/jsonpatch-1.28.ebuild
+ delete mode 100644 dev-python/jsonpatch/jsonpatch-1.30.ebuild
+ delete mode 100644 dev-python/jsonpatch/jsonpatch-1.31.ebuild
+ delete mode 100644 dev-python/prettytable/prettytable-2.0.0.ebuild
 *** 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 32 gentoo