diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-08-16 21:40:21 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-08-16 21:40:21 +0000 |
| commit | f3299a9c504ea57a40cd26ba769d5565f982b68f (patch) | |
| tree | 699bd02e8c812fe78a011bbd4f352046ba55ea3b /gentoo.txt | |
| parent | 2020-08-16T21:00:01Z (diff) | |
| download | repos-f3299a9c504ea57a40cd26ba769d5565f982b68f.tar.gz repos-f3299a9c504ea57a40cd26ba769d5565f982b68f.tar.bz2 repos-f3299a9c504ea57a40cd26ba769d5565f982b68f.zip | |
2020-08-16T21:30: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 ba1777061fee..61f81c49581d 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 - f07a8172e5b..e14213a0eff master -> origin/master -Updating f07a8172e5b..e14213a0eff -Fast-forward - ...esearch-1.3-r2.ebuild => esearch-1.3-r3.ebuild} | 5 +- - .../esearch/files/1.3-updatedb-quoting.patch | 39 ++++++++++ - ....0_alpha1.ebuild => kodi-19.0_alpha1-r1.ebuild} | 2 + - media-tv/kodi/kodi-19.9999.ebuild | 2 + - media-tv/kodi/kodi-9999.ebuild | 2 + - profiles/package.mask | 8 +++ - sci-biology/bedtools/Manifest | 3 +- - sci-biology/bedtools/bedtools-2.26.0.ebuild | 44 ------------ - sci-biology/bedtools/bedtools-2.29.2.ebuild | 48 +++++++++++++ - .../files/bedtools-2.29.2-buildsystem.patch | 82 ++++++++++++++++++++++ - .../bedtools/files/bedtools-2.29.2-python.patch | 41 +++++++++++ - .../files/bedtools-2.29.2-samtools-1.10.patch | 13 ++++ - 12 files changed, 241 insertions(+), 48 deletions(-) - rename app-portage/esearch/{esearch-1.3-r2.ebuild => esearch-1.3-r3.ebuild} (94%) - create mode 100644 app-portage/esearch/files/1.3-updatedb-quoting.patch - rename media-tv/kodi/{kodi-19.0_alpha1.ebuild => kodi-19.0_alpha1-r1.ebuild} (98%) - delete mode 100644 sci-biology/bedtools/bedtools-2.26.0.ebuild - create mode 100644 sci-biology/bedtools/bedtools-2.29.2.ebuild - create mode 100644 sci-biology/bedtools/files/bedtools-2.29.2-buildsystem.patch - create mode 100644 sci-biology/bedtools/files/bedtools-2.29.2-python.patch - create mode 100644 sci-biology/bedtools/files/bedtools-2.29.2-samtools-1.10.patch + e14213a0eff..cf0b0d69d8a 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% (15666/89444)
Updating files: 18% (16100/89444)
Updating files: 19% (16995/89444)
Updating files: 20% (17889/89444)
Updating files: 21% (18784/89444)
Updating files: 22% (19678/89444)
Updating files: 23% (20573/89444)
Updating files: 24% (21467/89444)
Updating files: 25% (22361/89444)
Updating files: 26% (23256/89444)
Updating files: 27% (24150/89444)
Updating files: 28% (25045/89444)
Updating files: 29% (25939/89444)
Updating files: 30% (26834/89444)
Updating files: 31% (27728/89444)
Updating files: 32% (28623/89444)
Updating files: 33% (29517/89444)
Updating files: 34% (30411/89444)
Updating files: 35% (31306/89444)
Updating files: 36% (32200/89444)
Updating files: 36% (32298/89444)
Updating files: 37% (33095/89444)
Updating files: 38% (33989/89444)
Updating files: 39% (34884/89444)
Updating files: 40% (35778/89444)
Updating files: 41% (36673/89444)
Updating files: 42% (37567/89444)
Updating files: 43% (38461/89444)
Updating files: 44% (39356/89444)
Updating files: 45% (40250/89444)
Updating files: 46% (41145/89444)
Updating files: 47% (42039/89444)
Updating files: 48% (42934/89444)
Updating files: 49% (43828/89444)
Updating files: 50% (44722/89444)
Updating files: 51% (45617/89444)
Updating files: 52% (46511/89444)
Updating files: 53% (47406/89444)
Updating files: 54% (48300/89444)
Updating files: 55% (49195/89444)
Updating files: 55% (49722/89444)
Updating files: 56% (50089/89444)
Updating files: 57% (50984/89444)
Updating files: 58% (51878/89444)
Updating files: 59% (52772/89444)
Updating files: 60% (53667/89444)
Updating files: 61% (54561/89444)
Updating files: 62% (55456/89444)
Updating files: 63% (56350/89444)
Updating files: 64% (57245/89444)
Updating files: 65% (58139/89444)
Updating files: 66% (59034/89444)
Updating files: 67% (59928/89444)
Updating files: 68% (60822/89444)
Updating files: 69% (61717/89444)
Updating files: 70% (62611/89444)
Updating files: 71% (63506/89444)
Updating files: 72% (64400/89444)
Updating files: 73% (65295/89444)
Updating files: 74% (66189/89444)
Updating files: 74% (66198/89444)
Updating files: 75% (67083/89444)
Updating files: 76% (67978/89444)
Updating files: 77% (68872/89444)
Updating files: 78% (69767/89444)
Updating files: 79% (70661/89444)
Updating files: 80% (71556/89444)
Updating files: 81% (72450/89444)
Updating files: 82% (73345/89444)
Updating files: 83% (74239/89444)
Updating files: 84% (75133/89444)
Updating files: 85% (76028/89444)
Updating files: 86% (76922/89444)
Updating files: 87% (77817/89444)
Updating files: 87% (78128/89444)
Updating files: 88% (78711/89444)
Updating files: 89% (79606/89444)
Updating files: 90% (80500/89444)
Updating files: 91% (81395/89444)
Updating files: 92% (82289/89444)
Updating files: 93% (83183/89444)
Updating files: 94% (84078/89444)
Updating files: 95% (84972/89444)
Updating files: 96% (85867/89444)
Updating files: 97% (86761/89444)
Updating files: 98% (87656/89444)
Updating files: 99% (88550/89444)
Updating files: 100% (89444/89444)
Updating files: 100% (89444/89444), 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 |