2021-05-28T16:15:01Z

1 files changed, 14 insertions, 72 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 95487e8ff7d8..613068ff4431 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,79 +15,21 @@ pkgcore 0.11.8
 
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
 *** syncing gentoo
-From https://anongit.gentoo.org/git/repo/gentoo
-   ed61ce08b6d..70d54e01a32  master     -> origin/master
-Updating ed61ce08b6d..70d54e01a32
-Fast-forward
- app-admin/puppet-agent/Manifest                    |    1 -
- app-admin/puppet-agent/puppet-agent-7.4.0.ebuild   |   74 --
- app-admin/puppet-agent/puppet-agent-7.6.1.ebuild   |    2 +-
- app-admin/puppet/Manifest                          |    1 -
- app-admin/puppet/puppet-7.4.0.ebuild               |  130 --
- app-admin/puppet/puppet-7.6.1.ebuild               |    2 +-
- app-admin/puppetdb/Manifest                        |    1 -
- app-admin/puppetdb/puppetdb-7.0.1.ebuild           |   87 --
- app-admin/puppetdb/puppetdb-7.3.1.ebuild           |    2 +-
- app-admin/puppetserver/Manifest                    |    2 -
- app-admin/puppetserver/puppetserver-6.13.0.ebuild  |  131 --
- app-admin/puppetserver/puppetserver-7.0.3.ebuild   |  131 --
- app-admin/puppetserver/puppetserver-7.1.2.ebuild   |    2 +-
- .../{blink1-1.98.ebuild => blink1-1.98-r1.ebuild}  |   12 +-
- ...ercury-20.06.ebuild => mercury-20.06-r1.ebuild} |    2 +-
- .../yap/{yap-6.3.4.ebuild => yap-6.3.4-r1.ebuild}  |   11 +-
- ...hp-0.5.4.ebuild => libvirt-php-0.5.4-r1.ebuild} |    7 +-
- ...hp-0.5.5.ebuild => libvirt-php-0.5.5-r1.ebuild} |    7 +-
- dev-php/libvirt-php/libvirt-php-9999.ebuild        |    5 +-
- dev-ruby/puppetdb-termini/Manifest                 |    1 -
- .../puppetdb-termini/puppetdb-termini-7.0.1.ebuild |   28 -
- .../puppetdb-termini/puppetdb-termini-7.3.1.ebuild |    2 +-
- dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild         |    6 +-
- ....6.10_p7.ebuild => schroot-1.6.10_p7-r1.ebuild} |    4 +-
- ...2-2.5.26.ebuild => libgphoto2-2.5.26-r1.ebuild} |    4 +-
- ...2-2.5.27.ebuild => libgphoto2-2.5.27-r1.ebuild} |    4 +-
- ...huck-1.4.0.1.ebuild => chuck-1.4.0.1-r1.ebuild} |    3 +-
- net-analyzer/icinga2/Manifest                      |    1 +
- net-analyzer/icinga2/icinga2-2.12.4.ebuild         |  148 +++
- net-analyzer/telegraf/Manifest                     |  252 ++++
- net-analyzer/telegraf/telegraf-1.18.3.ebuild       | 1266 ++++++++++++++++++++
- .../{pedro-1.6.ebuild => pedro-1.6-r1.ebuild}      |    6 +-
- .../{radvd-2.19.ebuild => radvd-2.19-r1.ebuild}    |    2 +-
- net-vpn/openvpn/openvpn-9999.ebuild                |    6 +-
- ...lo-10.2.0.ebuild => armadillo-10.2.0-r1.ebuild} |    4 +-
- ...lo-10.3.0.ebuild => armadillo-10.3.0-r1.ebuild} |    4 +-
- ...opcom-0.17.7.ebuild => topcom-0.17.7-r1.ebuild} |    4 +-
- sys-kernel/gentoo-sources/Manifest                 |    3 +
- .../gentoo-sources/gentoo-sources-5.12.8.ebuild    |   28 +
- ...n-3.3.8.ebuild => postfixadmin-3.3.8-r1.ebuild} |    1 -
- ...kwm-0.1.17-r2.ebuild => pekwm-0.1.17-r3.ebuild} |    4 +-
- 41 files changed, 1762 insertions(+), 629 deletions(-)
- delete mode 100644 app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
- delete mode 100644 app-admin/puppet/puppet-7.4.0.ebuild
- delete mode 100644 app-admin/puppetdb/puppetdb-7.0.1.ebuild
- delete mode 100644 app-admin/puppetserver/puppetserver-6.13.0.ebuild
- delete mode 100644 app-admin/puppetserver/puppetserver-7.0.3.ebuild
- rename app-misc/blink1/{blink1-1.98.ebuild => blink1-1.98-r1.ebuild} (96%)
- rename dev-lang/mercury/{mercury-20.06.ebuild => mercury-20.06-r1.ebuild} (99%)
- rename dev-lang/yap/{yap-6.3.4.ebuild => yap-6.3.4-r1.ebuild} (94%)
- rename dev-php/libvirt-php/{libvirt-php-0.5.4.ebuild => libvirt-php-0.5.4-r1.ebuild} (94%)
- rename dev-php/libvirt-php/{libvirt-php-0.5.5.ebuild => libvirt-php-0.5.5-r1.ebuild} (95%)
- delete mode 100644 dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
- rename dev-util/schroot/{schroot-1.6.10_p7.ebuild => schroot-1.6.10_p7-r1.ebuild} (97%)
- rename media-libs/libgphoto2/{libgphoto2-2.5.26.ebuild => libgphoto2-2.5.26-r1.ebuild} (98%)
- rename media-libs/libgphoto2/{libgphoto2-2.5.27.ebuild => libgphoto2-2.5.27-r1.ebuild} (98%)
- rename media-sound/chuck/{chuck-1.4.0.1.ebuild => chuck-1.4.0.1-r1.ebuild} (96%)
- create mode 100644 net-analyzer/icinga2/icinga2-2.12.4.ebuild
- create mode 100644 net-analyzer/telegraf/telegraf-1.18.3.ebuild
- rename net-misc/pedro/{pedro-1.6.ebuild => pedro-1.6-r1.ebuild} (86%)
- rename net-misc/radvd/{radvd-2.19.ebuild => radvd-2.19-r1.ebuild} (97%)
- rename sci-libs/armadillo/{armadillo-10.2.0.ebuild => armadillo-10.2.0-r1.ebuild} (98%)
- rename sci-libs/armadillo/{armadillo-10.3.0.ebuild => armadillo-10.3.0-r1.ebuild} (98%)
- rename sci-mathematics/topcom/{topcom-0.17.7.ebuild => topcom-0.17.7-r1.ebuild} (93%)
- create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-5.12.8.ebuild
- rename www-apps/postfixadmin/{postfixadmin-3.3.8.ebuild => postfixadmin-3.3.8-r1.ebuild} (98%)
- rename x11-wm/pekwm/{pekwm-0.1.17-r2.ebuild => pekwm-0.1.17-r3.ebuild} (95%)
+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 --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
+*** syncing gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files:  20% (17498/85689)
Updating files:  21% (17995/85689)
Updating files:  22% (18852/85689)
Updating files:  23% (19709/85689)
Updating files:  24% (20566/85689)
Updating files:  25% (21423/85689)
Updating files:  26% (22280/85689)
Updating files:  27% (23137/85689)
Updating files:  28% (23993/85689)
Updating files:  29% (24850/85689)
Updating files:  30% (25707/85689)
Updating files:  31% (26564/85689)
Updating files:  32% (27421/85689)
Updating files:  33% (28278/85689)
Updating files:  34% (29135/85689)
Updating files:  35% (29992/85689)
Updating files:  36% (30849/85689)
Updating files:  37% (31705/85689)
Updating files:  38% (32562/85689)
Updating files:  39% (33419/85689)
Updating files:  40% (34276/85689)
Updating files:  41% (35133/85689)
Updating files:  42% (35990/85689)
Updating files:  43% (36847/85689)
Updating files:  43% (37108/85689)
Updating files:  44% (37704/85689)
Updating files:  45% (38561/85689)
Updating files:  46% (39417/85689)
Updating files:  47% (40274/85689)
Updating files:  48% (41131/85689)
Updating files:  49% (41988/85689)
Updating files:  50% (42845/85689)
Updating files:  51% (43702/85689)
Updating files:  52% (44559/85689)
Updating files:  53% (45416/85689)
Updating files:  54% (46273/85689)
Updating files:  55% (47129/85689)
Updating files:  56% (47986/85689)
Updating files:  57% (48843/85689)
Updating files:  58% (49700/85689)
Updating files:  59% (50557/85689)
Updating files:  60% (51414/85689)
Updating files:  61% (52271/85689)
Updating files:  62% (53128/85689)
Updating files:  63% (53985/85689)
Updating files:  63% (54613/85689)
Updating files:  64% (54841/85689)
Updating files:  65% (55698/85689)
Updating files:  66% (56555/85689)
Updating files:  67% (57412/85689)
Updating files:  68% (58269/85689)
Updating files:  69% (59126/85689)
Updating files:  70% (59983/85689)
Updating files:  71% (60840/85689)
Updating files:  72% (61697/85689)
Updating files:  73% (62553/85689)
Updating files:  74% (63410/85689)
Updating files:  75% (64267/85689)
Updating files:  76% (65124/85689)
Updating files:  77% (65981/85689)
Updating files:  78% (66838/85689)
Updating files:  79% (67695/85689)
Updating files:  80% (68552/85689)
Updating files:  81% (69409/85689)
Updating files:  82% (70265/85689)
Updating files:  83% (71122/85689)
Updating files:  84% (71979/85689)
Updating files:  85% (72836/85689)
Updating files:  85% (73077/85689)
Updating files:  86% (73693/85689)
Updating files:  87% (74550/85689)
Updating files:  88% (75407/85689)
Updating files:  89% (76264/85689)
Updating files:  90% (77121/85689)
Updating files:  91% (77977/85689)
Updating files:  92% (78834/85689)
Updating files:  93% (79691/85689)
Updating files:  94% (80548/85689)
Updating files:  95% (81405/85689)
Updating files:  96% (82262/85689)
Updating files:  97% (83119/85689)
Updating files:  98% (83976/85689)
Updating files:  99% (84833/85689)
Updating files: 100% (85689/85689)
Updating files: 100% (85689/85689), done.
 *** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo