2019-11-03T21:00:01Z

1 files changed, 15 insertions, 59 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 58bc23c1cf0e..8822b1103fc4 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,67 +13,23 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   ab4ce76c8ac..ecd1cce4e90  master     -> origin/master
-Updating ab4ce76c8ac..ecd1cce4e90
-Fast-forward
- app-admin/puppet-agent/Manifest                    |   2 -
- app-admin/puppet-agent/puppet-agent-6.10.1.ebuild  |   2 +-
- app-admin/puppet-agent/puppet-agent-6.8.0.ebuild   |  79 ------------
- app-admin/puppet/Manifest                          |   1 -
- app-admin/puppet/puppet-6.10.1.ebuild              |   2 +-
- app-admin/puppet/puppet-6.8.0.ebuild               | 138 ---------------------
- app-admin/puppetdb/Manifest                        |   1 -
- app-admin/puppetdb/puppetdb-6.5.0.ebuild           |  92 --------------
- app-admin/puppetdb/puppetdb-6.7.1.ebuild           |   2 +-
- app-admin/puppetserver/Manifest                    |   1 -
- app-admin/puppetserver/puppetserver-6.5.0.ebuild   | 135 --------------------
- app-admin/puppetserver/puppetserver-6.7.1.ebuild   |   2 +-
- dev-ada/asis/asis-2016-r1.ebuild                   |   5 +-
- dev-ada/asis/asis-2016.ebuild                      |   5 +-
- dev-ada/asis/asis-2018.ebuild                      |   5 +-
- dev-ada/asis/asis-2019-r1.ebuild                   |   5 +-
- dev-ada/asis/asis-2019.ebuild                      |   5 +-
- dev-ada/langkit/Manifest                           |   1 -
- dev-ada/langkit/files/langkit-2017-gentoo.patch    |  69 -----------
- dev-ada/langkit/langkit-2017.ebuild                |  45 -------
- dev-ada/libadalang/Manifest                        |   1 -
- dev-ada/libadalang/libadalang-2017-r1.ebuild       |  51 --------
- dev-ada/libadalang/libadalang-2017-r2.ebuild       |  59 ---------
- dev-ada/libadalang/libadalang-2018.ebuild          |  59 ---------
- dev-ruby/puppetdb-termini/Manifest                 |   1 -
- .../puppetdb-termini/puppetdb-termini-6.5.0.ebuild |  28 -----
- .../puppetdb-termini/puppetdb-termini-6.7.1.ebuild |   2 +-
- gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild    |   2 +-
- gui-apps/wl-clipboard/wl-clipboard-9999.ebuild     |   2 +-
- net-im/mattermost-desktop-bin/Manifest             |   3 +
- .../mattermost-desktop-bin-4.3.1.ebuild            |  93 ++++++++++++++
- .../openstack-meta-2018.2.9999.ebuild              |  22 ----
- ...9.2.0.ebuild => openstack-meta-2019.2.1.ebuild} |   2 +-
- sys-cluster/swift/Manifest                         |   2 -
- sys-cluster/swift/swift-2.20.0.ebuild              | 122 ------------------
- sys-cluster/swift/swift-2.23.0.ebuild              | 125 -------------------
- sys-cluster/swift/swift-2.23.1.ebuild              |   2 +-
- sys-cluster/swift/swift-2018.2.9999.ebuild         | 122 ------------------
- 38 files changed, 110 insertions(+), 1185 deletions(-)
- delete mode 100644 app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
- delete mode 100644 app-admin/puppet/puppet-6.8.0.ebuild
- delete mode 100644 app-admin/puppetdb/puppetdb-6.5.0.ebuild
- delete mode 100644 app-admin/puppetserver/puppetserver-6.5.0.ebuild
- delete mode 100644 dev-ada/langkit/files/langkit-2017-gentoo.patch
- delete mode 100644 dev-ada/langkit/langkit-2017.ebuild
- delete mode 100644 dev-ada/libadalang/libadalang-2017-r1.ebuild
- delete mode 100644 dev-ada/libadalang/libadalang-2017-r2.ebuild
- delete mode 100644 dev-ada/libadalang/libadalang-2018.ebuild
- delete mode 100644 dev-ruby/puppetdb-termini/puppetdb-termini-6.5.0.ebuild
- create mode 100644 net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.3.1.ebuild
- delete mode 100644 sys-cluster/openstack-meta/openstack-meta-2018.2.9999.ebuild
- rename sys-cluster/openstack-meta/{openstack-meta-2019.2.0.ebuild => openstack-meta-2019.2.1.ebuild} (94%)
- delete mode 100644 sys-cluster/swift/swift-2.20.0.ebuild
- delete mode 100644 sys-cluster/swift/swift-2.23.0.ebuild
- delete mode 100644 sys-cluster/swift/swift-2018.2.9999.ebuild
+   ecd1cce4e90..ea43f795818  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% (15815/94328)
Updating files:  17% (16036/94328)
Updating files:  18% (16980/94328)
Updating files:  19% (17923/94328)
Updating files:  20% (18866/94328)
Updating files:  21% (19809/94328)
Updating files:  22% (20753/94328)
Updating files:  23% (21696/94328)
Updating files:  24% (22639/94328)
Updating files:  25% (23582/94328)
Updating files:  26% (24526/94328)
Updating files:  27% (25469/94328)
Updating files:  28% (26412/94328)
Updating files:  29% (27356/94328)
Updating files:  30% (28299/94328)
Updating files:  31% (29242/94328)
Updating files:  32% (30185/94328)
Updating files:  33% (31129/94328)
Updating files:  34% (32072/94328)
Updating files:  34% (32279/94328)
Updating files:  35% (33015/94328)
Updating files:  36% (33959/94328)
Updating files:  37% (34902/94328)
Updating files:  38% (35845/94328)
Updating files:  39% (36788/94328)
Updating files:  40% (37732/94328)
Updating files:  41% (38675/94328)
Updating files:  42% (39618/94328)
Updating files:  43% (40562/94328)
Updating files:  44% (41505/94328)
Updating files:  45% (42448/94328)
Updating files:  46% (43391/94328)
Updating files:  47% (44335/94328)
Updating files:  48% (45278/94328)
Updating files:  49% (46221/94328)
Updating files:  50% (47164/94328)
Updating files:  51% (48108/94328)
Updating files:  51% (48324/94328)
Updating files:  52% (49051/94328)
Updating files:  53% (49994/94328)
Updating files:  54% (50938/94328)
Updating files:  55% (51881/94328)
Updating files:  56% (52824/94328)
Updating files:  57% (53767/94328)
Updating files:  58% (54711/94328)
Updating files:  59% (55654/94328)
Updating files:  60% (56597/94328)
Updating files:  61% (57541/94328)
Updating files:  62% (58484/94328)
Updating files:  63% (59427/94328)
Updating files:  64% (60370/94328)
Updating files:  65% (61314/94328)
Updating files:  66% (62257/94328)
Updating files:  67% (63200/94328)
Updating files:  67% (63735/94328)
Updating files:  68% (64144/94328)
Updating files:  69% (65087/94328)
Updating files:  70% (66030/94328)
Updating files:  71% (66973/94328)
Updating files:  72% (67917/94328)
Updating files:  73% (68860/94328)
Updating files:  74% (69803/94328)
Updating files:  75% (70746/94328)
Updating files:  76% (71690/94328)
Updating files:  77% (72633/94328)
Updating files:  78% (73576/94328)
Updating files:  79% (74520/94328)
Updating files:  80% (75463/94328)
Updating files:  81% (76406/94328)
Updating files:  81% (76891/94328)
Updating files:  82% (77349/94328)
Updating files:  83% (78293/94328)
Updating files:  84% (79236/94328)
Updating files:  85% (80179/94328)
Updating files:  86% (81123/94328)
Updating files:  87% (82066/94328)
Updating files:  88% (83009/94328)
Updating files:  89% (83952/94328)
Updating files:  90% (84896/94328)
Updating files:  91% (85839/94328)
Updating files:  92% (86782/94328)
Updating files:  93% (87726/94328)
Updating files:  94% (88669/94328)
Updating files:  95% (89612/94328)
Updating files:  96% (90555/94328)
Updating files:  97% (91499/94328)
Updating files:  98% (92442/94328)
Updating files:  98% (93016/94328)
Updating files:  99% (93385/94328)
Updating files: 100% (94328/94328)
Updating files: 100% (94328/94328), 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