diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/gentoo.txt b/gentoo.txt index 1dc84fdea261..45de1a0b5513 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,36 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - e8d2997ee07..2470da9c388 master -> origin/master -Updating e8d2997ee07..2470da9c388 -Fast-forward - dev-lang/yasm/Manifest | 2 - - .../yasm/files/yasm-1.2.0-fix_cython_check.patch | 23 -------- - dev-lang/yasm/yasm-1.2.0-r1.ebuild | 50 ----------------- - dev-lang/yasm/yasm-1.3.0-r1.ebuild | 65 ++++++++++++++++++++++ - dev-lang/yasm/yasm-9999.ebuild | 30 +++------- - dev-python/zope-configuration/Manifest | 1 + - .../zope-configuration-4.4.0.ebuild | 32 +++++++++++ - dev-python/zope-exceptions/Manifest | 1 + - .../zope-exceptions/zope-exceptions-4.4.ebuild | 34 +++++++++++ - dev-python/zope-i18nmessageid/Manifest | 1 + - .../zope-i18nmessageid-5.0.1.ebuild | 33 +++++++++++ - dev-python/zope-schema/Manifest | 1 + - dev-python/zope-schema/zope-schema-6.0.0.ebuild | 37 ++++++++++++ - dev-python/zope-testrunner/Manifest | 1 + - .../zope-testrunner/zope-testrunner-5.2.ebuild | 35 ++++++++++++ - 15 files changed, 250 insertions(+), 96 deletions(-) - delete mode 100644 dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch - delete mode 100644 dev-lang/yasm/yasm-1.2.0-r1.ebuild - create mode 100644 dev-lang/yasm/yasm-1.3.0-r1.ebuild - create mode 100644 dev-python/zope-configuration/zope-configuration-4.4.0.ebuild - create mode 100644 dev-python/zope-exceptions/zope-exceptions-4.4.ebuild - create mode 100644 dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild - create mode 100644 dev-python/zope-schema/zope-schema-6.0.0.ebuild - create mode 100644 dev-python/zope-testrunner/zope-testrunner-5.2.ebuild + 2470da9c388..0602b1a17b0 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% (15108/89464)
Updating files: 17% (15209/89464)
Updating files: 18% (16104/89464)
Updating files: 19% (16999/89464)
Updating files: 20% (17893/89464)
Updating files: 21% (18788/89464)
Updating files: 22% (19683/89464)
Updating files: 23% (20577/89464)
Updating files: 24% (21472/89464)
Updating files: 25% (22366/89464)
Updating files: 26% (23261/89464)
Updating files: 27% (24156/89464)
Updating files: 28% (25050/89464)
Updating files: 29% (25945/89464)
Updating files: 30% (26840/89464)
Updating files: 31% (27734/89464)
Updating files: 32% (28629/89464)
Updating files: 33% (29524/89464)
Updating files: 34% (30418/89464)
Updating files: 34% (30787/89464)
Updating files: 35% (31313/89464)
Updating files: 36% (32208/89464)
Updating files: 37% (33102/89464)
Updating files: 38% (33997/89464)
Updating files: 39% (34891/89464)
Updating files: 40% (35786/89464)
Updating files: 41% (36681/89464)
Updating files: 42% (37575/89464)
Updating files: 43% (38470/89464)
Updating files: 44% (39365/89464)
Updating files: 45% (40259/89464)
Updating files: 46% (41154/89464)
Updating files: 47% (42049/89464)
Updating files: 48% (42943/89464)
Updating files: 49% (43838/89464)
Updating files: 50% (44732/89464)
Updating files: 51% (45627/89464)
Updating files: 51% (45927/89464)
Updating files: 52% (46522/89464)
Updating files: 53% (47416/89464)
Updating files: 54% (48311/89464)
Updating files: 55% (49206/89464)
Updating files: 56% (50100/89464)
Updating files: 57% (50995/89464)
Updating files: 58% (51890/89464)
Updating files: 59% (52784/89464)
Updating files: 60% (53679/89464)
Updating files: 61% (54574/89464)
Updating files: 62% (55468/89464)
Updating files: 63% (56363/89464)
Updating files: 64% (57257/89464)
Updating files: 65% (58152/89464)
Updating files: 66% (59047/89464)
Updating files: 67% (59941/89464)
Updating files: 68% (60836/89464)
Updating files: 68% (61063/89464)
Updating files: 69% (61731/89464)
Updating files: 70% (62625/89464)
Updating files: 71% (63520/89464)
Updating files: 72% (64415/89464)
Updating files: 73% (65309/89464)
Updating files: 74% (66204/89464)
Updating files: 75% (67098/89464)
Updating files: 76% (67993/89464)
Updating files: 77% (68888/89464)
Updating files: 78% (69782/89464)
Updating files: 79% (70677/89464)
Updating files: 80% (71572/89464)
Updating files: 81% (72466/89464)
Updating files: 81% (72595/89464)
Updating files: 82% (73361/89464)
Updating files: 83% (74256/89464)
Updating files: 84% (75150/89464)
Updating files: 85% (76045/89464)
Updating files: 86% (76940/89464)
Updating files: 87% (77834/89464)
Updating files: 88% (78729/89464)
Updating files: 89% (79623/89464)
Updating files: 90% (80518/89464)
Updating files: 91% (81413/89464)
Updating files: 92% (82307/89464)
Updating files: 93% (83202/89464)
Updating files: 94% (84097/89464)
Updating files: 95% (84991/89464)
Updating files: 96% (85886/89464)
Updating files: 97% (86781/89464)
Updating files: 98% (87675/89464)
Updating files: 98% (88062/89464)
Updating files: 99% (88570/89464)
Updating files: 100% (89464/89464)
Updating files: 100% (89464/89464), 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 |