diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt index 70bfff691242..5eb5665b3674 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,23 +26,30 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - ab8cd0d32bf..136f9f16655 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: 15% (13879/88820)
Updating files: 16% (14212/88820)
Updating files: 17% (15100/88820)
Updating files: 18% (15988/88820)
Updating files: 19% (16876/88820)
Updating files: 20% (17764/88820)
Updating files: 21% (18653/88820)
Updating files: 22% (19541/88820)
Updating files: 23% (20429/88820)
Updating files: 24% (21317/88820)
Updating files: 25% (22205/88820)
Updating files: 26% (23094/88820)
Updating files: 27% (23982/88820)
Updating files: 28% (24870/88820)
Updating files: 29% (25758/88820)
Updating files: 30% (26646/88820)
Updating files: 31% (27535/88820)
Updating files: 32% (28423/88820)
Updating files: 32% (28519/88820)
Updating files: 33% (29311/88820)
Updating files: 34% (30199/88820)
Updating files: 35% (31087/88820)
Updating files: 36% (31976/88820)
Updating files: 37% (32864/88820)
Updating files: 38% (33752/88820)
Updating files: 39% (34640/88820)
Updating files: 40% (35528/88820)
Updating files: 41% (36417/88820)
Updating files: 42% (37305/88820)
Updating files: 43% (38193/88820)
Updating files: 44% (39081/88820)
Updating files: 45% (39969/88820)
Updating files: 46% (40858/88820)
Updating files: 47% (41746/88820)
Updating files: 47% (42556/88820)
Updating files: 48% (42634/88820)
Updating files: 49% (43522/88820)
Updating files: 50% (44410/88820)
Updating files: 51% (45299/88820)
Updating files: 52% (46187/88820)
Updating files: 53% (47075/88820)
Updating files: 54% (47963/88820)
Updating files: 55% (48851/88820)
Updating files: 56% (49740/88820)
Updating files: 57% (50628/88820)
Updating files: 58% (51516/88820)
Updating files: 59% (52404/88820)
Updating files: 60% (53292/88820)
Updating files: 61% (54181/88820)
Updating files: 62% (55069/88820)
Updating files: 62% (55124/88820)
Updating files: 63% (55957/88820)
Updating files: 64% (56845/88820)
Updating files: 65% (57733/88820)
Updating files: 66% (58622/88820)
Updating files: 67% (59510/88820)
Updating files: 68% (60398/88820)
Updating files: 69% (61286/88820)
Updating files: 70% (62174/88820)
Updating files: 71% (63063/88820)
Updating files: 72% (63951/88820)
Updating files: 73% (64839/88820)
Updating files: 74% (65727/88820)
Updating files: 74% (66467/88820)
Updating files: 75% (66615/88820)
Updating files: 76% (67504/88820)
Updating files: 77% (68392/88820)
Updating files: 78% (69280/88820)
Updating files: 79% (70168/88820)
Updating files: 80% (71056/88820)
Updating files: 81% (71945/88820)
Updating files: 82% (72833/88820)
Updating files: 83% (73721/88820)
Updating files: 84% (74609/88820)
Updating files: 85% (75497/88820)
Updating files: 86% (76386/88820)
Updating files: 87% (77274/88820)
Updating files: 88% (78162/88820)
Updating files: 89% (79050/88820)
Updating files: 90% (79938/88820)
Updating files: 90% (80363/88820)
Updating files: 91% (80827/88820)
Updating files: 92% (81715/88820)
Updating files: 93% (82603/88820)
Updating files: 94% (83491/88820)
Updating files: 95% (84379/88820)
Updating files: 96% (85268/88820)
Updating files: 97% (86156/88820)
Updating files: 98% (87044/88820)
Updating files: 99% (87932/88820)
Updating files: 100% (88820/88820)
Updating files: 100% (88820/88820), done. + 136f9f16655..adcae1c8aa0 master -> origin/master +Updating 136f9f16655..adcae1c8aa0 +Fast-forward + app-office/lyx/lyx-2.3.3.ebuild | 1 - + app-office/lyx/lyx-2.3.5.2.ebuild | 1 - + dev-libs/check/check-0.15.2.ebuild | 2 +- + dev-python/hypothesis/hypothesis-5.24.4.ebuild | 2 +- + eclass/chromium-2.eclass | 4 +- + eclass/edos2unix.eclass | 21 +++ + eclass/eutils.eclass | 179 +++------------------ + eclass/gnome2.eclass | 2 +- + eclass/l10n.eclass | 54 ++++++- + eclass/mate.eclass | 4 +- + eclass/toolchain.eclass | 77 +++++---- + eclass/wrapper.eclass | 59 +++++++ + media-sound/lash/lash-0.5.4-r4.ebuild | 2 +- + .../heirloom-tools/heirloom-tools-070715-r3.ebuild | 8 + + sys-libs/db/db-5.3.28-r4.ebuild | 2 +- + 15 files changed, 212 insertions(+), 206 deletions(-) + create mode 100644 eclass/edos2unix.eclass + create mode 100644 eclass/wrapper.eclass *** syncing gentoo *** synced gentoo - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo |