summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt86
1 files changed, 71 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 170b5783091e..c50bbf119f5e 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,23 +26,79 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- ec0e0ac1cd8..7b966011600 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: 17% (14854/86333) Updating files: 18% (15540/86333) Updating files: 19% (16404/86333) Updating files: 20% (17267/86333) Updating files: 21% (18130/86333) Updating files: 22% (18994/86333) Updating files: 23% (19857/86333) Updating files: 24% (20720/86333) Updating files: 25% (21584/86333) Updating files: 26% (22447/86333) Updating files: 27% (23310/86333) Updating files: 28% (24174/86333) Updating files: 29% (25037/86333) Updating files: 30% (25900/86333) Updating files: 31% (26764/86333) Updating files: 32% (27627/86333) Updating files: 33% (28490/86333) Updating files: 34% (29354/86333) Updating files: 35% (30217/86333) Updating files: 35% (30794/86333) Updating files: 36% (31080/86333) Updating files: 37% (31944/86333) Updating files: 38% (32807/86333) Updating files: 39% (33670/86333) Updating files: 40% (34534/86333) Updating files: 41% (35397/86333) Updating files: 42% (36260/86333) Updating files: 43% (37124/86333) Updating files: 44% (37987/86333) Updating files: 45% (38850/86333) Updating files: 46% (39714/86333) Updating files: 47% (40577/86333) Updating files: 48% (41440/86333) Updating files: 49% (42304/86333) Updating files: 50% (43167/86333) Updating files: 51% (44030/86333) Updating files: 52% (44894/86333) Updating files: 53% (45757/86333) Updating files: 53% (45838/86333) Updating files: 54% (46620/86333) Updating files: 55% (47484/86333) Updating files: 56% (48347/86333) Updating files: 57% (49210/86333) Updating files: 58% (50074/86333) Updating files: 59% (50937/86333) Updating files: 60% (51800/86333) Updating files: 61% (52664/86333) Updating files: 62% (53527/86333) Updating files: 63% (54390/86333) Updating files: 64% (55254/86333) Updating files: 65% (56117/86333) Updating files: 66% (56980/86333) Updating files: 67% (57844/86333) Updating files: 68% (58707/86333) Updating files: 69% (59570/86333) Updating files: 70% (60434/86333) Updating files: 70% (61068/86333) Updating files: 71% (61297/86333) Updating files: 72% (62160/86333) Updating files: 73% (63024/86333) Updating files: 74% (63887/86333) Updating files: 75% (64750/86333) Updating files: 76% (65614/86333) Updating files: 77% (66477/86333) Updating files: 78% (67340/86333) Updating files: 79% (68204/86333) Updating files: 80% (69067/86333) Updating files: 81% (69930/86333) Updating files: 82% (70794/86333) Updating files: 83% (71657/86333) Updating files: 84% (72520/86333) Updating files: 84% (72741/86333) Updating files: 85% (73384/86333) Updating files: 86% (74247/86333) Updating files: 87% (75110/86333) Updating files: 88% (75974/86333) Updating files: 89% (76837/86333) Updating files: 90% (77700/86333) Updating files: 91% (78564/86333) Updating files: 92% (79427/86333) Updating files: 93% (80290/86333) Updating files: 94% (81154/86333) Updating files: 95% (82017/86333) Updating files: 96% (82880/86333) Updating files: 97% (83744/86333) Updating files: 98% (84607/86333) Updating files: 99% (85470/86333) Updating files: 100% (86333/86333) Updating files: 100% (86333/86333), done.
+ 7b966011600..7f9624081b9 master -> origin/master
+Updating 7b966011600..7f9624081b9
+Fast-forward
+ .../at-spi2-atk/at-spi2-atk-2.34.2.ebuild | 4 +-
+ .../at-spi2-atk/at-spi2-atk-2.38.0.ebuild | 4 +-
+ .../at-spi2-core/at-spi2-core-2.34.0.ebuild | 4 +-
+ .../at-spi2-core/at-spi2-core-2.36.0.ebuild | 4 +-
+ .../at-spi2-core/at-spi2-core-2.38.0.ebuild | 4 +-
+ app-crypt/johntheripper/johntheripper-1.8.0.ebuild | 10 +-
+ app-misc/tmuxp/Manifest | 1 +
+ app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch | 22 ++++
+ app-misc/tmuxp/tmuxp-1.6.4.ebuild | 45 +++++++
+ app-shells/bash/bash-5.0_p11-r1.ebuild | 2 +-
+ dev-haskell/cabal/cabal-2.0.0.2.ebuild | 4 +-
+ dev-java/jffi/jffi-1.2.9.ebuild | 1 -
+ dev-lang/ghc/ghc-7.10.3.ebuild | 3 +-
+ dev-lang/ghc/ghc-7.8.4.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.0.2.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.10.1.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.10.2.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.10.3.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.2.1.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.2.2.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.4.1.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.4.2.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.4.3.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.6.4.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.6.5.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.8.1.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.8.2.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.8.3.ebuild | 3 +-
+ dev-lang/ghc/ghc-8.8.4.ebuild | 3 +-
+ dev-lang/perl/perl-5.30.3-r2.ebuild | 4 +-
+ dev-lang/yap/yap-6.3.4.ebuild | 2 +-
+ dev-lisp/clozurecl/clozurecl-1.11.5.ebuild | 7 +-
+ dev-lisp/sbcl/Manifest | 1 -
+ dev-lisp/sbcl/sbcl-1.3.11.ebuild | 2 -
+ dev-lisp/sbcl/sbcl-1.4.9.ebuild | 2 -
+ dev-lisp/sbcl/sbcl-2.0.10.ebuild | 2 -
+ dev-lisp/sbcl/sbcl-2.0.11.ebuild | 2 -
+ dev-python/markdown/markdown-2.6.11.ebuild | 4 +-
+ dev-python/markdown/markdown-3.3.3.ebuild | 4 +-
+ dev-ruby/i18n/i18n-1.8.7.ebuild | 2 +-
+ dev-ruby/sanitize/sanitize-5.2.2.ebuild | 2 +-
+ dev-tcltk/tix/tix-8.4.3-r1.ebuild | 4 +-
+ dev-util/valgrind/valgrind-3.16.1.ebuild | 1 -
+ dev-util/valgrind/valgrind-9999.ebuild | 1 -
+ net-misc/curl/curl-7.74.0-r2.ebuild | 2 +-
+ net-misc/nx/Manifest | 4 -
+ net-misc/nx/nx-3.5.99.16.ebuild | 129 -------------------
+ net-misc/nx/nx-3.5.99.22.ebuild | 138 --------------------
+ net-misc/nx/nx-3.5.99.23.ebuild | 140 ---------------------
+ net-misc/nx/nx-3.5.99.24.ebuild | 136 --------------------
+ profiles/arch/base/make.defaults | 2 +-
+ profiles/arches.desc | 1 -
+ profiles/embedded/make.defaults | 2 +-
+ sys-apps/net-tools/Manifest | 2 +-
+ sys-devel/gdb-apple/gdb-apple-1752.ebuild | 2 +-
+ www-client/microsoft-edge-dev/Manifest | 3 +-
+ .../microsoft-edge-dev-89.0.723.0.ebuild | 114 -----------------
+ ...ebuild => microsoft-edge-dev-89.0.752.1.ebuild} | 2 +-
+ 58 files changed, 121 insertions(+), 752 deletions(-)
+ create mode 100644 app-misc/tmuxp/files/tmuxp-1.6.4-tests.patch
+ create mode 100644 app-misc/tmuxp/tmuxp-1.6.4.ebuild
+ delete mode 100644 net-misc/nx/nx-3.5.99.16.ebuild
+ delete mode 100644 net-misc/nx/nx-3.5.99.22.ebuild
+ delete mode 100644 net-misc/nx/nx-3.5.99.23.ebuild
+ delete mode 100644 net-misc/nx/nx-3.5.99.24.ebuild
+ delete mode 100644 www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
+ rename www-client/microsoft-edge-dev/{microsoft-edge-dev-88.0.705.15.ebuild => microsoft-edge-dev-89.0.752.1.ebuild} (98%)
*** 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