2020-07-26T01:00:01Z

1 files changed, 15 insertions, 56 deletions

diff --git a/gentoo.txt b/gentoo.txt
index b66be0c0e514..12958dc3ce00 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,64 +13,23 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   f8bfc9b4917..57df63dd15e  master     -> origin/master
-Updating f8bfc9b4917..57df63dd15e
-Fast-forward
- dev-db/mariadb/Manifest                            |   11 -
- ...10.1.38-r1.ebuild => mariadb-10.1.38-r2.ebuild} |    8 +-
- ...db-10.1.43.ebuild => mariadb-10.1.43-r1.ebuild} |    8 +-
- dev-db/mariadb/mariadb-10.1.44-r1.ebuild           |  950 ------------------
- ...db-10.1.45.ebuild => mariadb-10.1.45-r1.ebuild} |    6 +-
- ...10.2.22-r1.ebuild => mariadb-10.2.22-r2.ebuild} |    8 +-
- ...db-10.2.29.ebuild => mariadb-10.2.29-r1.ebuild} |    8 +-
- dev-db/mariadb/mariadb-10.2.31-r1.ebuild           | 1029 -------------------
- ...db-10.2.32.ebuild => mariadb-10.2.32-r1.ebuild} |    6 +-
- dev-db/mariadb/mariadb-10.3.20.ebuild              |  985 ------------------
- dev-db/mariadb/mariadb-10.3.22-r1.ebuild           | 1032 -------------------
- ...db-10.3.23.ebuild => mariadb-10.3.23-r1.ebuild} |    6 +-
- dev-db/mariadb/mariadb-10.4.10.ebuild              | 1015 -------------------
- dev-db/mariadb/mariadb-10.4.12.ebuild              | 1059 --------------------
- ...db-10.4.13.ebuild => mariadb-10.4.13-r1.ebuild} |    6 +-
- dev-db/mariadb/mariadb-5.5.66.ebuild               |  835 ---------------
- dev-db/mariadb/mariadb-5.5.67.ebuild               |  835 ---------------
- ...iadb-5.5.68.ebuild => mariadb-5.5.68-r1.ebuild} |    6 +-
- dev-db/mysql/Manifest                              |    1 -
- dev-db/mysql/files/my.cnf-5.6                      |  139 ---
- dev-db/mysql/mysql-5.6.45-r2.ebuild                |  855 ----------------
- ...sql-5.7.27-r1.ebuild => mysql-5.7.27-r2.ebuild} |    3 +-
- ...{mysql-5.7.29.ebuild => mysql-5.7.29-r1.ebuild} |    3 +-
- ...{mysql-5.7.30.ebuild => mysql-5.7.30-r1.ebuild} |    3 +-
- ...sql-8.0.19-r1.ebuild => mysql-8.0.19-r2.ebuild} |    3 +-
- ...{mysql-8.0.20.ebuild => mysql-8.0.20-r1.ebuild} |    3 +-
- profiles/package.mask                              |    5 -
- 27 files changed, 59 insertions(+), 8769 deletions(-)
- rename dev-db/mariadb/{mariadb-10.1.38-r1.ebuild => mariadb-10.1.38-r2.ebuild} (99%)
- rename dev-db/mariadb/{mariadb-10.1.43.ebuild => mariadb-10.1.43-r1.ebuild} (99%)
- delete mode 100644 dev-db/mariadb/mariadb-10.1.44-r1.ebuild
- rename dev-db/mariadb/{mariadb-10.1.45.ebuild => mariadb-10.1.45-r1.ebuild} (99%)
- rename dev-db/mariadb/{mariadb-10.2.22-r1.ebuild => mariadb-10.2.22-r2.ebuild} (99%)
- rename dev-db/mariadb/{mariadb-10.2.29.ebuild => mariadb-10.2.29-r1.ebuild} (99%)
- delete mode 100644 dev-db/mariadb/mariadb-10.2.31-r1.ebuild
- rename dev-db/mariadb/{mariadb-10.2.32.ebuild => mariadb-10.2.32-r1.ebuild} (99%)
- delete mode 100644 dev-db/mariadb/mariadb-10.3.20.ebuild
- delete mode 100644 dev-db/mariadb/mariadb-10.3.22-r1.ebuild
- rename dev-db/mariadb/{mariadb-10.3.23.ebuild => mariadb-10.3.23-r1.ebuild} (99%)
- delete mode 100644 dev-db/mariadb/mariadb-10.4.10.ebuild
- delete mode 100644 dev-db/mariadb/mariadb-10.4.12.ebuild
- rename dev-db/mariadb/{mariadb-10.4.13.ebuild => mariadb-10.4.13-r1.ebuild} (99%)
- delete mode 100644 dev-db/mariadb/mariadb-5.5.66.ebuild
- delete mode 100644 dev-db/mariadb/mariadb-5.5.67.ebuild
- rename dev-db/mariadb/{mariadb-5.5.68.ebuild => mariadb-5.5.68-r1.ebuild} (99%)
- delete mode 100644 dev-db/mysql/files/my.cnf-5.6
- delete mode 100644 dev-db/mysql/mysql-5.6.45-r2.ebuild
- rename dev-db/mysql/{mysql-5.7.27-r1.ebuild => mysql-5.7.27-r2.ebuild} (99%)
- rename dev-db/mysql/{mysql-5.7.29.ebuild => mysql-5.7.29-r1.ebuild} (99%)
- rename dev-db/mysql/{mysql-5.7.30.ebuild => mysql-5.7.30-r1.ebuild} (99%)
- rename dev-db/mysql/{mysql-8.0.19-r1.ebuild => mysql-8.0.19-r2.ebuild} (99%)
- rename dev-db/mysql/{mysql-8.0.20.ebuild => mysql-8.0.20-r1.ebuild} (99%)
+   57df63dd15e..313af6816c7  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:  15% (14119/88357)
Updating files:  16% (14138/88357)
Updating files:  17% (15021/88357)
Updating files:  18% (15905/88357)
Updating files:  19% (16788/88357)
Updating files:  20% (17672/88357)
Updating files:  21% (18555/88357)
Updating files:  22% (19439/88357)
Updating files:  23% (20323/88357)
Updating files:  24% (21206/88357)
Updating files:  25% (22090/88357)
Updating files:  26% (22973/88357)
Updating files:  27% (23857/88357)
Updating files:  28% (24740/88357)
Updating files:  29% (25624/88357)
Updating files:  30% (26508/88357)
Updating files:  31% (27391/88357)
Updating files:  32% (28275/88357)
Updating files:  33% (29158/88357)
Updating files:  33% (30010/88357)
Updating files:  34% (30042/88357)
Updating files:  35% (30925/88357)
Updating files:  36% (31809/88357)
Updating files:  37% (32693/88357)
Updating files:  38% (33576/88357)
Updating files:  39% (34460/88357)
Updating files:  40% (35343/88357)
Updating files:  41% (36227/88357)
Updating files:  42% (37110/88357)
Updating files:  43% (37994/88357)
Updating files:  44% (38878/88357)
Updating files:  45% (39761/88357)
Updating files:  46% (40645/88357)
Updating files:  47% (41528/88357)
Updating files:  48% (42412/88357)
Updating files:  49% (43295/88357)
Updating files:  50% (44179/88357)
Updating files:  50% (44999/88357)
Updating files:  51% (45063/88357)
Updating files:  52% (45946/88357)
Updating files:  53% (46830/88357)
Updating files:  54% (47713/88357)
Updating files:  55% (48597/88357)
Updating files:  56% (49480/88357)
Updating files:  57% (50364/88357)
Updating files:  58% (51248/88357)
Updating files:  59% (52131/88357)
Updating files:  60% (53015/88357)
Updating files:  61% (53898/88357)
Updating files:  62% (54782/88357)
Updating files:  63% (55665/88357)
Updating files:  64% (56549/88357)
Updating files:  65% (57433/88357)
Updating files:  66% (58316/88357)
Updating files:  67% (59200/88357)
Updating files:  67% (59623/88357)
Updating files:  68% (60083/88357)
Updating files:  69% (60967/88357)
Updating files:  70% (61850/88357)
Updating files:  71% (62734/88357)
Updating files:  72% (63618/88357)
Updating files:  73% (64501/88357)
Updating files:  74% (65385/88357)
Updating files:  75% (66268/88357)
Updating files:  76% (67152/88357)
Updating files:  77% (68035/88357)
Updating files:  78% (68919/88357)
Updating files:  79% (69803/88357)
Updating files:  79% (70560/88357)
Updating files:  80% (70686/88357)
Updating files:  81% (71570/88357)
Updating files:  82% (72453/88357)
Updating files:  83% (73337/88357)
Updating files:  84% (74220/88357)
Updating files:  85% (75104/88357)
Updating files:  86% (75988/88357)
Updating files:  87% (76871/88357)
Updating files:  88% (77755/88357)
Updating files:  89% (78638/88357)
Updating files:  90% (79522/88357)
Updating files:  91% (80405/88357)
Updating files:  92% (81289/88357)
Updating files:  93% (82173/88357)
Updating files:  94% (83056/88357)
Updating files:  95% (83940/88357)
Updating files:  96% (84823/88357)
Updating files:  97% (85707/88357)
Updating files:  97% (85939/88357)
Updating files:  98% (86590/88357)
Updating files:  99% (87474/88357)
Updating files: 100% (88357/88357)
Updating files: 100% (88357/88357), 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