diff options
author | 2020-10-01 12:12:16 +0000 | |
---|---|---|
committer | 2020-10-01 12:12:16 +0000 | |
commit | b87576217024df07a200fb37659b4417116e9492 (patch) | |
tree | f67c0d3bfc52919f87cf14aa8a6753ff3b95f889 /gentoo.txt | |
parent | 2020-10-01T11:30:01Z (diff) | |
download | repos-b87576217024df07a200fb37659b4417116e9492.tar.gz repos-b87576217024df07a200fb37659b4417116e9492.tar.bz2 repos-b87576217024df07a200fb37659b4417116e9492.zip |
2020-10-01T12:00:01Z
Diffstat (limited to 'gentoo.txt')
-rw-r--r-- | gentoo.txt | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/gentoo.txt b/gentoo.txt index c0131790eaa2..04d1bd00b570 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,32 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - af4838195c6..3bfda681c33 master -> origin/master -Updating af4838195c6..3bfda681c33 -Fast-forward - app-arch/rpm/Manifest | 1 + - app-arch/rpm/files/rpm-4.16.0-autotools.patch | 13 ++ - app-arch/rpm/files/rpm-4.16.0-libdir.patch | 34 +++++ - app-arch/rpm/rpm-4.16.0.ebuild | 139 +++++++++++++++++++++ - dev-db/opendbx/opendbx-1.4.6-r3.ebuild | 4 +- - dev-db/sqlite/sqlite-3.33.0.ebuild | 2 +- - dev-libs/nspr/nspr-4.28.ebuild | 2 +- - dev-libs/nss/nss-3.56.ebuild | 2 +- - dev-python/ipython/ipython-7.18.1.ebuild | 2 +- - dev-vcs/fossil/fossil-2.12.1.ebuild | 2 +- - .../files/manaplus-1.9.3.23-metainfo.patch | 38 ++++++ - ...1.9.3.23.ebuild => manaplus-1.9.3.23-r1.ebuild} | 12 +- - mail-filter/opendkim/opendkim-2.10.3-r18.ebuild | 2 +- - x11-libs/libva/libva-2.7.1.ebuild | 2 +- - 14 files changed, 242 insertions(+), 13 deletions(-) - create mode 100644 app-arch/rpm/files/rpm-4.16.0-autotools.patch - create mode 100644 app-arch/rpm/files/rpm-4.16.0-libdir.patch - create mode 100644 app-arch/rpm/rpm-4.16.0.ebuild - create mode 100644 games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch - rename games-rpg/manaplus/{manaplus-1.9.3.23.ebuild => manaplus-1.9.3.23-r1.ebuild} (97%) + 3bfda681c33..bfca3a6e227 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% (14969/87229)
Updating files: 18% (15702/87229)
Updating files: 19% (16574/87229)
Updating files: 20% (17446/87229)
Updating files: 21% (18319/87229)
Updating files: 22% (19191/87229)
Updating files: 23% (20063/87229)
Updating files: 24% (20935/87229)
Updating files: 25% (21808/87229)
Updating files: 26% (22680/87229)
Updating files: 27% (23552/87229)
Updating files: 28% (24425/87229)
Updating files: 29% (25297/87229)
Updating files: 30% (26169/87229)
Updating files: 31% (27041/87229)
Updating files: 32% (27914/87229)
Updating files: 33% (28786/87229)
Updating files: 34% (29658/87229)
Updating files: 34% (30521/87229)
Updating files: 35% (30531/87229)
Updating files: 36% (31403/87229)
Updating files: 37% (32275/87229)
Updating files: 38% (33148/87229)
Updating files: 39% (34020/87229)
Updating files: 40% (34892/87229)
Updating files: 41% (35764/87229)
Updating files: 42% (36637/87229)
Updating files: 43% (37509/87229)
Updating files: 44% (38381/87229)
Updating files: 45% (39254/87229)
Updating files: 46% (40126/87229)
Updating files: 47% (40998/87229)
Updating files: 48% (41870/87229)
Updating files: 49% (42743/87229)
Updating files: 50% (43615/87229)
Updating files: 51% (44487/87229)
Updating files: 51% (45171/87229)
Updating files: 52% (45360/87229)
Updating files: 53% (46232/87229)
Updating files: 54% (47104/87229)
Updating files: 55% (47976/87229)
Updating files: 56% (48849/87229)
Updating files: 57% (49721/87229)
Updating files: 58% (50593/87229)
Updating files: 59% (51466/87229)
Updating files: 60% (52338/87229)
Updating files: 61% (53210/87229)
Updating files: 62% (54082/87229)
Updating files: 63% (54955/87229)
Updating files: 64% (55827/87229)
Updating files: 65% (56699/87229)
Updating files: 66% (57572/87229)
Updating files: 67% (58444/87229)
Updating files: 68% (59316/87229)
Updating files: 69% (60189/87229)
Updating files: 69% (60359/87229)
Updating files: 70% (61061/87229)
Updating files: 71% (61933/87229)
Updating files: 72% (62805/87229)
Updating files: 73% (63678/87229)
Updating files: 74% (64550/87229)
Updating files: 75% (65422/87229)
Updating files: 76% (66295/87229)
Updating files: 77% (67167/87229)
Updating files: 78% (68039/87229)
Updating files: 79% (68911/87229)
Updating files: 80% (69784/87229)
Updating files: 81% (70656/87229)
Updating files: 82% (71528/87229)
Updating files: 82% (71892/87229)
Updating files: 83% (72401/87229)
Updating files: 84% (73273/87229)
Updating files: 85% (74145/87229)
Updating files: 86% (75017/87229)
Updating files: 87% (75890/87229)
Updating files: 88% (76762/87229)
Updating files: 89% (77634/87229)
Updating files: 90% (78507/87229)
Updating files: 91% (79379/87229)
Updating files: 92% (80251/87229)
Updating files: 93% (81123/87229)
Updating files: 94% (81996/87229)
Updating files: 95% (82868/87229)
Updating files: 96% (83740/87229)
Updating files: 97% (84613/87229)
Updating files: 98% (85485/87229)
Updating files: 99% (86357/87229)
Updating files: 100% (87229/87229)
Updating files: 100% (87229/87229), 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 |