summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-01-23 12:38:47 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-01-23 12:38:47 +0000
commitb3471eeaa57f0dd3ac271183a6a1ef56e149ed3e (patch)
treed89046f2747d419c93a760d9d165fa1bc2933404 /gentoo.txt
parent2021-01-23T11:00:01Z (diff)
downloadrepos-b3471eeaa57f0dd3ac271183a6a1ef56e149ed3e.tar.gz
repos-b3471eeaa57f0dd3ac271183a6a1ef56e149ed3e.tar.bz2
repos-b3471eeaa57f0dd3ac271183a6a1ef56e149ed3e.zip
2021-01-23T12:00:01Z
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt68
1 files changed, 15 insertions, 53 deletions
diff --git a/gentoo.txt b/gentoo.txt
index b1e68de2add..0ae2f7ec508 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,61 +26,23 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 8c9605e3532..20328c8cd97 master -> origin/master
-Updating 8c9605e3532..20328c8cd97
-Fast-forward
- app-backup/amanda/amanda-3.5.1-r3.ebuild | 2 +
- app-backup/amanda/files/amanda-3.5.1-tirpc.patch | 16 +++++
- dev-python/ubelt/Manifest | 1 -
- dev-python/ubelt/ubelt-0.9.1.ebuild | 27 --------
- gnustep-apps/pikopixel/Manifest | 3 +-
- ...beta9-r1.ebuild => pikopixel-1.0_beta10.ebuild} | 10 ++-
- .../pikopixel/pikopixel-1.0_beta9-r2.ebuild | 22 -------
- .../pikopixel/pikopixel-1.0_beta9-r3.ebuild | 22 -------
- ...-4.93.0.4-r1.ebuild => exim-4.93.0.4-r2.ebuild} | 6 +-
- .../{exim-4.94-r1.ebuild => exim-4.94-r2.ebuild} | 6 +-
- media-libs/libheif/Manifest | 1 +
- media-libs/libheif/libheif-1.10.0.ebuild | 72 ++++++++++++++++++++++
- media-libs/libheif/libheif-9999.ebuild | 23 ++++---
- media-libs/libheif/metadata.xml | 4 ++
- ...h-8.1_p1-r4.ebuild => openssh-8.1_p1-r5.ebuild} | 4 +-
- ...h-8.2_p1-r7.ebuild => openssh-8.2_p1-r8.ebuild} | 4 +-
- ...h-8.3_p1-r5.ebuild => openssh-8.3_p1-r6.ebuild} | 4 +-
- ...h-8.4_p1-r2.ebuild => openssh-8.4_p1-r3.ebuild} | 4 +-
- profiles/arch/arm/armv6j/package.use.mask | 4 ++
- profiles/arch/arm/armv7a/package.use.mask | 4 ++
- profiles/arch/arm/package.use.mask | 4 ++
- sci-calculators/qalculate-gtk/Manifest | 1 +
- .../qalculate-gtk/qalculate-gtk-3.16.0.ebuild | 36 +++++++++++
- sci-libs/libqalculate/Manifest | 1 +
- sci-libs/libqalculate/libqalculate-3.16.1.ebuild | 65 +++++++++++++++++++
- sys-fs/mtd-utils/Manifest | 2 -
- .../files/mtd-utils-1.5.2-sysmacros.patch | 32 ----------
- sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild | 65 -------------------
- sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild | 60 ------------------
- ...{cronie-1.5.5.ebuild => cronie-1.5.5-r1.ebuild} | 7 ++-
- 30 files changed, 254 insertions(+), 258 deletions(-)
- create mode 100644 app-backup/amanda/files/amanda-3.5.1-tirpc.patch
- delete mode 100644 dev-python/ubelt/ubelt-0.9.1.ebuild
- rename gnustep-apps/pikopixel/{pikopixel-1.0_beta9-r1.ebuild => pikopixel-1.0_beta10.ebuild} (58%)
- delete mode 100644 gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
- delete mode 100644 gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
- rename mail-mta/exim/{exim-4.93.0.4-r1.ebuild => exim-4.93.0.4-r2.ebuild} (99%)
- rename mail-mta/exim/{exim-4.94-r1.ebuild => exim-4.94-r2.ebuild} (99%)
- create mode 100644 media-libs/libheif/libheif-1.10.0.ebuild
- rename net-misc/openssh/{openssh-8.1_p1-r4.ebuild => openssh-8.1_p1-r5.ebuild} (99%)
- rename net-misc/openssh/{openssh-8.2_p1-r7.ebuild => openssh-8.2_p1-r8.ebuild} (99%)
- rename net-misc/openssh/{openssh-8.3_p1-r5.ebuild => openssh-8.3_p1-r6.ebuild} (99%)
- rename net-misc/openssh/{openssh-8.4_p1-r2.ebuild => openssh-8.4_p1-r3.ebuild} (99%)
- create mode 100644 sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
- create mode 100644 sci-libs/libqalculate/libqalculate-3.16.1.ebuild
- delete mode 100644 sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
- delete mode 100644 sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
- delete mode 100644 sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
- rename sys-process/cronie/{cronie-1.5.5.ebuild => cronie-1.5.5-r1.ebuild} (95%)
+ 20328c8cd97..5736ced70b9 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: 20% (17935/86260) Updating files: 21% (18115/86260) Updating files: 22% (18978/86260) Updating files: 23% (19840/86260) Updating files: 24% (20703/86260) Updating files: 25% (21565/86260) Updating files: 26% (22428/86260) Updating files: 27% (23291/86260) Updating files: 28% (24153/86260) Updating files: 29% (25016/86260) Updating files: 30% (25878/86260) Updating files: 31% (26741/86260) Updating files: 32% (27604/86260) Updating files: 33% (28466/86260) Updating files: 34% (29329/86260) Updating files: 35% (30191/86260) Updating files: 36% (31054/86260) Updating files: 37% (31917/86260) Updating files: 38% (32779/86260) Updating files: 39% (33642/86260) Updating files: 40% (34504/86260) Updating files: 41% (35367/86260) Updating files: 41% (36195/86260) Updating files: 42% (36230/86260) Updating files: 43% (37092/86260) Updating files: 44% (37955/86260) Updating files: 45% (38817/86260) Updating files: 46% (39680/86260) Updating files: 47% (40543/86260) Updating files: 48% (41405/86260) Updating files: 49% (42268/86260) Updating files: 50% (43130/86260) Updating files: 51% (43993/86260) Updating files: 52% (44856/86260) Updating files: 53% (45718/86260) Updating files: 54% (46581/86260) Updating files: 55% (47443/86260) Updating files: 56% (48306/86260) Updating files: 57% (49169/86260) Updating files: 58% (50031/86260) Updating files: 58% (50685/86260) Updating files: 59% (50894/86260) Updating files: 60% (51756/86260) Updating files: 61% (52619/86260) Updating files: 62% (53482/86260) Updating files: 63% (54344/86260) Updating files: 64% (55207/86260) Updating files: 65% (56069/86260) Updating files: 66% (56932/86260) Updating files: 67% (57795/86260) Updating files: 68% (58657/86260) Updating files: 69% (59520/86260) Updating files: 70% (60382/86260) Updating files: 71% (61245/86260) Updating files: 72% (62108/86260) Updating files: 73% (62970/86260) Updating files: 74% (63833/86260) Updating files: 75% (64695/86260) Updating files: 75% (65222/86260) Updating files: 76% (65558/86260) Updating files: 77% (66421/86260) Updating files: 78% (67283/86260) Updating files: 79% (68146/86260) Updating files: 80% (69008/86260) Updating files: 81% (69871/86260) Updating files: 82% (70734/86260) Updating files: 83% (71596/86260) Updating files: 84% (72459/86260) Updating files: 85% (73321/86260) Updating files: 86% (74184/86260) Updating files: 87% (75047/86260) Updating files: 88% (75909/86260) Updating files: 88% (76416/86260) Updating files: 89% (76772/86260) Updating files: 90% (77634/86260) Updating files: 91% (78497/86260) Updating files: 92% (79360/86260) Updating files: 93% (80222/86260) Updating files: 94% (81085/86260) Updating files: 95% (81947/86260) Updating files: 96% (82810/86260) Updating files: 97% (83673/86260) Updating files: 98% (84535/86260) Updating files: 99% (85398/86260) Updating files: 100% (86260/86260) Updating files: 100% (86260/86260), 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