2021-01-25T01:00:01Z

1 files changed, 15 insertions, 69 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 952cd2c2329..69d4c3336b6 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,77 +26,23 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://anongit.gentoo.org/git/repo/gentoo
-   d39be1dc006..73490ba3820  master     -> origin/master
-Updating d39be1dc006..73490ba3820
-Fast-forward
- dev-libs/libyaml/libyaml-0.2.5.ebuild              |   2 +-
- dev-libs/xxhash/xxhash-0.8.0.ebuild                |   2 +-
- .../files/openmsx-16.0-libsdl-joystick-fix.patch   |  66 ++++++
- ...{openmsx-16.0.ebuild => openmsx-16.0-r1.ebuild} |   7 +-
- kde-apps/ktp-call-ui/Manifest                      |   2 -
- kde-apps/ktp-call-ui/ktp-call-ui-20.08.3.ebuild    |  45 ----
- kde-apps/ktp-call-ui/ktp-call-ui-20.12.1.ebuild    |  45 ----
- kde-apps/ktp-call-ui/metadata.xml                  |   8 -
- media-gfx/wkhtmltopdf/Manifest                     |   1 -
- media-gfx/wkhtmltopdf/metadata.xml                 |   8 -
- media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild    |  43 ----
- media-libs/qt-gstreamer/Manifest                   |   1 -
- .../files/qt-gstreamer-1.2.0-boost157.patch        | 204 -----------------
- .../files/qt-gstreamer-1.2.0-clang-38.patch        |  67 ------
- .../files/qt-gstreamer-1.2.0-gstreamer15.patch     |  39 ----
- .../files/qt-gstreamer-1.2.0-gstreamer16.patch     |  25 ---
- .../files/qt-gstreamer-1.2.0-qt-5.11b3.patch       |  50 -----
- media-libs/qt-gstreamer/metadata.xml               |   8 -
- .../qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild      |  54 -----
- media-sound/tomahawk/Manifest                      |   1 -
- .../tomahawk-0.9.0_pre20181030-cmakepolicy.patch   |  37 ----
- .../tomahawk-0.9.0_pre20181030-findtaglib.patch    | 244 ---------------------
- .../tomahawk-0.9.0_pre20181030-fix-warning.patch   |  26 ---
- .../files/tomahawk-0.9.0_pre20181030-qt-5.15.patch | 140 ------------
- media-sound/tomahawk/metadata.xml                  |  11 -
- .../tomahawk/tomahawk-0.9.0_pre20181030.ebuild     |  86 --------
- media-video/smtube/Manifest                        |   1 -
- media-video/smtube/metadata.xml                    |  16 --
- media-video/smtube/smtube-20.1.0.ebuild            |  65 ------
- net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild             |   2 +-
- profiles/package.mask                              |  29 ---
- sys-kernel/zen-sources/Manifest                    |  10 +-
- ...es-5.9.13.ebuild => zen-sources-5.10.10.ebuild} |   2 +-
- ...ces-5.9.11.ebuild => zen-sources-5.10.6.ebuild} |   6 +-
- sys-libs/zlib/zlib-1.2.11-r3.ebuild                |   2 +-
- 35 files changed, 84 insertions(+), 1271 deletions(-)
- create mode 100644 games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
- rename games-emulation/openmsx/{openmsx-16.0.ebuild => openmsx-16.0-r1.ebuild} (94%)
- delete mode 100644 kde-apps/ktp-call-ui/Manifest
- delete mode 100644 kde-apps/ktp-call-ui/ktp-call-ui-20.08.3.ebuild
- delete mode 100644 kde-apps/ktp-call-ui/ktp-call-ui-20.12.1.ebuild
- delete mode 100644 kde-apps/ktp-call-ui/metadata.xml
- delete mode 100644 media-gfx/wkhtmltopdf/Manifest
- delete mode 100644 media-gfx/wkhtmltopdf/metadata.xml
- delete mode 100644 media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild
- delete mode 100644 media-libs/qt-gstreamer/Manifest
- delete mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch
- delete mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch
- delete mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch
- delete mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch
- delete mode 100644 media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch
- delete mode 100644 media-libs/qt-gstreamer/metadata.xml
- delete mode 100644 media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
- delete mode 100644 media-sound/tomahawk/Manifest
- delete mode 100644 media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
- delete mode 100644 media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
- delete mode 100644 media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
- delete mode 100644 media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
- delete mode 100644 media-sound/tomahawk/metadata.xml
- delete mode 100644 media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
- delete mode 100644 media-video/smtube/Manifest
- delete mode 100644 media-video/smtube/metadata.xml
- delete mode 100644 media-video/smtube/smtube-20.1.0.ebuild
- rename sys-kernel/zen-sources/{zen-sources-5.9.13.ebuild => zen-sources-5.10.10.ebuild} (96%)
- rename sys-kernel/zen-sources/{zen-sources-5.9.11.ebuild => zen-sources-5.10.6.ebuild} (89%)
+   73490ba3820..da9ef42dbb2  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% (17933/86137)
Updating files:  21% (18089/86137)
Updating files:  22% (18951/86137)
Updating files:  23% (19812/86137)
Updating files:  24% (20673/86137)
Updating files:  25% (21535/86137)
Updating files:  26% (22396/86137)
Updating files:  27% (23257/86137)
Updating files:  28% (24119/86137)
Updating files:  29% (24980/86137)
Updating files:  30% (25842/86137)
Updating files:  31% (26703/86137)
Updating files:  32% (27564/86137)
Updating files:  33% (28426/86137)
Updating files:  34% (29287/86137)
Updating files:  35% (30148/86137)
Updating files:  36% (31010/86137)
Updating files:  37% (31871/86137)
Updating files:  38% (32733/86137)
Updating files:  39% (33594/86137)
Updating files:  40% (34455/86137)
Updating files:  41% (35317/86137)
Updating files:  42% (36178/86137)
Updating files:  43% (37039/86137)
Updating files:  43% (37233/86137)
Updating files:  44% (37901/86137)
Updating files:  45% (38762/86137)
Updating files:  46% (39624/86137)
Updating files:  47% (40485/86137)
Updating files:  48% (41346/86137)
Updating files:  49% (42208/86137)
Updating files:  50% (43069/86137)
Updating files:  51% (43930/86137)
Updating files:  52% (44792/86137)
Updating files:  53% (45653/86137)
Updating files:  54% (46514/86137)
Updating files:  55% (47376/86137)
Updating files:  56% (48237/86137)
Updating files:  57% (49099/86137)
Updating files:  58% (49960/86137)
Updating files:  59% (50821/86137)
Updating files:  60% (51683/86137)
Updating files:  61% (52544/86137)
Updating files:  62% (53405/86137)
Updating files:  63% (54267/86137)
Updating files:  63% (54460/86137)
Updating files:  64% (55128/86137)
Updating files:  65% (55990/86137)
Updating files:  66% (56851/86137)
Updating files:  67% (57712/86137)
Updating files:  68% (58574/86137)
Updating files:  69% (59435/86137)
Updating files:  70% (60296/86137)
Updating files:  71% (61158/86137)
Updating files:  72% (62019/86137)
Updating files:  73% (62881/86137)
Updating files:  74% (63742/86137)
Updating files:  75% (64603/86137)
Updating files:  76% (65465/86137)
Updating files:  77% (66326/86137)
Updating files:  78% (67187/86137)
Updating files:  79% (68049/86137)
Updating files:  80% (68910/86137)
Updating files:  81% (69771/86137)
Updating files:  82% (70633/86137)
Updating files:  83% (71494/86137)
Updating files:  84% (72356/86137)
Updating files:  84% (72765/86137)
Updating files:  85% (73217/86137)
Updating files:  86% (74078/86137)
Updating files:  87% (74940/86137)
Updating files:  88% (75801/86137)
Updating files:  89% (76662/86137)
Updating files:  90% (77524/86137)
Updating files:  91% (78385/86137)
Updating files:  92% (79247/86137)
Updating files:  93% (80108/86137)
Updating files:  94% (80969/86137)
Updating files:  95% (81831/86137)
Updating files:  96% (82692/86137)
Updating files:  97% (83553/86137)
Updating files:  98% (84415/86137)
Updating files:  99% (85276/86137)
Updating files: 100% (86137/86137)
Updating files: 100% (86137/86137), 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