diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-04 18:08:59 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-04 18:08:59 +0000 |
| commit | dea74a29cf4832370f56720dbddcd1fba0221d9d (patch) | |
| tree | 16082abe748da0cc3330bf76b59677c4a5182f9d /gentoo.txt | |
| parent | 2020-10-04T17:30:01Z (diff) | |
| download | repos-dea74a29cf4832370f56720dbddcd1fba0221d9d.tar.gz repos-dea74a29cf4832370f56720dbddcd1fba0221d9d.tar.bz2 repos-dea74a29cf4832370f56720dbddcd1fba0221d9d.zip | |
2020-10-04T18:00:01Z
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/gentoo.txt b/gentoo.txt index b7f7b4857c6d..5f7a5d6de601 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,33 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 72de3acd368..bbae37d1dee master -> origin/master -Updating 72de3acd368..bbae37d1dee -Fast-forward - dev-lang/php/php-7.2.34.ebuild | 2 +- - dev-lang/php/php-7.3.23.ebuild | 2 +- - dev-lang/php/php-7.4.11.ebuild | 2 +- - dev-util/cccc/Manifest | 1 + - dev-util/cccc/cccc-3.1.5-r1.ebuild | 25 ++++---- - dev-util/cccc/cccc-3.1.6.ebuild | 71 +++++++++++++++++++++++ - media-gfx/sam2p/Manifest | 1 + - media-gfx/sam2p/files/sam2p-configure-strip.patch | 30 ++++++++++ - media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild | 62 ++++++++++++++++++++ - media-sound/darkice/Manifest | 1 - - media-sound/darkice/darkice-1.3.ebuild | 54 ----------------- - media-sound/darkice/darkice-1.4.ebuild | 2 +- - sys-fs/mergerfs/Manifest | 1 + - sys-fs/mergerfs/mergerfs-2.31.0.ebuild | 52 +++++++++++++++++ - www-servers/uwsgi/uwsgi-2.0.19.1.ebuild | 2 +- - 15 files changed, 237 insertions(+), 71 deletions(-) - create mode 100644 dev-util/cccc/cccc-3.1.6.ebuild - create mode 100644 media-gfx/sam2p/files/sam2p-configure-strip.patch - create mode 100644 media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild - delete mode 100644 media-sound/darkice/darkice-1.3.ebuild - create mode 100644 sys-fs/mergerfs/mergerfs-2.31.0.ebuild + bbae37d1dee..3315c71b603 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% (14842/87264)
Updating files: 18% (15708/87264)
Updating files: 19% (16581/87264)
Updating files: 20% (17453/87264)
Updating files: 21% (18326/87264)
Updating files: 22% (19199/87264)
Updating files: 23% (20071/87264)
Updating files: 24% (20944/87264)
Updating files: 25% (21816/87264)
Updating files: 26% (22689/87264)
Updating files: 27% (23562/87264)
Updating files: 28% (24434/87264)
Updating files: 29% (25307/87264)
Updating files: 30% (26180/87264)
Updating files: 31% (27052/87264)
Updating files: 32% (27925/87264)
Updating files: 33% (28798/87264)
Updating files: 34% (29670/87264)
Updating files: 34% (30238/87264)
Updating files: 35% (30543/87264)
Updating files: 36% (31416/87264)
Updating files: 37% (32288/87264)
Updating files: 38% (33161/87264)
Updating files: 39% (34033/87264)
Updating files: 40% (34906/87264)
Updating files: 41% (35779/87264)
Updating files: 42% (36651/87264)
Updating files: 43% (37524/87264)
Updating files: 44% (38397/87264)
Updating files: 45% (39269/87264)
Updating files: 46% (40142/87264)
Updating files: 47% (41015/87264)
Updating files: 48% (41887/87264)
Updating files: 49% (42760/87264)
Updating files: 50% (43632/87264)
Updating files: 51% (44505/87264)
Updating files: 51% (44962/87264)
Updating files: 52% (45378/87264)
Updating files: 53% (46250/87264)
Updating files: 54% (47123/87264)
Updating files: 55% (47996/87264)
Updating files: 56% (48868/87264)
Updating files: 57% (49741/87264)
Updating files: 58% (50614/87264)
Updating files: 59% (51486/87264)
Updating files: 60% (52359/87264)
Updating files: 61% (53232/87264)
Updating files: 62% (54104/87264)
Updating files: 63% (54977/87264)
Updating files: 64% (55849/87264)
Updating files: 65% (56722/87264)
Updating files: 66% (57595/87264)
Updating files: 67% (58467/87264)
Updating files: 68% (59340/87264)
Updating files: 68% (60001/87264)
Updating files: 69% (60213/87264)
Updating files: 70% (61085/87264)
Updating files: 71% (61958/87264)
Updating files: 72% (62831/87264)
Updating files: 73% (63703/87264)
Updating files: 74% (64576/87264)
Updating files: 75% (65448/87264)
Updating files: 76% (66321/87264)
Updating files: 77% (67194/87264)
Updating files: 78% (68066/87264)
Updating files: 79% (68939/87264)
Updating files: 80% (69812/87264)
Updating files: 81% (70684/87264)
Updating files: 82% (71557/87264)
Updating files: 82% (71628/87264)
Updating files: 83% (72430/87264)
Updating files: 84% (73302/87264)
Updating files: 85% (74175/87264)
Updating files: 86% (75048/87264)
Updating files: 87% (75920/87264)
Updating files: 88% (76793/87264)
Updating files: 89% (77665/87264)
Updating files: 90% (78538/87264)
Updating files: 91% (79411/87264)
Updating files: 92% (80283/87264)
Updating files: 93% (81156/87264)
Updating files: 94% (82029/87264)
Updating files: 95% (82901/87264)
Updating files: 96% (83774/87264)
Updating files: 97% (84647/87264)
Updating files: 98% (85519/87264)
Updating files: 99% (86392/87264)
Updating files: 100% (87264/87264)
Updating files: 100% (87264/87264), 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 |