summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-01-24 02:44:11 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-01-24 02:44:11 +0000
commitb23dd88d1d63a7cdac46c050b3cebf1e3ac5e86c (patch)
tree14e37713b1663583fee3d91ba89410bb25e782ab /gentoo.txt
parent2021-01-24T01:00:01Z (diff)
downloadrepos-b23dd88d1d63a7cdac46c050b3cebf1e3ac5e86c.tar.gz
repos-b23dd88d1d63a7cdac46c050b3cebf1e3ac5e86c.tar.bz2
repos-b23dd88d1d63a7cdac46c050b3cebf1e3ac5e86c.zip
2021-01-24T02:00:01Z
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt138
1 files changed, 15 insertions, 123 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 9d4455eeb5c..4543b0deb8b 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,131 +26,23 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 57cbce3e8c2..225fe6eb0b1 master -> origin/master
-Updating 57cbce3e8c2..225fe6eb0b1
-Fast-forward
- app-admin/salt/salt-3002.2-r2.ebuild | 4 +-
- app-misc/remind/Manifest | 4 +-
- app-misc/remind/metadata.xml | 8 +-
- app-misc/remind/remind-03.03.00.ebuild | 49 --------
- app-misc/remind/remind-03.03.01.ebuild | 49 --------
- ...mind-03.02.00.ebuild => remind-03.03.05.ebuild} | 4 +-
- app-vim/salt-vim/salt-vim-20151119.ebuild | 4 +-
- dev-libs/jemalloc/Manifest | 6 -
- .../jemalloc/files/jemalloc-3.5.1-no-pprof.patch | 25 ----
- .../files/jemalloc-3.5.1-strip-optimization.patch | 27 ----
- .../files/jemalloc-3.5.1_fix_html_install.patch | 12 --
- .../files/jemalloc-4.5.0-fix_html_install.patch | 25 ----
- .../files/jemalloc-4.5.0-strip-optimization.patch | 35 ------
- .../files/jemalloc-5.0.1-strip-optimization.patch | 26 ----
- dev-libs/jemalloc/jemalloc-3.6.0.ebuild | 53 --------
- dev-libs/jemalloc/jemalloc-4.4.0.ebuild | 54 --------
- dev-libs/jemalloc/jemalloc-4.5.0.ebuild | 59 ---------
- dev-libs/jemalloc/jemalloc-5.0.1.ebuild | 63 ----------
- dev-libs/jemalloc/jemalloc-5.1.0.ebuild | 62 ----------
- dev-libs/jemalloc/jemalloc-5.2.0.ebuild | 61 ---------
- dev-libs/jemalloc/metadata.xml | 1 -
- dev-libs/nss/Manifest | 2 +-
- dev-libs/nss/{nss-3.60.ebuild => nss-3.61.ebuild} | 0
- dev-python/GitPython/GitPython-3.1.12.ebuild | 2 +-
- .../SaltTesting/SaltTesting-2018.9.21.ebuild | 4 +-
- dev-python/bandit/bandit-1.6.2-r1.ebuild | 4 +-
- dev-python/cheetah3/cheetah3-3.2.6.ebuild | 4 +-
- dev-python/cliff/cliff-3.6.0.ebuild | 2 +-
- dev-python/ddt/ddt-1.2.2.ebuild | 4 +-
- .../debtcollector/debtcollector-2.2.0.ebuild | 4 +-
- dev-python/doc8/doc8-0.6.0.ebuild | 4 +-
- dev-python/gitdb/gitdb-4.0.5.ebuild | 4 +-
- dev-python/hacking/hacking-2.0.0.ebuild | 4 +-
- dev-python/ioflo/ioflo-2.0.2.ebuild | 4 +-
- dev-python/libcloud/libcloud-3.3.0.ebuild | 2 +-
- dev-python/libnacl/libnacl-1.7.2.ebuild | 4 +-
- dev-python/mox3/mox3-0.24.0.ebuild | 4 +-
- .../os-client-config/os-client-config-2.1.0.ebuild | 4 +-
- dev-python/osc-lib/osc-lib-2.2.1.ebuild | 4 +-
- .../oslo-concurrency/oslo-concurrency-4.3.1.ebuild | 4 +-
- dev-python/oslo-config/oslo-config-8.3.3.ebuild | 4 +-
- dev-python/oslo-context/oslo-context-3.1.1.ebuild | 4 +-
- dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild | 4 +-
- dev-python/oslo-log/oslo-log-4.4.0.ebuild | 4 +-
- .../oslo-serialization-4.0.1.ebuild | 4 +-
- dev-python/oslo-utils/oslo-utils-4.6.0.ebuild | 4 +-
- dev-python/oslotest/oslotest-4.4.1.ebuild | 4 +-
- dev-python/osprofiler/osprofiler-3.4.0.ebuild | 4 +-
- dev-python/polygon/polygon-3.0.7.ebuild | 13 +-
- dev-python/prettytable/prettytable-0.7.2-r1.ebuild | 4 +-
- dev-python/prettytable/prettytable-2.0.0.ebuild | 4 +-
- .../pytest-helpers-namespace-2019.1.8-r1.ebuild | 4 +-
- .../pytest-salt-factories-0.94.4.ebuild | 4 +-
- .../pytest-salt/pytest-salt-2020.1.27.ebuild | 4 +-
- .../pytest-tempdir-2019.10.12.ebuild | 4 +-
- .../python-cinderclient-7.2.0.ebuild | 4 +-
- .../python-glanceclient-3.2.2.ebuild | 4 +-
- .../python-keystoneclient-4.1.1.ebuild | 4 +-
- .../python-neutronclient-7.2.1.ebuild | 4 +-
- .../python-novaclient-17.2.1.ebuild | 4 +-
- .../python-openstackclient-5.4.0.ebuild | 4 +-
- dev-python/raet/raet-0.6.8-r1.ebuild | 4 +-
- .../restructuredtext-lint-1.3.0.ebuild | 4 +-
- dev-python/smmap/smmap-3.0.5.ebuild | 2 +-
- dev-python/stestr/stestr-2.1.0-r1.ebuild | 4 +-
- dev-python/warlock/warlock-1.3.3.ebuild | 2 +-
- dev-python/yappi/yappi-1.3.2.ebuild | 2 +-
- media-libs/libfame/libfame-0.9.1-r3.ebuild | 47 +++++++
- media-libs/libmms/libmms-0.6.4-r1.ebuild | 25 ++++
- ...r-0.1.5.ebuild => opencore-amr-0.1.5-r1.ebuild} | 19 ++-
- media-sound/dcaenc/dcaenc-2-r1.ebuild | 27 ----
- media-sound/dcaenc/dcaenc-2-r2.ebuild | 33 +++++
- media-sound/dcaenc/dcaenc-9999.ebuild | 27 ----
- media-video/pipewire/Manifest | 1 +
- media-video/pipewire/pipewire-0.3.20.ebuild | 136 +++++++++++++++++++++
- media-video/recmpeg/recmpeg-1.0.5.ebuild | 14 +--
- net-mail/mu/Manifest | 2 +-
- net-mail/mu/{mu-1.4.14.ebuild => mu-1.4.15.ebuild} | 0
- net-proxy/mitmproxy/Manifest | 5 +-
- net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild | 95 --------------
- net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild | 92 --------------
- net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild | 95 --------------
- ...tmproxy-6.0.1.ebuild => mitmproxy-6.0.2.ebuild} | 0
- .../qalculate-gtk/qalculate-gtk-3.15.0.ebuild | 4 +-
- .../libqalculate/libqalculate-3.15.0-r1.ebuild | 4 +-
- .../man-pages-posix/man-pages-posix-2017a.ebuild | 2 +-
- sys-apps/man-pages-posix/metadata.xml | 1 +
- sys-process/parallel/Manifest | 1 -
- sys-process/parallel/parallel-20201122.ebuild | 23 ----
- 89 files changed, 366 insertions(+), 1093 deletions(-)
- delete mode 100644 app-misc/remind/remind-03.03.00.ebuild
- delete mode 100644 app-misc/remind/remind-03.03.01.ebuild
- rename app-misc/remind/{remind-03.02.00.ebuild => remind-03.03.05.ebuild} (92%)
- delete mode 100644 dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch
- delete mode 100644 dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
- delete mode 100644 dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
- delete mode 100644 dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch
- delete mode 100644 dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch
- delete mode 100644 dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch
- delete mode 100644 dev-libs/jemalloc/jemalloc-3.6.0.ebuild
- delete mode 100644 dev-libs/jemalloc/jemalloc-4.4.0.ebuild
- delete mode 100644 dev-libs/jemalloc/jemalloc-4.5.0.ebuild
- delete mode 100644 dev-libs/jemalloc/jemalloc-5.0.1.ebuild
- delete mode 100644 dev-libs/jemalloc/jemalloc-5.1.0.ebuild
- delete mode 100644 dev-libs/jemalloc/jemalloc-5.2.0.ebuild
- rename dev-libs/nss/{nss-3.60.ebuild => nss-3.61.ebuild} (100%)
- create mode 100644 media-libs/libfame/libfame-0.9.1-r3.ebuild
- create mode 100644 media-libs/libmms/libmms-0.6.4-r1.ebuild
- rename media-libs/opencore-amr/{opencore-amr-0.1.5.ebuild => opencore-amr-0.1.5-r1.ebuild} (58%)
- delete mode 100644 media-sound/dcaenc/dcaenc-2-r1.ebuild
- create mode 100644 media-sound/dcaenc/dcaenc-2-r2.ebuild
- delete mode 100644 media-sound/dcaenc/dcaenc-9999.ebuild
- create mode 100644 media-video/pipewire/pipewire-0.3.20.ebuild
- rename net-mail/mu/{mu-1.4.14.ebuild => mu-1.4.15.ebuild} (100%)
- delete mode 100644 net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
- delete mode 100644 net-proxy/mitmproxy/mitmproxy-5.2-r1.ebuild
- delete mode 100644 net-proxy/mitmproxy/mitmproxy-5.3.0.ebuild
- rename net-proxy/mitmproxy/{mitmproxy-6.0.1.ebuild => mitmproxy-6.0.2.ebuild} (100%)
- delete mode 100644 sys-process/parallel/parallel-20201122.ebuild
+ 225fe6eb0b1..f30397e6f97 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: 14% (12825/86198) Updating files: 15% (12930/86198) Updating files: 16% (13792/86198) Updating files: 17% (14654/86198) Updating files: 18% (15516/86198) Updating files: 19% (16378/86198) Updating files: 20% (17240/86198) Updating files: 21% (18102/86198) Updating files: 22% (18964/86198) Updating files: 23% (19826/86198) Updating files: 24% (20688/86198) Updating files: 25% (21550/86198) Updating files: 26% (22412/86198) Updating files: 27% (23274/86198) Updating files: 28% (24136/86198) Updating files: 29% (24998/86198) Updating files: 30% (25860/86198) Updating files: 31% (26722/86198) Updating files: 32% (27584/86198) Updating files: 33% (28446/86198) Updating files: 33% (28585/86198) Updating files: 34% (29308/86198) Updating files: 35% (30170/86198) Updating files: 36% (31032/86198) Updating files: 37% (31894/86198) Updating files: 38% (32756/86198) Updating files: 39% (33618/86198) Updating files: 40% (34480/86198) Updating files: 41% (35342/86198) Updating files: 42% (36204/86198) Updating files: 43% (37066/86198) Updating files: 44% (37928/86198) Updating files: 45% (38790/86198) Updating files: 46% (39652/86198) Updating files: 47% (40514/86198) Updating files: 48% (41376/86198) Updating files: 49% (42238/86198) Updating files: 50% (43099/86198) Updating files: 51% (43961/86198) Updating files: 51% (44170/86198) Updating files: 52% (44823/86198) Updating files: 53% (45685/86198) Updating files: 54% (46547/86198) Updating files: 55% (47409/86198) Updating files: 56% (48271/86198) Updating files: 57% (49133/86198) Updating files: 58% (49995/86198) Updating files: 59% (50857/86198) Updating files: 60% (51719/86198) Updating files: 61% (52581/86198) Updating files: 62% (53443/86198) Updating files: 63% (54305/86198) Updating files: 64% (55167/86198) Updating files: 65% (56029/86198) Updating files: 66% (56891/86198) Updating files: 67% (57753/86198) Updating files: 67% (58031/86198) Updating files: 68% (58615/86198) Updating files: 69% (59477/86198) Updating files: 70% (60339/86198) Updating files: 71% (61201/86198) Updating files: 72% (62063/86198) Updating files: 73% (62925/86198) Updating files: 74% (63787/86198) Updating files: 75% (64649/86198) Updating files: 76% (65511/86198) Updating files: 77% (66373/86198) Updating files: 78% (67235/86198) Updating files: 78% (67580/86198) Updating files: 79% (68097/86198) Updating files: 80% (68959/86198) Updating files: 81% (69821/86198) Updating files: 82% (70683/86198) Updating files: 83% (71545/86198) Updating files: 84% (72407/86198) Updating files: 85% (73269/86198) Updating files: 86% (74131/86198) Updating files: 87% (74993/86198) Updating files: 88% (75855/86198) Updating files: 89% (76717/86198) Updating files: 90% (77579/86198) Updating files: 91% (78441/86198) Updating files: 92% (79303/86198) Updating files: 93% (80165/86198) Updating files: 94% (81027/86198) Updating files: 94% (81573/86198) Updating files: 95% (81889/86198) Updating files: 96% (82751/86198) Updating files: 97% (83613/86198) Updating files: 98% (84475/86198) Updating files: 99% (85337/86198) Updating files: 100% (86198/86198) Updating files: 100% (86198/86198), 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