2020-08-06T13:30:01Z

1 files changed, 18 insertions, 14 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 4028b8dfdb49..315f7b77eb6e 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,22 +12,26 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
  'status': 'official'}
 $ pmaint sync 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>
-
-*** 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% (15115/89036)
Updating files:  17% (15137/89036)
Updating files:  18% (16027/89036)
Updating files:  19% (16917/89036)
Updating files:  20% (17808/89036)
Updating files:  21% (18698/89036)
Updating files:  22% (19588/89036)
Updating files:  23% (20479/89036)
Updating files:  24% (21369/89036)
Updating files:  25% (22259/89036)
Updating files:  26% (23150/89036)
Updating files:  27% (24040/89036)
Updating files:  28% (24931/89036)
Updating files:  29% (25821/89036)
Updating files:  30% (26711/89036)
Updating files:  31% (27602/89036)
Updating files:  32% (28492/89036)
Updating files:  33% (29382/89036)
Updating files:  34% (30273/89036)
Updating files:  34% (30537/89036)
Updating files:  35% (31163/89036)
Updating files:  36% (32053/89036)
Updating files:  37% (32944/89036)
Updating files:  38% (33834/89036)
Updating files:  39% (34725/89036)
Updating files:  40% (35615/89036)
Updating files:  41% (36505/89036)
Updating files:  42% (37396/89036)
Updating files:  43% (38286/89036)
Updating files:  44% (39176/89036)
Updating files:  45% (40067/89036)
Updating files:  46% (40957/89036)
Updating files:  47% (41847/89036)
Updating files:  48% (42738/89036)
Updating files:  49% (43628/89036)
Updating files:  49% (43818/89036)
Updating files:  50% (44518/89036)
Updating files:  51% (45409/89036)
Updating files:  52% (46299/89036)
Updating files:  53% (47190/89036)
Updating files:  54% (48080/89036)
Updating files:  55% (48970/89036)
Updating files:  56% (49861/89036)
Updating files:  57% (50751/89036)
Updating files:  58% (51641/89036)
Updating files:  59% (52532/89036)
Updating files:  60% (53422/89036)
Updating files:  61% (54312/89036)
Updating files:  62% (55203/89036)
Updating files:  63% (56093/89036)
Updating files:  64% (56984/89036)
Updating files:  65% (57874/89036)
Updating files:  65% (58119/89036)
Updating files:  66% (58764/89036)
Updating files:  67% (59655/89036)
Updating files:  68% (60545/89036)
Updating files:  69% (61435/89036)
Updating files:  70% (62326/89036)
Updating files:  71% (63216/89036)
Updating files:  72% (64106/89036)
Updating files:  73% (64997/89036)
Updating files:  74% (65887/89036)
Updating files:  75% (66777/89036)
Updating files:  76% (67668/89036)
Updating files:  76% (68513/89036)
Updating files:  77% (68558/89036)
Updating files:  78% (69449/89036)
Updating files:  79% (70339/89036)
Updating files:  80% (71229/89036)
Updating files:  81% (72120/89036)
Updating files:  82% (73010/89036)
Updating files:  83% (73900/89036)
Updating files:  84% (74791/89036)
Updating files:  85% (75681/89036)
Updating files:  86% (76571/89036)
Updating files:  87% (77462/89036)
Updating files:  88% (78352/89036)
Updating files:  89% (79243/89036)
Updating files:  90% (80133/89036)
Updating files:  91% (81023/89036)
Updating files:  92% (81914/89036)
Updating files:  93% (82804/89036)
Updating files:  94% (83694/89036)
Updating files:  94% (84403/89036)
Updating files:  95% (84585/89036)
Updating files:  96% (85475/89036)
Updating files:  97% (86365/89036)
Updating files:  98% (87256/89036)
Updating files:  99% (88146/89036)
Updating files: 100% (89036/89036)
Updating files: 100% (89036/89036), done.
+From https://anongit.gentoo.org/git/repo/gentoo
+   0f12049c25d..fee3a7887e5  master     -> origin/master
+Updating 0f12049c25d..fee3a7887e5
+Fast-forward
+ app-office/scribus/metadata.xml                    |   5 +-
+ .../files/libmp4v2-2.0.0-unsigned-int-cast.patch   |  96 +++++++++++++++++
+ media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild       |   1 +
+ media-sound/musescore/Manifest                     |   2 +
+ .../files/musescore-3.5-lambda-capture-this.patch  |  13 +++
+ ...usescore-3.5-remove-duplicite-declaration.patch |  12 +++
+ media-sound/musescore/musescore-3.5.ebuild         | 118 +++++++++++++++++++++
+ media-sound/musescore/musescore-9999.ebuild        |  23 ++--
+ 8 files changed, 263 insertions(+), 7 deletions(-)
+ create mode 100644 media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch
+ create mode 100644 media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
+ create mode 100644 media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
+ create mode 100644 media-sound/musescore/musescore-3.5.ebuild
 *** syncing gentoo
 *** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo