diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 184 |
1 files changed, 15 insertions, 169 deletions
diff --git a/gentoo.txt b/gentoo.txt index e2c50da0db7a..039d9b89c8fe 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -16,176 +16,22 @@ pkgcore 0.12.1 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo *** syncing gentoo From https://anongit.gentoo.org/git/repo/gentoo - ed8b20ec48f..57a37fd2262 master -> origin/master -Updating ed8b20ec48f..57a37fd2262 -Fast-forward - app-arch/tarlz/tarlz-0.21.ebuild | 6 +- - ...dal-7.7.0-r1.ebuild => heimdal-7.7.0-r2.ebuild} | 1 + - ....ebuild => johntheripper-jumbo-1.9.0-r2.ebuild} | 2 +- - .../johntheripper-jumbo-9999.ebuild | 2 +- - ...ld => open-vm-tools-11.2.0_p16938113-r2.ebuild} | 2 +- - ...ld => open-vm-tools-11.2.5_p17337674-r1.ebuild} | 2 +- - ...lay-3.5.ebuild => carbon-c-relay-3.5-r1.ebuild} | 2 +- - ...lay-3.6.ebuild => carbon-c-relay-3.6-r1.ebuild} | 2 +- - ...3.7.2.ebuild => carbon-c-relay-3.7.2-r1.ebuild} | 2 +- - ...reen-4.8.0-r2.ebuild => screen-4.8.0-r3.ebuild} | 1 + - app-misc/screen/screen-9999.ebuild | 1 + - ...db-2.0.2.ebuild => timescaledb-2.0.1-r2.ebuild} | 2 +- - ...2.0.1-r1.ebuild => timescaledb-2.0.2-r1.ebuild} | 2 +- - ...db-2.1.0.ebuild => timescaledb-2.1.0-r1.ebuild} | 2 +- - ...db-2.1.1.ebuild => timescaledb-2.1.1-r1.ebuild} | 2 +- - ...db-2.2.1.ebuild => timescaledb-2.2.1-r1.ebuild} | 2 +- - ...1.4.17.ebuild => hsopenssl-0.11.4.17-r1.ebuild} | 4 +- - .../{ruby-2.5.9.ebuild => ruby-2.5.9-r1.ebuild} | 1 + - .../{ruby-2.6.7.ebuild => ruby-2.6.7-r1.ebuild} | 1 + - .../{ruby-2.7.3-r1.ebuild => ruby-2.7.3-r2.ebuild} | 1 + - .../{ruby-3.0.1.ebuild => ruby-3.0.1-r1.ebuild} | 1 + - ...log-8.2.3.ebuild => swi-prolog-8.2.3-r1.ebuild} | 2 +- - ...log-8.2.4.ebuild => swi-prolog-8.2.4-r1.ebuild} | 2 +- - ...g-8.3.24.ebuild => swi-prolog-8.3.23-r1.ebuild} | 2 +- - ...g-8.3.23.ebuild => swi-prolog-8.3.24-r1.ebuild} | 2 +- - ...g-8.3.25.ebuild => swi-prolog-8.3.25-r1.ebuild} | 2 +- - ...il-1.6.1-r6.ebuild => apr-util-1.6.1-r7.ebuild} | 3 +- - dev-libs/libucl/libucl-0.8.1-r100.ebuild | 4 +- - dev-libs/libucl/libucl-9999.ebuild | 4 +- - ...lisp-2.49.92.ebuild => clisp-2.49.92-r1.ebuild} | 1 + - ...09-r101.ebuild => luaossl-20200709-r102.ebuild} | 2 +- - ....ebuild => Crypt-OpenSSL-DSA-0.190.0-r3.ebuild} | 2 +- - ....ebuild => Crypt-OpenSSL-DSA-0.190.0-r4.ebuild} | 2 +- - ....ebuild => Crypt-OpenSSL-DSA-0.200.0-r1.ebuild} | 2 +- - ...0.ebuild => Crypt-OpenSSL-EC-1.320.0-r1.ebuild} | 2 +- - ...ebuild => Crypt-OpenSSL-ECDSA-0.80.0-r4.ebuild} | 2 +- - ....270.0.ebuild => Crypt-SMIME-0.270.0-r1.ebuild} | 2 +- - .../django-configurations-2.2.ebuild | 2 +- - .../pytest-django/pytest-django-4.4.0.ebuild | 2 +- - ...e-1.2.7.ebuild => eventmachine-1.2.7-r1.ebuild} | 2 +- - dev-scheme/guile/guile-1.8.8-r3.ebuild | 1 + - ...ile-2.0.14-r3.ebuild => guile-2.0.14-r4.ebuild} | 3 +- - .../{guile-2.2.7.ebuild => guile-2.2.7-r1.ebuild} | 3 +- - dev-scheme/guile/guile-3.0.7.ebuild | 3 +- - ...ossil-2.12.1.ebuild => fossil-2.12.1-r1.ebuild} | 2 +- - .../{fossil-2.13.ebuild => fossil-2.13-r1.ebuild} | 2 +- - .../{fossil-2.14.ebuild => fossil-2.14-r1.ebuild} | 2 +- - eclass/vdr-plugin-2.eclass | 127 ++++++++++++++------- - ...ed-3.7.0-r1.ebuild => sylpheed-3.7.0-r2.ebuild} | 2 +- - media-plugins/vdr-dvbsddevice/Manifest | 1 - - media-plugins/vdr-dvbsddevice/metadata.xml | 8 ++ - .../vdr-dvbsddevice/vdr-dvbsddevice-2.0.0.ebuild | 24 ---- - ...0-r1.ebuild => vdr-dvbsddevice-2.2.0-r2.ebuild} | 9 +- - media-plugins/vdr-rssreader/metadata.xml | 19 ++- - .../vdr-rssreader/vdr-rssreader-2.2.1-r2.ebuild | 35 ++++++ - .../vdr-rssreader/vdr-rssreader-2.4.0-r1.ebuild | 37 ++++++ - media-video/noad/Manifest | 1 + - media-video/noad/metadata.xml | 13 ++- - media-video/noad/noad-0.8.7.ebuild | 70 ++++++++++++ - ... => multipath-tcp-tools-2018_p12_p21-r1.ebuild} | 4 +- - .../multipath-tcp-tools-999999.ebuild | 4 +- - ....1-r1.ebuild => nagios-plugins-2.3.1-r2.ebuild} | 2 +- - ...2.3.3.ebuild => nagios-plugins-2.3.3-r1.ebuild} | 2 +- - .../{ntopng-4.2.ebuild => ntopng-4.2-r1.ebuild} | 2 +- - .../{ppp-2.4.9-r2.ebuild => ppp-2.4.9-r3.ebuild} | 5 +- - ...2.3.ebuild => dnssec-validator-2.2.3-r1.ebuild} | 4 +- - ...frox-0.7.18-r6.ebuild => frox-0.7.18-r7.ebuild} | 2 +- - ...p14-r1.ebuild => wvstreams-4.6.1_p14-r2.ebuild} | 3 +- - net-libs/wvstreams/wvstreams-99999.ebuild | 3 +- - net-misc/cfengine/cfengine-3.6.2.ebuild | 2 +- - net-misc/mulk/mulk-0.7.0-r1.ebuild | 4 +- - ...01214.ebuild => ldapvi-1.7_p20101214-r1.ebuild} | 4 +- - ...dap-2.4.57.ebuild => openldap-2.4.57-r1.ebuild} | 8 +- - ...dap-2.4.58.ebuild => openldap-2.4.58-r1.ebuild} | 8 +- - net-nds/openldap/openldap-2.5.4.ebuild | 8 +- - ...s-0.13.ebuild => classified-ads-0.13-r1.ebuild} | 4 +- - ...voxy-3.0.32.ebuild => privoxy-3.0.32-r1.ebuild} | 6 +- - .../{squid-4.15.ebuild => squid-4.15-r1.ebuild} | 2 +- - ...1-r4.ebuild => telepathy-salut-0.8.1-r5.ebuild} | 2 +- - ...1.999.127.ebuild => badvpn-1.999.127-r1.ebuild} | 4 +- - ...1.999.129.ebuild => badvpn-1.999.129-r1.ebuild} | 4 +- - ...1.999.130.ebuild => badvpn-1.999.130-r1.ebuild} | 4 +- - ...0.8.2-r6.ebuild => ipsec-tools-0.8.2-r7.ebuild} | 2 +- - ...{datamash-1.7.ebuild => datamash-1.7-r1.ebuild} | 4 +- - ....55.ebuild => accountsservice-0.6.55-r1.ebuild} | 3 +- - sys-block/whdd/whdd-3.0.1.ebuild | 2 +- - sys-block/whdd/whdd-9999.ebuild | 4 +- - ...5_p120826.ebuild => jd-2.8.5_p120826-r1.ebuild} | 2 +- - ...9_p150226.ebuild => jd-2.8.9_p150226-r1.ebuild} | 2 +- - .../{uget-2.2.1.ebuild => uget-2.2.1-r1.ebuild} | 2 +- - ...tling-0.16-r1.ebuild => gatling-0.16-r2.ebuild} | 2 +- - ...t-1.22.0.ebuild => nginx-unit-1.22.0-r1.ebuild} | 2 +- - .../{puma-5.3.2.ebuild => puma-5.3.2-r1.ebuild} | 2 +- - 93 files changed, 382 insertions(+), 181 deletions(-) - rename app-crypt/heimdal/{heimdal-7.7.0-r1.ebuild => heimdal-7.7.0-r2.ebuild} (99%) - rename app-crypt/johntheripper-jumbo/{johntheripper-jumbo-1.9.0-r1.ebuild => johntheripper-jumbo-1.9.0-r2.ebuild} (98%) - rename app-emulation/open-vm-tools/{open-vm-tools-11.2.0_p16938113-r1.ebuild => open-vm-tools-11.2.0_p16938113-r2.ebuild} (99%) - rename app-emulation/open-vm-tools/{open-vm-tools-11.2.5_p17337674.ebuild => open-vm-tools-11.2.5_p17337674-r1.ebuild} (99%) - rename app-misc/carbon-c-relay/{carbon-c-relay-3.5.ebuild => carbon-c-relay-3.5-r1.ebuild} (98%) - rename app-misc/carbon-c-relay/{carbon-c-relay-3.6.ebuild => carbon-c-relay-3.6-r1.ebuild} (98%) - rename app-misc/carbon-c-relay/{carbon-c-relay-3.7.2.ebuild => carbon-c-relay-3.7.2-r1.ebuild} (98%) - rename app-misc/screen/{screen-4.8.0-r2.ebuild => screen-4.8.0-r3.ebuild} (99%) - rename dev-db/timescaledb/{timescaledb-2.0.2.ebuild => timescaledb-2.0.1-r2.ebuild} (98%) - rename dev-db/timescaledb/{timescaledb-2.0.1-r1.ebuild => timescaledb-2.0.2-r1.ebuild} (98%) - rename dev-db/timescaledb/{timescaledb-2.1.0.ebuild => timescaledb-2.1.0-r1.ebuild} (98%) - rename dev-db/timescaledb/{timescaledb-2.1.1.ebuild => timescaledb-2.1.1-r1.ebuild} (98%) - rename dev-db/timescaledb/{timescaledb-2.2.1.ebuild => timescaledb-2.2.1-r1.ebuild} (98%) - rename dev-haskell/hsopenssl/{hsopenssl-0.11.4.17.ebuild => hsopenssl-0.11.4.17-r1.ebuild} (94%) - rename dev-lang/ruby/{ruby-2.5.9.ebuild => ruby-2.5.9-r1.ebuild} (99%) - rename dev-lang/ruby/{ruby-2.6.7.ebuild => ruby-2.6.7-r1.ebuild} (99%) - rename dev-lang/ruby/{ruby-2.7.3-r1.ebuild => ruby-2.7.3-r2.ebuild} (99%) - rename dev-lang/ruby/{ruby-3.0.1.ebuild => ruby-3.0.1-r1.ebuild} (99%) - rename dev-lang/swi-prolog/{swi-prolog-8.2.3.ebuild => swi-prolog-8.2.3-r1.ebuild} (98%) - rename dev-lang/swi-prolog/{swi-prolog-8.2.4.ebuild => swi-prolog-8.2.4-r1.ebuild} (98%) - rename dev-lang/swi-prolog/{swi-prolog-8.3.24.ebuild => swi-prolog-8.3.23-r1.ebuild} (98%) - rename dev-lang/swi-prolog/{swi-prolog-8.3.23.ebuild => swi-prolog-8.3.24-r1.ebuild} (98%) - rename dev-lang/swi-prolog/{swi-prolog-8.3.25.ebuild => swi-prolog-8.3.25-r1.ebuild} (98%) - rename dev-libs/apr-util/{apr-util-1.6.1-r6.ebuild => apr-util-1.6.1-r7.ebuild} (99%) - rename dev-lisp/clisp/{clisp-2.49.92.ebuild => clisp-2.49.92-r1.ebuild} (99%) - rename dev-lua/luaossl/{luaossl-20200709-r101.ebuild => luaossl-20200709-r102.ebuild} (98%) - rename dev-perl/Crypt-OpenSSL-DSA/{Crypt-OpenSSL-DSA-0.190.0-r1.ebuild => Crypt-OpenSSL-DSA-0.190.0-r3.ebuild} (95%) - rename dev-perl/Crypt-OpenSSL-DSA/{Crypt-OpenSSL-DSA-0.190.0-r2.ebuild => Crypt-OpenSSL-DSA-0.190.0-r4.ebuild} (96%) - rename dev-perl/Crypt-OpenSSL-DSA/{Crypt-OpenSSL-DSA-0.200.0.ebuild => Crypt-OpenSSL-DSA-0.200.0-r1.ebuild} (96%) - rename dev-perl/Crypt-OpenSSL-EC/{Crypt-OpenSSL-EC-1.320.0.ebuild => Crypt-OpenSSL-EC-1.320.0-r1.ebuild} (96%) - rename dev-perl/Crypt-OpenSSL-ECDSA/{Crypt-OpenSSL-ECDSA-0.80.0-r3.ebuild => Crypt-OpenSSL-ECDSA-0.80.0-r4.ebuild} (96%) - rename dev-perl/Crypt-SMIME/{Crypt-SMIME-0.270.0.ebuild => Crypt-SMIME-0.270.0-r1.ebuild} (96%) - rename dev-ruby/eventmachine/{eventmachine-1.2.7.ebuild => eventmachine-1.2.7-r1.ebuild} (99%) - rename dev-scheme/guile/{guile-2.0.14-r3.ebuild => guile-2.0.14-r4.ebuild} (98%) - rename dev-scheme/guile/{guile-2.2.7.ebuild => guile-2.2.7-r1.ebuild} (97%) - rename dev-vcs/fossil/{fossil-2.12.1.ebuild => fossil-2.12.1-r1.ebuild} (98%) - rename dev-vcs/fossil/{fossil-2.13.ebuild => fossil-2.13-r1.ebuild} (98%) - rename dev-vcs/fossil/{fossil-2.14.ebuild => fossil-2.14-r1.ebuild} (98%) - rename mail-client/sylpheed/{sylpheed-3.7.0-r1.ebuild => sylpheed-3.7.0-r2.ebuild} (98%) - delete mode 100644 media-plugins/vdr-dvbsddevice/vdr-dvbsddevice-2.0.0.ebuild - rename media-plugins/vdr-dvbsddevice/{vdr-dvbsddevice-2.2.0-r1.ebuild => vdr-dvbsddevice-2.2.0-r2.ebuild} (69%) - create mode 100644 media-plugins/vdr-rssreader/vdr-rssreader-2.2.1-r2.ebuild - create mode 100644 media-plugins/vdr-rssreader/vdr-rssreader-2.4.0-r1.ebuild - create mode 100644 media-video/noad/noad-0.8.7.ebuild - rename net-analyzer/multipath-tcp-tools/{multipath-tcp-tools-2018_p12_p21.ebuild => multipath-tcp-tools-2018_p12_p21-r1.ebuild} (93%) - rename net-analyzer/nagios-plugins/{nagios-plugins-2.3.1-r1.ebuild => nagios-plugins-2.3.1-r2.ebuild} (99%) - rename net-analyzer/nagios-plugins/{nagios-plugins-2.3.3.ebuild => nagios-plugins-2.3.3-r1.ebuild} (99%) - rename net-analyzer/ntopng/{ntopng-4.2.ebuild => ntopng-4.2-r1.ebuild} (99%) - rename net-dialup/ppp/{ppp-2.4.9-r2.ebuild => ppp-2.4.9-r3.ebuild} (99%) - rename net-dns/dnssec-validator/{dnssec-validator-2.2.3.ebuild => dnssec-validator-2.2.3-r1.ebuild} (94%) - rename net-ftp/frox/{frox-0.7.18-r6.ebuild => frox-0.7.18-r7.ebuild} (98%) - rename net-libs/wvstreams/{wvstreams-4.6.1_p14-r1.ebuild => wvstreams-4.6.1_p14-r2.ebuild} (99%) - rename net-nds/ldapvi/{ldapvi-1.7_p20101214.ebuild => ldapvi-1.7_p20101214-r1.ebuild} (92%) - rename net-nds/openldap/{openldap-2.4.57.ebuild => openldap-2.4.57-r1.ebuild} (99%) - rename net-nds/openldap/{openldap-2.4.58.ebuild => openldap-2.4.58-r1.ebuild} (99%) - rename net-p2p/classified-ads/{classified-ads-0.13.ebuild => classified-ads-0.13-r1.ebuild} (96%) - rename net-proxy/privoxy/{privoxy-3.0.32.ebuild => privoxy-3.0.32-r1.ebuild} (97%) - rename net-proxy/squid/{squid-4.15.ebuild => squid-4.15-r1.ebuild} (99%) - rename net-voip/telepathy-salut/{telepathy-salut-0.8.1-r4.ebuild => telepathy-salut-0.8.1-r5.ebuild} (96%) - rename net-vpn/badvpn/{badvpn-1.999.127.ebuild => badvpn-1.999.127-r1.ebuild} (97%) - rename net-vpn/badvpn/{badvpn-1.999.129.ebuild => badvpn-1.999.129-r1.ebuild} (97%) - rename net-vpn/badvpn/{badvpn-1.999.130.ebuild => badvpn-1.999.130-r1.ebuild} (97%) - rename net-vpn/ipsec-tools/{ipsec-tools-0.8.2-r6.ebuild => ipsec-tools-0.8.2-r7.ebuild} (99%) - rename sci-calculators/datamash/{datamash-1.7.ebuild => datamash-1.7-r1.ebuild} (88%) - rename sys-apps/accountsservice/{accountsservice-0.6.55.ebuild => accountsservice-0.6.55-r1.ebuild} (96%) - rename www-client/jd/{jd-2.8.5_p120826.ebuild => jd-2.8.5_p120826-r1.ebuild} (97%) - rename www-client/jd/{jd-2.8.9_p150226.ebuild => jd-2.8.9_p150226-r1.ebuild} (97%) - rename www-client/uget/{uget-2.2.1.ebuild => uget-2.2.1-r1.ebuild} (97%) - rename www-servers/gatling/{gatling-0.16-r1.ebuild => gatling-0.16-r2.ebuild} (98%) - rename www-servers/nginx-unit/{nginx-unit-1.22.0.ebuild => nginx-unit-1.22.0-r1.ebuild} (98%) - rename www-servers/puma/{puma-5.3.2.ebuild => puma-5.3.2-r1.ebuild} (98%) + 57a37fd2262..a09c0894b69 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> + +!!! failed syncing gentoo + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo +*** syncing gentoo +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 20% (17268/85674)
Updating files: 21% (17992/85674)
Updating files: 22% (18849/85674)
Updating files: 23% (19706/85674)
Updating files: 24% (20562/85674)
Updating files: 25% (21419/85674)
Updating files: 26% (22276/85674)
Updating files: 27% (23132/85674)
Updating files: 28% (23989/85674)
Updating files: 29% (24846/85674)
Updating files: 30% (25703/85674)
Updating files: 31% (26559/85674)
Updating files: 32% (27416/85674)
Updating files: 33% (28273/85674)
Updating files: 34% (29130/85674)
Updating files: 35% (29986/85674)
Updating files: 36% (30843/85674)
Updating files: 37% (31700/85674)
Updating files: 38% (32557/85674)
Updating files: 39% (33413/85674)
Updating files: 40% (34270/85674)
Updating files: 41% (35127/85674)
Updating files: 42% (35984/85674)
Updating files: 43% (36840/85674)
Updating files: 43% (36887/85674)
Updating files: 44% (37697/85674)
Updating files: 45% (38554/85674)
Updating files: 46% (39411/85674)
Updating files: 47% (40267/85674)
Updating files: 48% (41124/85674)
Updating files: 49% (41981/85674)
Updating files: 50% (42837/85674)
Updating files: 51% (43694/85674)
Updating files: 52% (44551/85674)
Updating files: 53% (45408/85674)
Updating files: 54% (46264/85674)
Updating files: 55% (47121/85674)
Updating files: 56% (47978/85674)
Updating files: 57% (48835/85674)
Updating files: 58% (49691/85674)
Updating files: 59% (50548/85674)
Updating files: 60% (51405/85674)
Updating files: 61% (52262/85674)
Updating files: 62% (53118/85674)
Updating files: 63% (53975/85674)
Updating files: 63% (54065/85674)
Updating files: 64% (54832/85674)
Updating files: 65% (55689/85674)
Updating files: 66% (56545/85674)
Updating files: 67% (57402/85674)
Updating files: 68% (58259/85674)
Updating files: 69% (59116/85674)
Updating files: 70% (59972/85674)
Updating files: 71% (60829/85674)
Updating files: 72% (61686/85674)
Updating files: 73% (62543/85674)
Updating files: 74% (63399/85674)
Updating files: 75% (64256/85674)
Updating files: 76% (65113/85674)
Updating files: 77% (65969/85674)
Updating files: 78% (66826/85674)
Updating files: 79% (67683/85674)
Updating files: 80% (68540/85674)
Updating files: 81% (69396/85674)
Updating files: 82% (70253/85674)
Updating files: 83% (71110/85674)
Updating files: 84% (71967/85674)
Updating files: 84% (72722/85674)
Updating files: 85% (72823/85674)
Updating files: 86% (73680/85674)
Updating files: 87% (74537/85674)
Updating files: 88% (75394/85674)
Updating files: 89% (76250/85674)
Updating files: 90% (77107/85674)
Updating files: 91% (77964/85674)
Updating files: 92% (78821/85674)
Updating files: 93% (79677/85674)
Updating files: 94% (80534/85674)
Updating files: 95% (81391/85674)
Updating files: 96% (82248/85674)
Updating files: 97% (83104/85674)
Updating files: 98% (83961/85674)
Updating files: 99% (84818/85674)
Updating files: 100% (85674/85674)
Updating files: 100% (85674/85674), done. *** synced gentoo - * 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 gentoo |