diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt index 3d5895075bc1..af9ffa47d37d 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,23 +26,27 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - cddcb516561..13139e37b00 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: 17% (14913/86213)
Updating files: 18% (15519/86213)
Updating files: 19% (16381/86213)
Updating files: 20% (17243/86213)
Updating files: 21% (18105/86213)
Updating files: 22% (18967/86213)
Updating files: 23% (19829/86213)
Updating files: 24% (20692/86213)
Updating files: 25% (21554/86213)
Updating files: 26% (22416/86213)
Updating files: 27% (23278/86213)
Updating files: 28% (24140/86213)
Updating files: 29% (25002/86213)
Updating files: 30% (25864/86213)
Updating files: 31% (26727/86213)
Updating files: 32% (27589/86213)
Updating files: 33% (28451/86213)
Updating files: 34% (29313/86213)
Updating files: 35% (30175/86213)
Updating files: 36% (31037/86213)
Updating files: 37% (31899/86213)
Updating files: 37% (31943/86213)
Updating files: 38% (32761/86213)
Updating files: 39% (33624/86213)
Updating files: 40% (34486/86213)
Updating files: 41% (35348/86213)
Updating files: 42% (36210/86213)
Updating files: 43% (37072/86213)
Updating files: 44% (37934/86213)
Updating files: 45% (38796/86213)
Updating files: 46% (39658/86213)
Updating files: 47% (40521/86213)
Updating files: 48% (41383/86213)
Updating files: 49% (42245/86213)
Updating files: 50% (43107/86213)
Updating files: 51% (43969/86213)
Updating files: 52% (44831/86213)
Updating files: 53% (45693/86213)
Updating files: 54% (46556/86213)
Updating files: 55% (47418/86213)
Updating files: 56% (48280/86213)
Updating files: 56% (48453/86213)
Updating files: 57% (49142/86213)
Updating files: 58% (50004/86213)
Updating files: 59% (50866/86213)
Updating files: 60% (51728/86213)
Updating files: 61% (52590/86213)
Updating files: 62% (53453/86213)
Updating files: 63% (54315/86213)
Updating files: 64% (55177/86213)
Updating files: 65% (56039/86213)
Updating files: 66% (56901/86213)
Updating files: 67% (57763/86213)
Updating files: 68% (58625/86213)
Updating files: 69% (59487/86213)
Updating files: 70% (60350/86213)
Updating files: 71% (61212/86213)
Updating files: 72% (62074/86213)
Updating files: 73% (62936/86213)
Updating files: 74% (63798/86213)
Updating files: 75% (64660/86213)
Updating files: 75% (65520/86213)
Updating files: 76% (65522/86213)
Updating files: 77% (66385/86213)
Updating files: 78% (67247/86213)
Updating files: 79% (68109/86213)
Updating files: 80% (68971/86213)
Updating files: 81% (69833/86213)
Updating files: 82% (70695/86213)
Updating files: 83% (71557/86213)
Updating files: 84% (72419/86213)
Updating files: 85% (73282/86213)
Updating files: 86% (74144/86213)
Updating files: 87% (75006/86213)
Updating files: 88% (75868/86213)
Updating files: 89% (76730/86213)
Updating files: 90% (77592/86213)
Updating files: 91% (78454/86213)
Updating files: 91% (78583/86213)
Updating files: 92% (79316/86213)
Updating files: 93% (80179/86213)
Updating files: 94% (81041/86213)
Updating files: 95% (81903/86213)
Updating files: 96% (82765/86213)
Updating files: 97% (83627/86213)
Updating files: 98% (84489/86213)
Updating files: 99% (85351/86213)
Updating files: 100% (86213/86213)
Updating files: 100% (86213/86213), done. + 13139e37b00..2cc229747d5 master -> origin/master +Updating 13139e37b00..2cc229747d5 +Fast-forward + app-crypt/nitrocli/Manifest | 25 ++++++ + app-crypt/nitrocli/nitrocli-0.3.5.ebuild | 99 ++++++++++++++++++++++ + dev-libs/libgcrypt/Manifest | 2 +- + ...bgcrypt-1.9.0.ebuild => libgcrypt-1.9.1.ebuild} | 5 +- + media-tv/tvbrowser-bin/Manifest | 2 +- + ...bin-4.2.1.ebuild => tvbrowser-bin-4.2.2.ebuild} | 2 +- + net-im/gitter-bin/Manifest | 2 + + ...er-bin-4.1.0.ebuild => gitter-bin-5.0.1.ebuild} | 54 ++++++------ + net-im/gitter-bin/metadata.xml | 3 - + profiles/package.mask | 6 -- + 10 files changed, 157 insertions(+), 43 deletions(-) + create mode 100644 app-crypt/nitrocli/nitrocli-0.3.5.ebuild + rename dev-libs/libgcrypt/{libgcrypt-1.9.0.ebuild => libgcrypt-1.9.1.ebuild} (89%) + rename media-tv/tvbrowser-bin/{tvbrowser-bin-4.2.1.ebuild => tvbrowser-bin-4.2.2.ebuild} (96%) + rename net-im/gitter-bin/{gitter-bin-4.1.0.ebuild => gitter-bin-5.0.1.ebuild} (68%) *** 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 |