diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/gentoo.txt b/gentoo.txt index 74c1db00fcfa..e9d3ff3fe0b3 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,34 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - b127bce894a..2545f7f471d master -> origin/master -Updating b127bce894a..2545f7f471d -Fast-forward - app-admin/ansible/Manifest | 1 - - app-admin/ansible/ansible-2.10.0.ebuild | 3 +- - app-admin/ansible/ansible-2.9.12.ebuild | 70 ---------------------- - app-admin/ansible/ansible-2.9.13.ebuild | 5 +- - .../galaxy/files/galaxy-2.2-makefile.patch | 61 +++++++++++++++++++ - sci-astronomy/galaxy/galaxy-2.2-r1.ebuild | 27 ++------- - sci-libs/libecpint/Manifest | 1 + - sci-libs/libecpint/libecpint-1.0.2.ebuild | 26 ++++++++ - sci-libs/libecpint/metadata.xml | 17 ++++++ - sci-libs/xylib/Manifest | 2 +- - sci-libs/xylib/xylib-1.2.ebuild | 30 ---------- - sci-libs/xylib/xylib-1.6.ebuild | 42 +++++++++++++ - sci-mathematics/geomview/geomview-1.9.5-r1.ebuild | 29 +++++---- - sci-visualization/fityk/fityk-1.3.1.ebuild | 39 ++++-------- - 14 files changed, 186 insertions(+), 167 deletions(-) - delete mode 100644 app-admin/ansible/ansible-2.9.12.ebuild - create mode 100644 sci-astronomy/galaxy/files/galaxy-2.2-makefile.patch - create mode 100644 sci-libs/libecpint/Manifest - create mode 100644 sci-libs/libecpint/libecpint-1.0.2.ebuild - create mode 100644 sci-libs/libecpint/metadata.xml - delete mode 100644 sci-libs/xylib/xylib-1.2.ebuild - create mode 100644 sci-libs/xylib/xylib-1.6.ebuild + 2545f7f471d..cb0ddafdc0d 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% (14561/87314)
Updating files: 17% (14844/87314)
Updating files: 18% (15717/87314)
Updating files: 19% (16590/87314)
Updating files: 20% (17463/87314)
Updating files: 21% (18336/87314)
Updating files: 22% (19210/87314)
Updating files: 23% (20083/87314)
Updating files: 24% (20956/87314)
Updating files: 25% (21829/87314)
Updating files: 26% (22702/87314)
Updating files: 27% (23575/87314)
Updating files: 28% (24448/87314)
Updating files: 29% (25322/87314)
Updating files: 30% (26195/87314)
Updating files: 31% (27068/87314)
Updating files: 32% (27941/87314)
Updating files: 33% (28814/87314)
Updating files: 33% (29261/87314)
Updating files: 34% (29687/87314)
Updating files: 35% (30560/87314)
Updating files: 36% (31434/87314)
Updating files: 37% (32307/87314)
Updating files: 38% (33180/87314)
Updating files: 39% (34053/87314)
Updating files: 40% (34926/87314)
Updating files: 41% (35799/87314)
Updating files: 42% (36672/87314)
Updating files: 43% (37546/87314)
Updating files: 44% (38419/87314)
Updating files: 45% (39292/87314)
Updating files: 46% (40165/87314)
Updating files: 47% (41038/87314)
Updating files: 48% (41911/87314)
Updating files: 49% (42784/87314)
Updating files: 50% (43657/87314)
Updating files: 50% (44086/87314)
Updating files: 51% (44531/87314)
Updating files: 52% (45404/87314)
Updating files: 53% (46277/87314)
Updating files: 54% (47150/87314)
Updating files: 55% (48023/87314)
Updating files: 56% (48896/87314)
Updating files: 57% (49769/87314)
Updating files: 58% (50643/87314)
Updating files: 59% (51516/87314)
Updating files: 60% (52389/87314)
Updating files: 61% (53262/87314)
Updating files: 62% (54135/87314)
Updating files: 63% (55008/87314)
Updating files: 64% (55881/87314)
Updating files: 65% (56755/87314)
Updating files: 66% (57628/87314)
Updating files: 67% (58501/87314)
Updating files: 67% (59085/87314)
Updating files: 68% (59374/87314)
Updating files: 69% (60247/87314)
Updating files: 70% (61120/87314)
Updating files: 71% (61993/87314)
Updating files: 72% (62867/87314)
Updating files: 73% (63740/87314)
Updating files: 74% (64613/87314)
Updating files: 75% (65486/87314)
Updating files: 76% (66359/87314)
Updating files: 77% (67232/87314)
Updating files: 78% (68105/87314)
Updating files: 79% (68979/87314)
Updating files: 80% (69852/87314)
Updating files: 81% (70725/87314)
Updating files: 81% (70924/87314)
Updating files: 82% (71598/87314)
Updating files: 83% (72471/87314)
Updating files: 84% (73344/87314)
Updating files: 85% (74217/87314)
Updating files: 86% (75091/87314)
Updating files: 87% (75964/87314)
Updating files: 88% (76837/87314)
Updating files: 89% (77710/87314)
Updating files: 90% (78583/87314)
Updating files: 91% (79456/87314)
Updating files: 92% (80329/87314)
Updating files: 93% (81203/87314)
Updating files: 94% (82076/87314)
Updating files: 95% (82949/87314)
Updating files: 96% (83822/87314)
Updating files: 97% (84695/87314)
Updating files: 98% (85568/87314)
Updating files: 98% (86408/87314)
Updating files: 99% (86441/87314)
Updating files: 100% (87314/87314)
Updating files: 100% (87314/87314), 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 |