2020-05-03T10:30:01Z

1 files changed, 138 insertions, 15 deletions

diff --git a/gentoo.txt b/gentoo.txt
index 62b99029cebc..9a0e81fae1e9 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,23 +13,146 @@
  'status': 'official'}
 $ pmaint sync gentoo
 From https://anongit.gentoo.org/git/repo/gentoo
-   edd486548f1..a8a3da75a5a  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:  16% (14959/89306)
Updating files:  17% (15183/89306)
Updating files:  18% (16076/89306)
Updating files:  19% (16969/89306)
Updating files:  20% (17862/89306)
Updating files:  21% (18755/89306)
Updating files:  22% (19648/89306)
Updating files:  23% (20541/89306)
Updating files:  24% (21434/89306)
Updating files:  25% (22327/89306)
Updating files:  26% (23220/89306)
Updating files:  27% (24113/89306)
Updating files:  28% (25006/89306)
Updating files:  29% (25899/89306)
Updating files:  30% (26792/89306)
Updating files:  31% (27685/89306)
Updating files:  32% (28578/89306)
Updating files:  33% (29471/89306)
Updating files:  33% (30037/89306)
Updating files:  34% (30365/89306)
Updating files:  35% (31258/89306)
Updating files:  36% (32151/89306)
Updating files:  37% (33044/89306)
Updating files:  38% (33937/89306)
Updating files:  39% (34830/89306)
Updating files:  40% (35723/89306)
Updating files:  41% (36616/89306)
Updating files:  42% (37509/89306)
Updating files:  43% (38402/89306)
Updating files:  44% (39295/89306)
Updating files:  45% (40188/89306)
Updating files:  46% (41081/89306)
Updating files:  47% (41974/89306)
Updating files:  48% (42867/89306)
Updating files:  49% (43760/89306)
Updating files:  50% (44653/89306)
Updating files:  51% (45547/89306)
Updating files:  52% (46440/89306)
Updating files:  53% (47333/89306)
Updating files:  53% (48145/89306)
Updating files:  54% (48226/89306)
Updating files:  55% (49119/89306)
Updating files:  56% (50012/89306)
Updating files:  57% (50905/89306)
Updating files:  58% (51798/89306)
Updating files:  59% (52691/89306)
Updating files:  60% (53584/89306)
Updating files:  61% (54477/89306)
Updating files:  62% (55370/89306)
Updating files:  63% (56263/89306)
Updating files:  64% (57156/89306)
Updating files:  65% (58049/89306)
Updating files:  66% (58942/89306)
Updating files:  67% (59836/89306)
Updating files:  68% (60729/89306)
Updating files:  69% (61622/89306)
Updating files:  70% (62515/89306)
Updating files:  70% (63136/89306)
Updating files:  71% (63408/89306)
Updating files:  72% (64301/89306)
Updating files:  73% (65194/89306)
Updating files:  74% (66087/89306)
Updating files:  75% (66980/89306)
Updating files:  76% (67873/89306)
Updating files:  77% (68766/89306)
Updating files:  78% (69659/89306)
Updating files:  79% (70552/89306)
Updating files:  80% (71445/89306)
Updating files:  81% (72338/89306)
Updating files:  82% (73231/89306)
Updating files:  82% (73503/89306)
Updating files:  83% (74124/89306)
Updating files:  84% (75018/89306)
Updating files:  85% (75911/89306)
Updating files:  86% (76804/89306)
Updating files:  87% (77697/89306)
Updating files:  88% (78590/89306)
Updating files:  89% (79483/89306)
Updating files:  90% (80376/89306)
Updating files:  91% (81269/89306)
Updating files:  92% (82162/89306)
Updating files:  93% (83055/89306)
Updating files:  94% (83948/89306)
Updating files:  95% (84841/89306)
Updating files:  96% (85734/89306)
Updating files:  97% (86627/89306)
Updating files:  98% (87520/89306)
Updating files:  99% (88413/89306)
Updating files:  99% (88782/89306)
Updating files: 100% (89306/89306)
Updating files: 100% (89306/89306), done.
+   a8a3da75a5a..bf0ddd59b40  master     -> origin/master
+Updating a8a3da75a5a..bf0ddd59b40
+Fast-forward
+ app-portage/eix/eix-0.33.11.ebuild                 |  2 +-
+ app-shells/bash/bash-5.0_p17.ebuild                |  2 +-
+ dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild  |  2 +-
+ dev-python/BitVector/BitVector-3.4.9.ebuild        |  2 +-
+ dev-python/GitPython/GitPython-3.1.1.ebuild        |  2 +-
+ .../beautifulsoup/beautifulsoup-4.8.2.ebuild       |  2 +-
+ dev-python/betamax/betamax-0.8.1.ebuild            |  2 +-
+ dev-python/bitstring/bitstring-3.1.6.ebuild        |  2 +-
+ dev-python/blessings/blessings-1.7-r1.ebuild       |  2 +-
+ dev-python/chameleon/chameleon-3.7.0.ebuild        |  2 +-
+ .../colorspacious/colorspacious-1.1.2.ebuild       |  2 +-
+ dev-python/commonmark/commonmark-0.9.1.ebuild      |  2 +-
+ dev-python/curtsies/curtsies-0.3.0-r2.ebuild       |  2 +-
+ dev-python/cx_Freeze/cx_Freeze-6.1.ebuild          |  2 +-
+ dev-python/cycler/cycler-0.10.0-r1.ebuild          |  2 +-
+ dev-python/dbus-python/dbus-python-1.2.16.ebuild   |  2 +-
+ dev-python/decorator/decorator-4.4.2.ebuild        |  2 +-
+ dev-python/docutils/docutils-0.16.ebuild           |  2 +-
+ dev-python/eventlet/eventlet-0.25.1-r1.ebuild      |  2 +-
+ .../feedgenerator/feedgenerator-1.9.1.ebuild       |  2 +-
+ dev-python/flask-babel/flask-babel-0.12.2.ebuild   |  2 +-
+ dev-python/flask/flask-1.1.2.ebuild                |  2 +-
+ dev-python/fudge/fudge-1.1.1.ebuild                |  2 +-
+ dev-python/gitdb/gitdb-4.0.4.ebuild                |  2 +-
+ dev-python/html2text/html2text-2020.1.16-r1.ebuild |  2 +-
+ dev-python/ifaddr/ifaddr-0.1.6.ebuild              |  2 +-
+ .../importlib_resources-1.4.0.ebuild               |  2 +-
+ dev-python/isodate/isodate-0.6.0-r1.ebuild         |  2 +-
+ .../jaraco-functools/jaraco-functools-3.0.0.ebuild |  2 +-
+ .../jaraco-packaging/jaraco-packaging-8.1.0.ebuild |  2 +-
+ dev-python/jeepney/jeepney-0.4.3.ebuild            |  2 +-
+ dev-python/jsonpatch/jsonpatch-1.25.ebuild         |  2 +-
+ dev-python/jsonpickle/jsonpickle-1.3.ebuild        |  2 +-
+ dev-python/keyring/keyring-19.3.0.ebuild           |  2 +-
+ dev-python/mako/mako-1.1.2.ebuild                  |  2 +-
+ dev-python/micawber/micawber-0.5.1.ebuild          |  2 +-
+ dev-python/mock/mock-3.0.5-r1.ebuild               |  2 +-
+ dev-python/natsort/natsort-7.0.1.ebuild            |  2 +-
+ .../nose-exclude/nose-exclude-0.5.0-r1.ebuild      |  2 +-
+ .../nose_warnings_filters-0.1.5-r3.ebuild          |  2 +-
+ dev-python/oauthlib/oauthlib-3.1.0.ebuild          |  2 +-
+ dev-python/passlib/passlib-1.7.2.ebuild            |  2 +-
+ .../prompt_toolkit/prompt_toolkit-3.0.3.ebuild     |  2 +-
+ dev-python/ptyprocess/ptyprocess-0.6.0.ebuild      |  2 +-
+ dev-python/py-ubjson/py-ubjson-0.15.0.ebuild       |  2 +-
+ dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild           |  2 +-
+ dev-python/pyasn1/pyasn1-0.4.8.ebuild              |  2 +-
+ dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild        |  2 +-
+ dev-python/pygments/pygments-2.6.1.ebuild          |  2 +-
+ dev-python/pygresql/pygresql-5.1.ebuild            |  2 +-
+ dev-python/pylint/pylint-2.4.4-r1.ebuild           |  2 +-
+ .../pyproject2setuppy/pyproject2setuppy-4.ebuild   |  2 +-
+ dev-python/pyscard/pyscard-1.9.9.ebuild            |  2 +-
+ .../pytest-fixture-config-1.7.0-r1.ebuild          |  2 +-
+ dev-python/pytest-xdist/Manifest                   |  1 +
+ .../files/pytest-xdist-1.32.0-timeout.patch        | 50 +++++++++++++++
+ dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild | 43 +++++++++++++
+ .../python-bugzilla/python-bugzilla-2.3.0.ebuild   |  2 +-
+ .../python-discid/python-discid-1.2.0.ebuild       |  2 +-
+ dev-python/python-xlib/python-xlib-0.27.ebuild     |  2 +-
+ dev-python/pytools/pytools-2020.1.ebuild           |  2 +-
+ dev-python/pytrie/pytrie-0.3.1-r1.ebuild           |  2 +-
+ dev-python/pyzmq/pyzmq-19.0.0.ebuild               |  2 +-
+ .../readme_renderer/readme_renderer-25.0.ebuild    |  2 +-
+ dev-python/regex/regex-2020.2.20.ebuild            |  2 +-
+ dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild     |  2 +-
+ .../requests-mock/requests-mock-1.7.0.ebuild       |  2 +-
+ .../requests-oauthlib-1.3.0.ebuild                 |  2 +-
+ dev-python/requests/requests-2.23.0.ebuild         |  2 +-
+ dev-python/routes/routes-2.4.1-r1.ebuild           |  2 +-
+ dev-python/scrypt/scrypt-0.8.13-r2.ebuild          |  2 +-
+ .../secretstorage/secretstorage-3.1.1-r1.ebuild    |  2 +-
+ dev-python/send2trash/send2trash-1.5.0-r1.ebuild   |  2 +-
+ dev-python/setuptools/setuptools-44.1.0.ebuild     |  2 +-
+ dev-python/smmap/smmap-3.0.2.ebuild                |  2 +-
+ .../snowballstemmer/snowballstemmer-2.0.0.ebuild   |  2 +-
+ .../sphinx-testing/sphinx-testing-1.0.1-r1.ebuild  |  2 +-
+ .../sphinxcontrib-applehelp-1.0.2.ebuild           |  2 +-
+ .../sphinxcontrib-asyncio-0.2.0-r2.ebuild          |  2 +-
+ .../sphinxcontrib-devhelp-1.0.2.ebuild             |  2 +-
+ .../sphinxcontrib-htmlhelp-1.0.3.ebuild            |  2 +-
+ .../sphinxcontrib-jsmath-1.0.1-r1.ebuild           |  2 +-
+ .../sphinxcontrib-qthelp-1.0.3.ebuild              |  2 +-
+ dev-python/sqlparse/sqlparse-0.3.1.ebuild          |  2 +-
+ dev-python/tblib/tblib-1.6.0.ebuild                |  2 +-
+ dev-python/terminado/terminado-0.8.3.ebuild        |  2 +-
+ dev-python/tinycss2/tinycss2-1.0.2.ebuild          |  2 +-
+ dev-python/tld/Manifest                            |  1 +
+ dev-python/tld/tld-0.12.1.ebuild                   | 19 ++++++
+ dev-python/tox/Manifest                            |  1 +
+ dev-python/tox/tox-3.15.0.ebuild                   | 74 ++++++++++++++++++++++
+ dev-python/twine/twine-3.1.1.ebuild                |  2 +-
+ dev-python/ujson/ujson-2.0.3.ebuild                |  2 +-
+ dev-python/watchdog/watchdog-0.9.0-r1.ebuild       |  2 +-
+ dev-python/webcolors/webcolors-1.11.1.ebuild       |  2 +-
+ .../websocket-client-0.57.0.ebuild                 |  2 +-
+ dev-python/xlwt/xlwt-1.3.0-r1.ebuild               |  2 +-
+ dev-python/yapsy/yapsy-1.12.2.ebuild               |  2 +-
+ dev-python/zeroconf/zeroconf-0.24.4.ebuild         |  2 +-
+ media-sound/cdparanoia/Manifest                    |  1 -
+ media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild | 58 -----------------
+ media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild |  4 +-
+ .../files/cdparanoia-missing-sys_types_h.patch     | 24 +++++++
+ media-sound/jack2/jack2-1.9.14.ebuild              |  2 +-
+ net-misc/dhcp/dhcp-4.4.2-r2.ebuild                 |  2 +-
+ net-misc/ntp/ntp-4.2.8_p14-r2.ebuild               |  2 +-
+ net-wireless/blueman/blueman-2.1.2.ebuild          |  1 -
+ net-wireless/blueman/blueman-9999.ebuild           |  1 -
+ sys-auth/rtkit/rtkit-0.12-r1.ebuild                |  2 +-
+ sys-libs/libfaketime/libfaketime-0.9.8.ebuild      |  2 +-
+ sys-libs/readline/readline-8.0_p4.ebuild           |  2 +-
+ www-servers/tornado/tornado-6.0.4.ebuild           |  2 +-
+ x11-plugins/wmbiff/Manifest                        |  1 +
+ x11-plugins/wmbiff/wmbiff-0.4.36.ebuild            | 33 ++++++++++
+ x11-plugins/wmix/Manifest                          |  1 +
+ x11-plugins/wmix/wmix-3.5.ebuild                   | 21 ++++++
+ x11-plugins/wmmoonclock/Manifest                   |  1 +
+ x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild    | 19 ++++++
+ x11-plugins/wmweather+/Manifest                    |  1 +
+ x11-plugins/wmweather+/wmweather+-2.18.ebuild      | 21 ++++++
+ .../xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild   |  2 +-
+ xfce-base/thunar/thunar-1.8.14.ebuild              |  2 +-
+ .../xfce4-screensaver-0.1.10.ebuild                |  2 +-
+ 123 files changed, 416 insertions(+), 164 deletions(-)
+ create mode 100644 dev-python/pytest-xdist/files/pytest-xdist-1.32.0-timeout.patch
+ create mode 100644 dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
+ create mode 100644 dev-python/tld/tld-0.12.1.ebuild
+ create mode 100644 dev-python/tox/tox-3.15.0.ebuild
+ delete mode 100644 media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+ create mode 100644 media-sound/cdparanoia/files/cdparanoia-missing-sys_types_h.patch
+ create mode 100644 x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+ create mode 100644 x11-plugins/wmix/wmix-3.5.ebuild
+ create mode 100644 x11-plugins/wmmoonclock/wmmoonclock-1.30.ebuild
+ create mode 100644 x11-plugins/wmweather+/wmweather+-2.18.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