diff options
Diffstat (limited to 'gentoo.txt')
-rw-r--r-- | gentoo.txt | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/gentoo.txt b/gentoo.txt index 5e6182a02ca9..a54dfc9154a5 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -28,35 +28,21 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -From https://anongit.gentoo.org/git/repo/gentoo - c1b2240a8ab..6a15801ff56 master -> origin/master -Updating c1b2240a8ab..6a15801ff56 -Fast-forward - app-admin/logcheck/Manifest | 1 + - app-admin/logcheck/logcheck-1.3.23.ebuild | 65 +++++++ - app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild | 46 +++++ - app-admin/tenshi/tenshi-0.17-r1.ebuild | 42 +++++ - app-backup/backuppc/backuppc-3.3.1-r6.ebuild | 196 +++++++++++++++++++++ - .../files/3.2.0/04-add-docdir-marker.patch | 4 +- - app-backup/backuppc/files/3.2.0/05-nicelevel.patch | 8 +- - .../backuppc/files/3.3.0/01-fix-configure.pl.patch | 4 +- - .../files/3.3.0/02-fix-config.pl-formatting.patch | 4 +- - .../3.3.0/03-reasonable-config.pl-defaults.patch | 4 +- - .../backuppc/files/backuppc-3.3.1-perl522.patch | 4 +- - .../backuppc/files/backuppc-3.3.1-perl526.patch | 4 +- - .../gnupg-pkcs11-scd-0.9.2-r1.ebuild | 49 ++++++ - ...tary-0.6.1-r1.ebuild => notary-0.6.1-r2.ebuild} | 16 +- - ...roonga-8.0.2.ebuild => groonga-8.0.2-r1.ebuild} | 32 ++-- - 15 files changed, 438 insertions(+), 41 deletions(-) - create mode 100644 app-admin/logcheck/logcheck-1.3.23.ebuild - create mode 100644 app-admin/logsurfer+/logsurfer+-1.8-r4.ebuild - create mode 100644 app-admin/tenshi/tenshi-0.17-r1.ebuild - create mode 100644 app-backup/backuppc/backuppc-3.3.1-r6.ebuild - create mode 100644 app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild - rename app-misc/notary/{notary-0.6.1-r1.ebuild => notary-0.6.1-r2.ebuild} (90%) - rename app-text/groonga/{groonga-8.0.2.ebuild => groonga-8.0.2-r1.ebuild} (92%) +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> + +!!! failed syncing gentoo + * Sync failed with 1 + * Will try to re-create +$ pmaint sync gentoo +*** syncing gentoo +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 19% (16928/85739)
Updating files: 20% (17148/85739)
Updating files: 21% (18006/85739)
Updating files: 22% (18863/85739)
Updating files: 23% (19720/85739)
Updating files: 24% (20578/85739)
Updating files: 25% (21435/85739)
Updating files: 26% (22293/85739)
Updating files: 27% (23150/85739)
Updating files: 28% (24007/85739)
Updating files: 29% (24865/85739)
Updating files: 30% (25722/85739)
Updating files: 31% (26580/85739)
Updating files: 32% (27437/85739)
Updating files: 33% (28294/85739)
Updating files: 34% (29152/85739)
Updating files: 35% (30009/85739)
Updating files: 36% (30867/85739)
Updating files: 37% (31724/85739)
Updating files: 38% (32581/85739)
Updating files: 38% (33181/85739)
Updating files: 39% (33439/85739)
Updating files: 40% (34296/85739)
Updating files: 41% (35153/85739)
Updating files: 42% (36011/85739)
Updating files: 43% (36868/85739)
Updating files: 44% (37726/85739)
Updating files: 45% (38583/85739)
Updating files: 46% (39440/85739)
Updating files: 47% (40298/85739)
Updating files: 48% (41155/85739)
Updating files: 49% (42013/85739)
Updating files: 50% (42870/85739)
Updating files: 51% (43727/85739)
Updating files: 52% (44585/85739)
Updating files: 53% (45442/85739)
Updating files: 54% (46300/85739)
Updating files: 55% (47157/85739)
Updating files: 56% (48014/85739)
Updating files: 57% (48872/85739)
Updating files: 58% (49729/85739)
Updating files: 58% (49734/85739)
Updating files: 59% (50587/85739)
Updating files: 60% (51444/85739)
Updating files: 61% (52301/85739)
Updating files: 62% (53159/85739)
Updating files: 63% (54016/85739)
Updating files: 64% (54873/85739)
Updating files: 65% (55731/85739)
Updating files: 66% (56588/85739)
Updating files: 67% (57446/85739)
Updating files: 68% (58303/85739)
Updating files: 69% (59160/85739)
Updating files: 70% (60018/85739)
Updating files: 71% (60875/85739)
Updating files: 72% (61733/85739)
Updating files: 73% (62590/85739)
Updating files: 74% (63447/85739)
Updating files: 75% (64305/85739)
Updating files: 76% (65162/85739)
Updating files: 76% (65996/85739)
Updating files: 77% (66020/85739)
Updating files: 78% (66877/85739)
Updating files: 79% (67734/85739)
Updating files: 80% (68592/85739)
Updating files: 81% (69449/85739)
Updating files: 82% (70306/85739)
Updating files: 83% (71164/85739)
Updating files: 84% (72021/85739)
Updating files: 85% (72879/85739)
Updating files: 86% (73736/85739)
Updating files: 87% (74593/85739)
Updating files: 88% (75451/85739)
Updating files: 89% (76308/85739)
Updating files: 90% (77166/85739)
Updating files: 90% (77928/85739)
Updating files: 91% (78023/85739)
Updating files: 92% (78880/85739)
Updating files: 93% (79738/85739)
Updating files: 94% (80595/85739)
Updating files: 95% (81453/85739)
Updating files: 96% (82310/85739)
Updating files: 97% (83167/85739)
Updating files: 98% (84025/85739)
Updating files: 99% (84882/85739)
Updating files: 100% (85739/85739)
Updating files: 100% (85739/85739), done. *** 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 32 gentoo |