diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt index c60eef088fed..262ed8c40a62 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,23 +26,33 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 9b78ac75fc0..926e99276cd 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% (14553/86267)
Updating files: 17% (14666/86267)
Updating files: 18% (15529/86267)
Updating files: 19% (16391/86267)
Updating files: 20% (17254/86267)
Updating files: 21% (18117/86267)
Updating files: 22% (18979/86267)
Updating files: 23% (19842/86267)
Updating files: 24% (20705/86267)
Updating files: 25% (21567/86267)
Updating files: 26% (22430/86267)
Updating files: 27% (23293/86267)
Updating files: 28% (24155/86267)
Updating files: 29% (25018/86267)
Updating files: 30% (25881/86267)
Updating files: 31% (26743/86267)
Updating files: 32% (27606/86267)
Updating files: 33% (28469/86267)
Updating files: 34% (29331/86267)
Updating files: 34% (30165/86267)
Updating files: 35% (30194/86267)
Updating files: 36% (31057/86267)
Updating files: 37% (31919/86267)
Updating files: 38% (32782/86267)
Updating files: 39% (33645/86267)
Updating files: 40% (34507/86267)
Updating files: 41% (35370/86267)
Updating files: 42% (36233/86267)
Updating files: 43% (37095/86267)
Updating files: 44% (37958/86267)
Updating files: 45% (38821/86267)
Updating files: 46% (39683/86267)
Updating files: 47% (40546/86267)
Updating files: 48% (41409/86267)
Updating files: 49% (42271/86267)
Updating files: 50% (43134/86267)
Updating files: 51% (43997/86267)
Updating files: 52% (44859/86267)
Updating files: 53% (45722/86267)
Updating files: 54% (46585/86267)
Updating files: 55% (47447/86267)
Updating files: 55% (47567/86267)
Updating files: 56% (48310/86267)
Updating files: 57% (49173/86267)
Updating files: 58% (50035/86267)
Updating files: 59% (50898/86267)
Updating files: 60% (51761/86267)
Updating files: 61% (52623/86267)
Updating files: 62% (53486/86267)
Updating files: 63% (54349/86267)
Updating files: 64% (55211/86267)
Updating files: 65% (56074/86267)
Updating files: 66% (56937/86267)
Updating files: 67% (57799/86267)
Updating files: 68% (58662/86267)
Updating files: 69% (59525/86267)
Updating files: 70% (60387/86267)
Updating files: 71% (61250/86267)
Updating files: 72% (62113/86267)
Updating files: 73% (62975/86267)
Updating files: 74% (63838/86267)
Updating files: 75% (64701/86267)
Updating files: 75% (65043/86267)
Updating files: 76% (65563/86267)
Updating files: 77% (66426/86267)
Updating files: 78% (67289/86267)
Updating files: 79% (68151/86267)
Updating files: 80% (69014/86267)
Updating files: 81% (69877/86267)
Updating files: 82% (70739/86267)
Updating files: 83% (71602/86267)
Updating files: 84% (72465/86267)
Updating files: 85% (73327/86267)
Updating files: 86% (74190/86267)
Updating files: 87% (75053/86267)
Updating files: 88% (75915/86267)
Updating files: 89% (76778/86267)
Updating files: 90% (77641/86267)
Updating files: 90% (77719/86267)
Updating files: 91% (78503/86267)
Updating files: 92% (79366/86267)
Updating files: 93% (80229/86267)
Updating files: 94% (81091/86267)
Updating files: 95% (81954/86267)
Updating files: 96% (82817/86267)
Updating files: 97% (83679/86267)
Updating files: 98% (84542/86267)
Updating files: 99% (85405/86267)
Updating files: 100% (86267/86267)
Updating files: 100% (86267/86267), done. + 926e99276cd..2ec8dcc0f9f master -> origin/master +Updating 926e99276cd..2ec8dcc0f9f +Fast-forward + app-office/ledger/Manifest | 1 - + app-office/ledger/ledger-3.2.0.ebuild | 113 -------------- + app-office/ledger/ledger-3.2.1.ebuild | 4 +- + ...t-1.15.1-r1.ebuild => cppunit-1.15.1-r2.ebuild} | 10 +- + .../cppunit/files/cppunit-1.15.1-slibtool.patch | 12 -- + eclass/dune.eclass | 3 + + .../stone-soup/stone-soup-0.25.1-r1.ebuild | 171 --------------------- + .../stone-soup/stone-soup-0.25.1-r100.ebuild | 4 +- + media-sound/sc2mpd/Manifest | 6 - + media-sound/sc2mpd/sc2mpd-1.1.5.ebuild | 115 -------------- + media-sound/sc2mpd/sc2mpd-1.1.7.ebuild | 4 +- + media-sound/upmpdcli/Manifest | 1 - + media-sound/upmpdcli/upmpdcli-1.5.2.ebuild | 49 ------ + media-sound/upmpdcli/upmpdcli-1.5.5.ebuild | 4 +- + 14 files changed, 14 insertions(+), 483 deletions(-) + delete mode 100644 app-office/ledger/ledger-3.2.0.ebuild + rename dev-util/cppunit/{cppunit-1.15.1-r1.ebuild => cppunit-1.15.1-r2.ebuild} (92%) + delete mode 100644 dev-util/cppunit/files/cppunit-1.15.1-slibtool.patch + delete mode 100644 games-roguelike/stone-soup/stone-soup-0.25.1-r1.ebuild + delete mode 100644 media-sound/sc2mpd/sc2mpd-1.1.5.ebuild + delete mode 100644 media-sound/upmpdcli/upmpdcli-1.5.2.ebuild *** 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 |