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 98be3cd50a95..76fcd40c7a55 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,31 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - de9ac583f2c..7afe180b7d5 master -> origin/master -Updating de9ac583f2c..7afe180b7d5 -Fast-forward - app-office/libreoffice-l10n/Manifest | 168 ++++++ - .../libreoffice-l10n-7.0.3.1.ebuild | 91 ++++ - app-office/libreoffice/Manifest | 3 + - .../libreoffice-7.0.3.1-fix-non-pdfium-build.patch | 31 ++ - app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 592 +++++++++++++++++++++ - dev-util/goland/Manifest | 2 +- - ...land-2020.1.3.ebuild => goland-2020.2.3.ebuild} | 0 - profiles/base/package.use.mask | 4 + - www-client/google-chrome-beta/Manifest | 2 +- - ...uild => google-chrome-beta-87.0.4280.66.ebuild} | 0 - www-plugins/chrome-binary-plugins/Manifest | 2 +- - ...chrome-binary-plugins-87.0.4280.66_beta.ebuild} | 0 - 12 files changed, 892 insertions(+), 3 deletions(-) - create mode 100644 app-office/libreoffice-l10n/libreoffice-l10n-7.0.3.1.ebuild - create mode 100644 app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch - create mode 100644 app-office/libreoffice/libreoffice-7.0.3.1.ebuild - rename dev-util/goland/{goland-2020.1.3.ebuild => goland-2020.2.3.ebuild} (100%) - rename www-client/google-chrome-beta/{google-chrome-beta-87.0.4280.63.ebuild => google-chrome-beta-87.0.4280.66.ebuild} (100%) - rename www-plugins/chrome-binary-plugins/{chrome-binary-plugins-87.0.4280.63_beta.ebuild => chrome-binary-plugins-87.0.4280.66_beta.ebuild} (100%) + 7afe180b7d5..6bd789cac61 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% (14842/87355)
Updating files: 17% (14851/87355)
Updating files: 18% (15724/87355)
Updating files: 19% (16598/87355)
Updating files: 20% (17471/87355)
Updating files: 21% (18345/87355)
Updating files: 22% (19219/87355)
Updating files: 23% (20092/87355)
Updating files: 24% (20966/87355)
Updating files: 25% (21839/87355)
Updating files: 26% (22713/87355)
Updating files: 27% (23586/87355)
Updating files: 28% (24460/87355)
Updating files: 29% (25333/87355)
Updating files: 30% (26207/87355)
Updating files: 31% (27081/87355)
Updating files: 32% (27954/87355)
Updating files: 33% (28828/87355)
Updating files: 34% (29701/87355)
Updating files: 34% (30544/87355)
Updating files: 35% (30575/87355)
Updating files: 36% (31448/87355)
Updating files: 37% (32322/87355)
Updating files: 38% (33195/87355)
Updating files: 39% (34069/87355)
Updating files: 40% (34942/87355)
Updating files: 41% (35816/87355)
Updating files: 42% (36690/87355)
Updating files: 43% (37563/87355)
Updating files: 44% (38437/87355)
Updating files: 45% (39310/87355)
Updating files: 46% (40184/87355)
Updating files: 47% (41057/87355)
Updating files: 48% (41931/87355)
Updating files: 49% (42804/87355)
Updating files: 50% (43678/87355)
Updating files: 51% (44552/87355)
Updating files: 52% (45425/87355)
Updating files: 52% (45451/87355)
Updating files: 53% (46299/87355)
Updating files: 54% (47172/87355)
Updating files: 55% (48046/87355)
Updating files: 56% (48919/87355)
Updating files: 57% (49793/87355)
Updating files: 58% (50666/87355)
Updating files: 59% (51540/87355)
Updating files: 60% (52413/87355)
Updating files: 61% (53287/87355)
Updating files: 62% (54161/87355)
Updating files: 63% (55034/87355)
Updating files: 64% (55908/87355)
Updating files: 65% (56781/87355)
Updating files: 66% (57655/87355)
Updating files: 67% (58528/87355)
Updating files: 68% (59402/87355)
Updating files: 69% (60275/87355)
Updating files: 69% (60636/87355)
Updating files: 70% (61149/87355)
Updating files: 71% (62023/87355)
Updating files: 72% (62896/87355)
Updating files: 73% (63770/87355)
Updating files: 74% (64643/87355)
Updating files: 75% (65517/87355)
Updating files: 76% (66390/87355)
Updating files: 77% (67264/87355)
Updating files: 78% (68137/87355)
Updating files: 79% (69011/87355)
Updating files: 80% (69884/87355)
Updating files: 81% (70758/87355)
Updating files: 82% (71632/87355)
Updating files: 82% (72022/87355)
Updating files: 83% (72505/87355)
Updating files: 84% (73379/87355)
Updating files: 85% (74252/87355)
Updating files: 86% (75126/87355)
Updating files: 87% (75999/87355)
Updating files: 88% (76873/87355)
Updating files: 89% (77746/87355)
Updating files: 90% (78620/87355)
Updating files: 91% (79494/87355)
Updating files: 92% (80367/87355)
Updating files: 93% (81241/87355)
Updating files: 94% (82114/87355)
Updating files: 95% (82988/87355)
Updating files: 96% (83861/87355)
Updating files: 97% (84735/87355)
Updating files: 98% (85608/87355)
Updating files: 99% (86482/87355)
Updating files: 99% (87341/87355)
Updating files: 100% (87355/87355)
Updating files: 100% (87355/87355), 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 |