summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt29
1 files changed, 15 insertions, 14 deletions
diff --git a/gentoo.txt b/gentoo.txt
index e611acf23380..466c14893617 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -19,21 +19,22 @@ WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoo
-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 --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
-*** syncing gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 38% (33546/87473) Updating files: 39% (34115/87473) Updating files: 40% (34990/87473) Updating files: 41% (35864/87473) Updating files: 42% (36739/87473) Updating files: 43% (37614/87473) Updating files: 44% (38489/87473) Updating files: 45% (39363/87473) Updating files: 46% (40238/87473) Updating files: 47% (41113/87473) Updating files: 48% (41988/87473) Updating files: 49% (42862/87473) Updating files: 50% (43737/87473) Updating files: 51% (44612/87473) Updating files: 52% (45486/87473) Updating files: 53% (46361/87473) Updating files: 54% (47236/87473) Updating files: 55% (48111/87473) Updating files: 56% (48985/87473) Updating files: 57% (49860/87473) Updating files: 58% (50735/87473) Updating files: 59% (51610/87473) Updating files: 60% (52484/87473) Updating files: 61% (53359/87473) Updating files: 62% (54234/87473) Updating files: 63% (55108/87473) Updating files: 64% (55983/87473) Updating files: 65% (56858/87473) Updating files: 66% (57733/87473) Updating files: 67% (58607/87473) Updating files: 68% (59482/87473) Updating files: 69% (60357/87473) Updating files: 70% (61232/87473) Updating files: 71% (62106/87473) Updating files: 72% (62981/87473) Updating files: 73% (63856/87473) Updating files: 74% (64731/87473) Updating files: 75% (65605/87473) Updating files: 76% (66480/87473) Updating files: 77% (67355/87473) Updating files: 78% (68229/87473) Updating files: 79% (69104/87473) Updating files: 79% (69564/87473) Updating files: 80% (69979/87473) Updating files: 81% (70854/87473) Updating files: 82% (71728/87473) Updating files: 83% (72603/87473) Updating files: 84% (73478/87473) Updating files: 85% (74353/87473) Updating files: 86% (75227/87473) Updating files: 87% (76102/87473) Updating files: 88% (76977/87473) Updating files: 89% (77851/87473) Updating files: 90% (78726/87473) Updating files: 91% (79601/87473) Updating files: 92% (80476/87473) Updating files: 93% (81350/87473) Updating files: 94% (82225/87473) Updating files: 95% (83100/87473) Updating files: 96% (83975/87473) Updating files: 97% (84849/87473) Updating files: 98% (85724/87473) Updating files: 99% (86599/87473) Updating files: 100% (87473/87473) Updating files: 100% (87473/87473), done.
+From https://anongit.gentoo.org/git/repo/gentoo
+ 1b40dc15f78..a9c56f2b662 master -> origin/master
+Updating 1b40dc15f78..a9c56f2b662
+Fast-forward
+ .../webalizer-2.23.08-broken-disable-static.patch | 16 ++
+ ...-2.23.08.ebuild => webalizer-2.23.08-r1.ebuild} | 24 +-
+ media-gfx/asymptote/Manifest | 1 +
+ media-gfx/asymptote/asymptote-2.81.ebuild | 242 +++++++++++++++++++++
+ ...-r1.ebuild => Apache-Gallery-1.0_rc3-r2.ebuild} | 17 +-
+ 5 files changed, 280 insertions(+), 20 deletions(-)
+ create mode 100644 app-admin/webalizer/files/webalizer-2.23.08-broken-disable-static.patch
+ rename app-admin/webalizer/{webalizer-2.23.08.ebuild => webalizer-2.23.08-r1.ebuild} (91%)
+ create mode 100644 media-gfx/asymptote/asymptote-2.81.ebuild
+ rename www-apps/Apache-Gallery/{Apache-Gallery-1.0_rc3-r1.ebuild => Apache-Gallery-1.0_rc3-r2.ebuild} (90%)
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo