diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/gentoo.txt b/gentoo.txt index 1c4cb5568326..e8eb3a4c071d 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,37 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 786eb9359d9..2cade485025 master -> origin/master -Updating 786eb9359d9..2cade485025 -Fast-forward - app-text/poppler/Manifest | 1 - - app-text/poppler/poppler-20.10.0.ebuild | 124 ------------ - dev-libs/isl/Manifest | 1 + - dev-libs/isl/isl-0.23.ebuild | 51 +++++ - dev-util/cmake/Manifest | 1 - - dev-util/cmake/cmake-3.18.3.ebuild | 214 --------------------- - media-gfx/digikam/Manifest | 1 - - media-gfx/digikam/digikam-6.4.0-r1.ebuild | 155 --------------- - media-gfx/digikam/files/digikam-6.3.0-cmake.patch | 66 ------- - .../digikam/files/digikam-6.4.0-qt-5.15.patch | 38 ---- - media-gfx/digikam/metadata.xml | 3 - - profiles/base/package.use.stable.mask | 4 +- - profiles/package.mask | 6 + - sci-libs/arpack/Manifest | 2 - - sci-libs/arpack/arpack-3.1.5.ebuild | 64 ------ - sci-libs/arpack/arpack-3.5.0.ebuild | 62 ------ - 16 files changed, 59 insertions(+), 734 deletions(-) - delete mode 100644 app-text/poppler/poppler-20.10.0.ebuild - create mode 100644 dev-libs/isl/isl-0.23.ebuild - delete mode 100644 dev-util/cmake/cmake-3.18.3.ebuild - delete mode 100644 media-gfx/digikam/digikam-6.4.0-r1.ebuild - delete mode 100644 media-gfx/digikam/files/digikam-6.3.0-cmake.patch - delete mode 100644 media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch - delete mode 100644 sci-libs/arpack/arpack-3.1.5.ebuild - delete mode 100644 sci-libs/arpack/arpack-3.5.0.ebuild + 2cade485025..d428c50a040 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% (14662/87444)
Updating files: 17% (14866/87444)
Updating files: 18% (15740/87444)
Updating files: 19% (16615/87444)
Updating files: 20% (17489/87444)
Updating files: 21% (18364/87444)
Updating files: 22% (19238/87444)
Updating files: 23% (20113/87444)
Updating files: 24% (20987/87444)
Updating files: 25% (21861/87444)
Updating files: 26% (22736/87444)
Updating files: 27% (23610/87444)
Updating files: 28% (24485/87444)
Updating files: 29% (25359/87444)
Updating files: 30% (26234/87444)
Updating files: 31% (27108/87444)
Updating files: 32% (27983/87444)
Updating files: 33% (28857/87444)
Updating files: 34% (29731/87444)
Updating files: 34% (30204/87444)
Updating files: 35% (30606/87444)
Updating files: 36% (31480/87444)
Updating files: 37% (32355/87444)
Updating files: 38% (33229/87444)
Updating files: 39% (34104/87444)
Updating files: 40% (34978/87444)
Updating files: 41% (35853/87444)
Updating files: 42% (36727/87444)
Updating files: 43% (37601/87444)
Updating files: 44% (38476/87444)
Updating files: 45% (39350/87444)
Updating files: 46% (40225/87444)
Updating files: 47% (41099/87444)
Updating files: 48% (41974/87444)
Updating files: 49% (42848/87444)
Updating files: 50% (43722/87444)
Updating files: 51% (44597/87444)
Updating files: 51% (44906/87444)
Updating files: 52% (45471/87444)
Updating files: 53% (46346/87444)
Updating files: 54% (47220/87444)
Updating files: 55% (48095/87444)
Updating files: 56% (48969/87444)
Updating files: 57% (49844/87444)
Updating files: 58% (50718/87444)
Updating files: 59% (51592/87444)
Updating files: 60% (52467/87444)
Updating files: 61% (53341/87444)
Updating files: 62% (54216/87444)
Updating files: 63% (55090/87444)
Updating files: 64% (55965/87444)
Updating files: 65% (56839/87444)
Updating files: 66% (57714/87444)
Updating files: 67% (58588/87444)
Updating files: 68% (59462/87444)
Updating files: 68% (60024/87444)
Updating files: 69% (60337/87444)
Updating files: 70% (61211/87444)
Updating files: 71% (62086/87444)
Updating files: 72% (62960/87444)
Updating files: 73% (63835/87444)
Updating files: 74% (64709/87444)
Updating files: 75% (65583/87444)
Updating files: 76% (66458/87444)
Updating files: 77% (67332/87444)
Updating files: 78% (68207/87444)
Updating files: 79% (69081/87444)
Updating files: 80% (69956/87444)
Updating files: 81% (70830/87444)
Updating files: 81% (71535/87444)
Updating files: 82% (71705/87444)
Updating files: 83% (72579/87444)
Updating files: 84% (73453/87444)
Updating files: 85% (74328/87444)
Updating files: 86% (75202/87444)
Updating files: 87% (76077/87444)
Updating files: 88% (76951/87444)
Updating files: 89% (77826/87444)
Updating files: 90% (78700/87444)
Updating files: 91% (79575/87444)
Updating files: 92% (80449/87444)
Updating files: 93% (81323/87444)
Updating files: 94% (82198/87444)
Updating files: 95% (83072/87444)
Updating files: 96% (83947/87444)
Updating files: 97% (84821/87444)
Updating files: 98% (85696/87444)
Updating files: 98% (86232/87444)
Updating files: 99% (86570/87444)
Updating files: 100% (87444/87444)
Updating files: 100% (87444/87444), 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 |