2022-12-26T18:30:01Z

1 files changed, 24 insertions, 66 deletions

diff --git a/didos.txt b/didos.txt
index 72c0c913b085..09d7e0f3d06a 100644
--- a/didos.txt
+++ b/didos.txt
@@ -15,75 +15,33 @@ pkgcore 0.12.17
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
 *** syncing didos
 From https://github.com/prototype99/didos
-   a5e8378b..0afd1f59  master     -> origin/master
- + f83be0f7...6ba7278b nodejs     -> origin/nodejs  (forced update)
-Updating a5e8378b..0afd1f59
-Fast-forward
- dev-lang/rust/ChangeLog                            |   8 +-
- ...rust-1.34.2-r2.ebuild => rust-1.34.2-r3.ebuild} |   2 +-
- dev-python/pyopenssl/ChangeLog                     |   2 +
- ...sl-17.5.0.ebuild => pyopenssl-17.5.0-r1.ebuild} |   2 +-
- dev-python/python-utils/ChangeLog                  |   2 +
- ...s-2.3.0.ebuild => python-utils-2.3.0-r1.ebuild} |   2 +-
- dev-python/subprocess-keepalive/ChangeLog          |   2 +
- .../subprocess-keepalive-0.3.2-r1.ebuild}          |   2 +-
- dev-python/terminaltables/ChangeLog                |   4 +
- ...2.1.0.ebuild => terminaltables-2.1.0-r1.ebuild} |   2 +-
- ...3.1.0.ebuild => terminaltables-3.1.0-r1.ebuild} |   2 +-
- dev-python/travis-ci-utils/ChangeLog               |   2 +
- .../travis-ci-utils-0.11.0-r1.ebuild}              |   2 +-
- dev-python/typing/ChangeLog                        |   2 +
- ...{typing-3.6.4.ebuild => typing-3.6.4-r1.ebuild} |   2 +-
- dev-python/xkcdpass/ChangeLog                      |   2 +
- ...ass-1.16.5.ebuild => xkcdpass-1.16.5-r1.ebuild} |   2 +-
- dev-util/licen/ChangeLog                           |   2 +
- ...0324.ebuild => licen-0.0.0_p20150324-r1.ebuild} |   2 +-
- dev-util/meld/ChangeLog                            |  12 +-
- dev-util/meld/meld-3.21.0-r1.ebuild                |  56 -----
- ...meld-3.21.0-r2.ebuild => meld-3.21.0-r3.ebuild} |   2 +-
- dev-util/meld/meld-3.21.0.ebuild                   |  51 -----
- mail-client/thunderbird/ChangeLog                  |   5 +-
- ....6.1-r1.ebuild => thunderbird-60.6.1-r2.ebuild} |   2 +-
- net-libs/nodejs/nodejs-12.13.0.ebuild              | 226 --------------------
- net-libs/nodejs/nodejs-12.14.0.ebuild              | 229 ---------------------
- net-libs/nodejs/nodejs-8.15.1-r1.ebuild            | 221 --------------------
- net-libs/nodejs/nodejs-8.15.1-r2.ebuild            | 221 --------------------
- net-libs/nodejs/nodejs-8.15.1-r3.ebuild            | 221 --------------------
- 30 files changed, 44 insertions(+), 1248 deletions(-)
- rename dev-lang/rust/{rust-1.34.2-r2.ebuild => rust-1.34.2-r3.ebuild} (99%)
- create mode 100644 dev-python/pyopenssl/ChangeLog
- rename dev-python/pyopenssl/{pyopenssl-17.5.0.ebuild => pyopenssl-17.5.0-r1.ebuild} (99%)
- create mode 100644 dev-python/python-utils/ChangeLog
- rename dev-python/python-utils/{python-utils-2.3.0.ebuild => python-utils-2.3.0-r1.ebuild} (99%)
- create mode 100644 dev-python/subprocess-keepalive/ChangeLog
- rename dev-python/{travis-ci-utils/travis-ci-utils-0.11.0.ebuild => subprocess-keepalive/subprocess-keepalive-0.3.2-r1.ebuild} (98%)
- create mode 100644 dev-python/terminaltables/ChangeLog
- rename dev-python/terminaltables/{terminaltables-2.1.0.ebuild => terminaltables-2.1.0-r1.ebuild} (98%)
- rename dev-python/terminaltables/{terminaltables-3.1.0.ebuild => terminaltables-3.1.0-r1.ebuild} (98%)
- create mode 100644 dev-python/travis-ci-utils/ChangeLog
- rename dev-python/{subprocess-keepalive/subprocess-keepalive-0.3.2.ebuild => travis-ci-utils/travis-ci-utils-0.11.0-r1.ebuild} (98%)
- create mode 100644 dev-python/typing/ChangeLog
- rename dev-python/typing/{typing-3.6.4.ebuild => typing-3.6.4-r1.ebuild} (99%)
- create mode 100644 dev-python/xkcdpass/ChangeLog
- rename dev-python/xkcdpass/{xkcdpass-1.16.5.ebuild => xkcdpass-1.16.5-r1.ebuild} (99%)
- create mode 100644 dev-util/licen/ChangeLog
- rename dev-util/licen/{licen-0.0.0_p20150324.ebuild => licen-0.0.0_p20150324-r1.ebuild} (98%)
- delete mode 100644 dev-util/meld/meld-3.21.0-r1.ebuild
- rename dev-util/meld/{meld-3.21.0-r2.ebuild => meld-3.21.0-r3.ebuild} (99%)
- delete mode 100644 dev-util/meld/meld-3.21.0.ebuild
- rename mail-client/thunderbird/{thunderbird-60.6.1-r1.ebuild => thunderbird-60.6.1-r2.ebuild} (99%)
- delete mode 100644 net-libs/nodejs/nodejs-12.13.0.ebuild
- delete mode 100644 net-libs/nodejs/nodejs-12.14.0.ebuild
- delete mode 100644 net-libs/nodejs/nodejs-8.15.1-r1.ebuild
- delete mode 100644 net-libs/nodejs/nodejs-8.15.1-r2.ebuild
- delete mode 100644 net-libs/nodejs/nodejs-8.15.1-r3.ebuild
+ + 0afd1f59...977124f9 master     -> origin/master  (forced update)
+ * [new branch]        nodejs-old -> origin/nodejs-old
+hint: You have divergent branches and need to specify how to reconcile them.
+hint: You can do so by running one of the following commands sometime before
+hint: your next pull:
+hint: 
+hint:   git config pull.rebase false  # merge
+hint:   git config pull.rebase true   # rebase
+hint:   git config pull.ff only       # fast-forward only
+hint: 
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+fatal: Need to specify how to reconcile divergent branches.
+!!! failed syncing didos
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
+*** syncing didos
+Cloning into '/var/lib/repo-mirror-ci/sync/didos'...
 *** synced didos
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 didos
  * dev-lang/rust-1.34.2-r3: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
- * sys-process/ps_mem-3.6: failed sourcing ebuild: EAPI=6 not supported, (distutils-r1.eclass, line  49:  called die)
- * www-client/firefox-70.0.1: failed sourcing ebuild: EAPI=6 not supported, (llvm.eclass, line  61:  called die)
- * www-client/firefox-72.0.2: failed sourcing ebuild: EAPI=6 not supported, (llvm.eclass, line  61:  called die)
+ * www-client/firefox-70.0.1-r1: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
+ * www-client/firefox-72.0.2-r1: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
  * Cache regen failed with 1