diff options
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 1d368bfae948..651adeab7de5 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 - cfaa9fe1bd9..b9bc27d1399 master -> origin/master -Updating cfaa9fe1bd9..b9bc27d1399 -Fast-forward - acct-group/ipsec/ipsec-0.ebuild | 10 +++++++++ - acct-group/ipsec/metadata.xml | 7 ++++++ - acct-user/ipsec/ipsec-0.ebuild | 13 +++++++++++ - acct-user/ipsec/metadata.xml | 7 ++++++ - games-strategy/seven-kingdoms/Manifest | 2 +- - .../files/seven-kingdoms-2.15.2-fortify.patch | 26 ---------------------- - .../seven-kingdoms/seven-kingdoms-2.14.7.ebuild | 8 +++++-- - ...15.2.ebuild => seven-kingdoms-2.15.4_p1.ebuild} | 13 ++++++----- - net-vpn/strongswan/Manifest | 2 +- - ...ngswan-5.8.4.ebuild => strongswan-5.9.1.ebuild} | 22 +++++++++--------- - profiles/package.mask | 7 ++++++ - sci-mathematics/agda/agda-2.5.2-r2.ebuild | 9 ++------ - sci-mathematics/agda/metadata.xml | 1 - - 13 files changed, 73 insertions(+), 54 deletions(-) - create mode 100644 acct-group/ipsec/ipsec-0.ebuild - create mode 100644 acct-group/ipsec/metadata.xml - create mode 100644 acct-user/ipsec/ipsec-0.ebuild - create mode 100644 acct-user/ipsec/metadata.xml - delete mode 100644 games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch - rename games-strategy/seven-kingdoms/{seven-kingdoms-2.15.2.ebuild => seven-kingdoms-2.15.4_p1.ebuild} (82%) - rename net-vpn/strongswan/{strongswan-5.8.4.ebuild => strongswan-5.9.1.ebuild} (95%) + b9bc27d1399..ac73470ace4 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% (14163/87446)
Updating files: 17% (14866/87446)
Updating files: 18% (15741/87446)
Updating files: 19% (16615/87446)
Updating files: 20% (17490/87446)
Updating files: 21% (18364/87446)
Updating files: 22% (19239/87446)
Updating files: 23% (20113/87446)
Updating files: 24% (20988/87446)
Updating files: 25% (21862/87446)
Updating files: 26% (22736/87446)
Updating files: 27% (23611/87446)
Updating files: 28% (24485/87446)
Updating files: 29% (25360/87446)
Updating files: 30% (26234/87446)
Updating files: 31% (27109/87446)
Updating files: 32% (27983/87446)
Updating files: 33% (28858/87446)
Updating files: 33% (29168/87446)
Updating files: 34% (29732/87446)
Updating files: 35% (30607/87446)
Updating files: 36% (31481/87446)
Updating files: 37% (32356/87446)
Updating files: 38% (33230/87446)
Updating files: 39% (34104/87446)
Updating files: 40% (34979/87446)
Updating files: 41% (35853/87446)
Updating files: 42% (36728/87446)
Updating files: 43% (37602/87446)
Updating files: 44% (38477/87446)
Updating files: 45% (39351/87446)
Updating files: 46% (40226/87446)
Updating files: 47% (41100/87446)
Updating files: 48% (41975/87446)
Updating files: 49% (42849/87446)
Updating files: 50% (43723/87446)
Updating files: 50% (44121/87446)
Updating files: 51% (44598/87446)
Updating files: 52% (45472/87446)
Updating files: 53% (46347/87446)
Updating files: 54% (47221/87446)
Updating files: 55% (48096/87446)
Updating files: 56% (48970/87446)
Updating files: 57% (49845/87446)
Updating files: 58% (50719/87446)
Updating files: 59% (51594/87446)
Updating files: 60% (52468/87446)
Updating files: 61% (53343/87446)
Updating files: 62% (54217/87446)
Updating files: 63% (55091/87446)
Updating files: 64% (55966/87446)
Updating files: 65% (56840/87446)
Updating files: 66% (57715/87446)
Updating files: 66% (58454/87446)
Updating files: 67% (58589/87446)
Updating files: 68% (59464/87446)
Updating files: 69% (60338/87446)
Updating files: 70% (61213/87446)
Updating files: 71% (62087/87446)
Updating files: 72% (62962/87446)
Updating files: 73% (63836/87446)
Updating files: 74% (64711/87446)
Updating files: 75% (65585/87446)
Updating files: 76% (66459/87446)
Updating files: 77% (67334/87446)
Updating files: 78% (68208/87446)
Updating files: 78% (68372/87446)
Updating files: 79% (69083/87446)
Updating files: 80% (69957/87446)
Updating files: 81% (70832/87446)
Updating files: 82% (71706/87446)
Updating files: 83% (72581/87446)
Updating files: 84% (73455/87446)
Updating files: 85% (74330/87446)
Updating files: 86% (75204/87446)
Updating files: 87% (76079/87446)
Updating files: 88% (76953/87446)
Updating files: 89% (77827/87446)
Updating files: 90% (78702/87446)
Updating files: 91% (79576/87446)
Updating files: 91% (79719/87446)
Updating files: 92% (80451/87446)
Updating files: 93% (81325/87446)
Updating files: 94% (82200/87446)
Updating files: 95% (83074/87446)
Updating files: 96% (83949/87446)
Updating files: 97% (84823/87446)
Updating files: 98% (85698/87446)
Updating files: 99% (86572/87446)
Updating files: 100% (87446/87446)
Updating files: 100% (87446/87446), 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 |