2020-03-26T21:00:01Z

1 files changed, 15 insertions, 64 deletions

diff --git a/gentoo.txt b/gentoo.txt
index d0bb3f4c4f9f..eef9d2402619 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,72 +13,23 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   86b9a4330cc..9dc859090c6  master     -> origin/master
-Updating 86b9a4330cc..9dc859090c6
-Fast-forward
- .../libadalang/files/libadalang-2019-pyyaml.patch  |  11 +
- dev-ada/libadalang/libadalang-2018-r2.ebuild       |   1 +
- dev-ada/libadalang/libadalang-2019-r1.ebuild       |   5 +-
- net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild     |  35 +++
- net-wireless/gr-ntsc-rc/metadata.xml               |  15 ++
- net-wireless/gr-ntsc/gr-ntsc-9999.ebuild           |  37 ++++
- net-wireless/gr-ntsc/metadata.xml                  |  15 ++
- .../gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild      |  29 +++
- net-wireless/gr-ppm-wiegand/metadata.xml           |  15 ++
- profiles/base/package.use.mask                     |   4 +
- profiles/default/linux/sh/17.0/eapi                |   1 -
- profiles/default/linux/sh/17.0/parent              |   2 -
- profiles/default/linux/sh/eapi                     |   1 -
- profiles/default/linux/sh/parent                   |   3 -
- sys-fs/lvm2/Manifest                               |   5 +-
- sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1        |  25 ---
- sys-fs/lvm2/files/lvm.confd-2.02.28-r2             |   5 -
- sys-fs/lvm2/files/lvm.rc-2.02.105-r2               |  96 --------
- .../files/lvm2-2.02.106-pthread-pkgconfig.patch    |  32 ---
- .../lvm2/files/lvm2-2.02.108-example.conf.in.patch |  50 -----
- .../lvm2-2.02.108-static-pkgconfig-libs.patch      | 104 ---------
- .../lvm2/files/lvm2-2.02.129-example.conf.in.patch |  52 -----
- .../lvm2-2.02.129-static-pkgconfig-libs.patch      | 102 ---------
- .../files/lvm2-2.02.130-pthread-pkgconfig.patch    |  32 ---
- .../lvm2-2.02.139-dynamic-static-ldflags.patch     |  63 ------
- sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch        | 127 -----------
- sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch      |  15 --
- sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2        |  12 -
- sys-fs/lvm2/lvm2-2.02.116.ebuild                   | 243 ---------------------
- ...vm2-2.02.145-r2.ebuild => lvm2-2.02.187.ebuild} | 201 +++++++++--------
- .../{lvm2-2.03.08.ebuild => lvm2-2.03.09.ebuild}   |   0
- sys-fs/lvm2/metadata.xml                           |   1 -
- 32 files changed, 281 insertions(+), 1058 deletions(-)
- create mode 100644 dev-ada/libadalang/files/libadalang-2019-pyyaml.patch
- create mode 100644 net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild
- create mode 100644 net-wireless/gr-ntsc-rc/metadata.xml
- create mode 100644 net-wireless/gr-ntsc/gr-ntsc-9999.ebuild
- create mode 100644 net-wireless/gr-ntsc/metadata.xml
- create mode 100644 net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild
- create mode 100644 net-wireless/gr-ppm-wiegand/metadata.xml
- delete mode 100644 profiles/default/linux/sh/17.0/eapi
- delete mode 100644 profiles/default/linux/sh/17.0/parent
- delete mode 100644 profiles/default/linux/sh/eapi
- delete mode 100644 profiles/default/linux/sh/parent
- delete mode 100644 sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
- delete mode 100644 sys-fs/lvm2/files/lvm.confd-2.02.28-r2
- delete mode 100644 sys-fs/lvm2/files/lvm.rc-2.02.105-r2
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch
- delete mode 100644 sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch
- delete mode 100644 sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
- delete mode 100644 sys-fs/lvm2/lvm2-2.02.116.ebuild
- rename sys-fs/lvm2/{lvm2-2.02.145-r2.ebuild => lvm2-2.02.187.ebuild} (50%)
- rename sys-fs/lvm2/{lvm2-2.03.08.ebuild => lvm2-2.03.09.ebuild} (100%)
+   9dc859090c6..33a6fdfb113  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% (15289/90128)
Updating files:  17% (15322/90128)
Updating files:  18% (16224/90128)
Updating files:  19% (17125/90128)
Updating files:  20% (18026/90128)
Updating files:  21% (18927/90128)
Updating files:  22% (19829/90128)
Updating files:  23% (20730/90128)
Updating files:  24% (21631/90128)
Updating files:  25% (22532/90128)
Updating files:  26% (23434/90128)
Updating files:  27% (24335/90128)
Updating files:  28% (25236/90128)
Updating files:  29% (26138/90128)
Updating files:  30% (27039/90128)
Updating files:  31% (27940/90128)
Updating files:  32% (28841/90128)
Updating files:  33% (29743/90128)
Updating files:  34% (30644/90128)
Updating files:  34% (31071/90128)
Updating files:  35% (31545/90128)
Updating files:  36% (32447/90128)
Updating files:  37% (33348/90128)
Updating files:  38% (34249/90128)
Updating files:  39% (35150/90128)
Updating files:  40% (36052/90128)
Updating files:  41% (36953/90128)
Updating files:  42% (37854/90128)
Updating files:  43% (38756/90128)
Updating files:  44% (39657/90128)
Updating files:  45% (40558/90128)
Updating files:  46% (41459/90128)
Updating files:  47% (42361/90128)
Updating files:  48% (43262/90128)
Updating files:  49% (44163/90128)
Updating files:  50% (45064/90128)
Updating files:  51% (45966/90128)
Updating files:  51% (46698/90128)
Updating files:  52% (46867/90128)
Updating files:  53% (47768/90128)
Updating files:  54% (48670/90128)
Updating files:  55% (49571/90128)
Updating files:  56% (50472/90128)
Updating files:  57% (51373/90128)
Updating files:  58% (52275/90128)
Updating files:  59% (53176/90128)
Updating files:  60% (54077/90128)
Updating files:  61% (54979/90128)
Updating files:  62% (55880/90128)
Updating files:  63% (56781/90128)
Updating files:  64% (57682/90128)
Updating files:  65% (58584/90128)
Updating files:  66% (59485/90128)
Updating files:  67% (60386/90128)
Updating files:  68% (61288/90128)
Updating files:  68% (61882/90128)
Updating files:  69% (62189/90128)
Updating files:  70% (63090/90128)
Updating files:  71% (63991/90128)
Updating files:  72% (64893/90128)
Updating files:  73% (65794/90128)
Updating files:  74% (66695/90128)
Updating files:  75% (67596/90128)
Updating files:  76% (68498/90128)
Updating files:  77% (69399/90128)
Updating files:  78% (70300/90128)
Updating files:  79% (71202/90128)
Updating files:  80% (72103/90128)
Updating files:  81% (73004/90128)
Updating files:  82% (73905/90128)
Updating files:  82% (73915/90128)
Updating files:  83% (74807/90128)
Updating files:  84% (75708/90128)
Updating files:  85% (76609/90128)
Updating files:  86% (77511/90128)
Updating files:  87% (78412/90128)
Updating files:  88% (79313/90128)
Updating files:  89% (80214/90128)
Updating files:  90% (81116/90128)
Updating files:  91% (82017/90128)
Updating files:  92% (82918/90128)
Updating files:  93% (83820/90128)
Updating files:  94% (84721/90128)
Updating files:  95% (85622/90128)
Updating files:  96% (86523/90128)
Updating files:  97% (87425/90128)
Updating files:  98% (88326/90128)
Updating files:  99% (89227/90128)
Updating files:  99% (89467/90128)
Updating files: 100% (90128/90128)
Updating files: 100% (90128/90128), 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