diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/gentoo.txt b/gentoo.txt index a4e10706c548..7910d9ae093a 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -29,30 +29,22 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 78fcaa1eb2e..d94e775b318 master -> origin/master -Updating 78fcaa1eb2e..d94e775b318 -Fast-forward - dev-lang/vala/Manifest | 6 - - ...0.40-Allow-disabling-the-build-of-valadoc.patch | 184 ------------------ - ...valadoc-doclets-data-parallel-installable.patch | 212 --------------------- - dev-lang/vala/vala-0.36.20.ebuild | 38 ---- - dev-lang/vala/vala-0.40.24.ebuild | 54 ------ - dev-lang/vala/vala-0.50.2.ebuild | 49 ----- - dev-lang/vala/vala-0.52.2.ebuild | 52 ----- - dev-libs/vala-common/Manifest | 2 - - dev-libs/vala-common/vala-common-0.50.2.ebuild | 30 --- - dev-libs/vala-common/vala-common-0.52.2.ebuild | 29 --- - 10 files changed, 656 deletions(-) - delete mode 100644 dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch - delete mode 100644 dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch - delete mode 100644 dev-lang/vala/vala-0.36.20.ebuild - delete mode 100644 dev-lang/vala/vala-0.40.24.ebuild - delete mode 100644 dev-lang/vala/vala-0.50.2.ebuild - delete mode 100644 dev-lang/vala/vala-0.52.2.ebuild - delete mode 100644 dev-libs/vala-common/vala-common-0.50.2.ebuild - delete mode 100644 dev-libs/vala-common/vala-common-0.52.2.ebuild + d94e775b318..6fe4f8e9847 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> + +!!! failed syncing gentoo + * Sync failed with 1 + * Will try to re-create +$ pmaint sync gentoo +*** syncing gentoo +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 16% (14410/85936)
Updating files: 17% (14610/85936)
Updating files: 18% (15469/85936)
Updating files: 19% (16328/85936)
Updating files: 20% (17188/85936)
Updating files: 21% (18047/85936)
Updating files: 22% (18906/85936)
Updating files: 23% (19766/85936)
Updating files: 24% (20625/85936)
Updating files: 25% (21484/85936)
Updating files: 26% (22344/85936)
Updating files: 27% (23203/85936)
Updating files: 28% (24063/85936)
Updating files: 29% (24922/85936)
Updating files: 30% (25781/85936)
Updating files: 31% (26641/85936)
Updating files: 32% (27500/85936)
Updating files: 33% (28359/85936)
Updating files: 34% (29219/85936)
Updating files: 35% (30078/85936)
Updating files: 36% (30937/85936)
Updating files: 37% (31797/85936)
Updating files: 37% (32055/85936)
Updating files: 38% (32656/85936)
Updating files: 39% (33516/85936)
Updating files: 40% (34375/85936)
Updating files: 41% (35234/85936)
Updating files: 42% (36094/85936)
Updating files: 43% (36953/85936)
Updating files: 44% (37812/85936)
Updating files: 45% (38672/85936)
Updating files: 46% (39531/85936)
Updating files: 47% (40390/85936)
Updating files: 48% (41250/85936)
Updating files: 49% (42109/85936)
Updating files: 50% (42968/85936)
Updating files: 51% (43828/85936)
Updating files: 52% (44687/85936)
Updating files: 53% (45547/85936)
Updating files: 54% (46406/85936)
Updating files: 54% (46563/85936)
Updating files: 55% (47265/85936)
Updating files: 56% (48125/85936)
Updating files: 57% (48984/85936)
Updating files: 58% (49843/85936)
Updating files: 59% (50703/85936)
Updating files: 60% (51562/85936)
Updating files: 61% (52421/85936)
Updating files: 62% (53281/85936)
Updating files: 63% (54140/85936)
Updating files: 64% (55000/85936)
Updating files: 65% (55859/85936)
Updating files: 66% (56718/85936)
Updating files: 67% (57578/85936)
Updating files: 68% (58437/85936)
Updating files: 69% (59296/85936)
Updating files: 70% (60156/85936)
Updating files: 70% (61010/85936)
Updating files: 71% (61015/85936)
Updating files: 72% (61874/85936)
Updating files: 73% (62734/85936)
Updating files: 74% (63593/85936)
Updating files: 75% (64452/85936)
Updating files: 76% (65312/85936)
Updating files: 77% (66171/85936)
Updating files: 78% (67031/85936)
Updating files: 79% (67890/85936)
Updating files: 80% (68749/85936)
Updating files: 81% (69609/85936)
Updating files: 82% (70468/85936)
Updating files: 83% (71327/85936)
Updating files: 83% (71694/85936)
Updating files: 84% (72187/85936)
Updating files: 85% (73046/85936)
Updating files: 86% (73905/85936)
Updating files: 87% (74765/85936)
Updating files: 88% (75624/85936)
Updating files: 89% (76484/85936)
Updating files: 90% (77343/85936)
Updating files: 91% (78202/85936)
Updating files: 92% (79062/85936)
Updating files: 93% (79921/85936)
Updating files: 94% (80780/85936)
Updating files: 95% (81640/85936)
Updating files: 96% (82499/85936)
Updating files: 97% (83358/85936)
Updating files: 98% (84218/85936)
Updating files: 99% (85077/85936)
Updating files: 100% (85936/85936)
Updating files: 100% (85936/85936), done. *** 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 32 gentoo |