2020-05-01T18:00:01Z

1 files changed, 17 insertions, 19 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 42996aeac07e..696a84b7d2b9 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,28 +12,26 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
  'status': 'official'}
 $ pmaint sync gentoo
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 From https://anongit.gentoo.org/git/repo/gentoo
-   bc5fd47dc11..704ea7755fc  master     -> origin/master
-Updating bc5fd47dc11..704ea7755fc
-Fast-forward
- dev-python/numpy-python2/Manifest                  |   4 +
- .../numpy-python2/numpy-python2-1.16.6.ebuild      | 172 +++++++++++
- sci-libs/vtk/Manifest                              |   4 +
- .../files/vtk-8.1.0-openmpi-4-compatibility.patch  |  14 +
- .../{vtk-8.1.0-r6.ebuild => vtk-8.1.0-r7.ebuild}   |   9 +-
- sci-libs/vtk/vtk-8.2.0.ebuild                      | 336 +++++++++++++++++++++
- ...lhep-2.4.1.3.ebuild => clhep-2.4.1.3-r1.ebuild} |  11 +-
- 7 files changed, 547 insertions(+), 3 deletions(-)
- create mode 100644 dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
- create mode 100644 sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
- rename sci-libs/vtk/{vtk-8.1.0-r6.ebuild => vtk-8.1.0-r7.ebuild} (98%)
- create mode 100644 sci-libs/vtk/vtk-8.2.0.ebuild
- rename sci-physics/clhep/{clhep-2.4.1.3.ebuild => clhep-2.4.1.3-r1.ebuild} (83%)
+   704ea7755fc..17ddb90dc1a  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:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', 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:  11% (10375/89302)
Updating files:  12% (10717/89302)
Updating files:  13% (11610/89302)
Updating files:  14% (12503/89302)
Updating files:  15% (13396/89302)
Updating files:  16% (14289/89302)
Updating files:  17% (15182/89302)
Updating files:  18% (16075/89302)
Updating files:  19% (16968/89302)
Updating files:  20% (17861/89302)
Updating files:  21% (18754/89302)
Updating files:  22% (19647/89302)
Updating files:  23% (20540/89302)
Updating files:  23% (20671/89302)
Updating files:  24% (21433/89302)
Updating files:  25% (22326/89302)
Updating files:  26% (23219/89302)
Updating files:  27% (24112/89302)
Updating files:  28% (25005/89302)
Updating files:  29% (25898/89302)
Updating files:  30% (26791/89302)
Updating files:  31% (27684/89302)
Updating files:  32% (28577/89302)
Updating files:  33% (29470/89302)
Updating files:  34% (30363/89302)
Updating files:  35% (31256/89302)
Updating files:  35% (31296/89302)
Updating files:  36% (32149/89302)
Updating files:  37% (33042/89302)
Updating files:  38% (33935/89302)
Updating files:  39% (34828/89302)
Updating files:  40% (35721/89302)
Updating files:  41% (36614/89302)
Updating files:  42% (37507/89302)
Updating files:  43% (38400/89302)
Updating files:  44% (39293/89302)
Updating files:  45% (40186/89302)
Updating files:  46% (41079/89302)
Updating files:  47% (41972/89302)
Updating files:  47% (42840/89302)
Updating files:  48% (42865/89302)
Updating files:  49% (43758/89302)
Updating files:  50% (44651/89302)
Updating files:  51% (45545/89302)
Updating files:  52% (46438/89302)
Updating files:  53% (47331/89302)
Updating files:  54% (48224/89302)
Updating files:  55% (49117/89302)
Updating files:  55% (49958/89302)
Updating files:  56% (50010/89302)
Updating files:  57% (50903/89302)
Updating files:  58% (51796/89302)
Updating files:  59% (52689/89302)
Updating files:  60% (53582/89302)
Updating files:  61% (54475/89302)
Updating files:  62% (55368/89302)
Updating files:  63% (56261/89302)
Updating files:  64% (57154/89302)
Updating files:  65% (58047/89302)
Updating files:  66% (58940/89302)
Updating files:  66% (59674/89302)
Updating files:  67% (59833/89302)
Updating files:  68% (60726/89302)
Updating files:  69% (61619/89302)
Updating files:  70% (62512/89302)
Updating files:  71% (63405/89302)
Updating files:  72% (64298/89302)
Updating files:  73% (65191/89302)
Updating files:  74% (66084/89302)
Updating files:  75% (66977/89302)
Updating files:  76% (67870/89302)
Updating files:  77% (68763/89302)
Updating files:  77% (69301/89302)
Updating files:  78% (69656/89302)
Updating files:  79% (70549/89302)
Updating files:  80% (71442/89302)
Updating files:  81% (72335/89302)
Updating files:  82% (73228/89302)
Updating files:  83% (74121/89302)
Updating files:  84% (75014/89302)
Updating files:  85% (75907/89302)
Updating files:  86% (76800/89302)
Updating files:  87% (77693/89302)
Updating files:  88% (78586/89302)
Updating files:  89% (79479/89302)
Updating files:  90% (80372/89302)
Updating files:  90% (80447/89302)
Updating files:  91% (81265/89302)
Updating files:  92% (82158/89302)
Updating files:  93% (83051/89302)
Updating files:  94% (83944/89302)
Updating files:  95% (84837/89302)
Updating files:  96% (85730/89302)
Updating files:  97% (86623/89302)
Updating files:  98% (87516/89302)
Updating files:  99% (88409/89302)
Updating files: 100% (89302/89302)
Updating files: 100% (89302/89302), 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