diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 219 |
1 files changed, 17 insertions, 202 deletions
diff --git a/gentoo.txt b/gentoo.txt index af2d3e789c93..a9e5952d7d89 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -13,6 +13,7 @@ 'status': 'official'} $ pmaint sync gentoo WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -27,210 +28,24 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 7ada574d58f..92bf7ccd26d master -> origin/master -Updating 7ada574d58f..92bf7ccd26d -Fast-forward - app-dicts/sword-Dan/Manifest | 1 - - app-dicts/sword-Dan/metadata.xml | 8 -- - app-dicts/sword-Dan/sword-Dan-2.1.ebuild | 12 -- - app-dicts/sword-FreLSG/Manifest | 1 - - app-dicts/sword-FreLSG/metadata.xml | 8 -- - app-dicts/sword-FreLSG/sword-FreLSG-1.3.ebuild | 12 -- - app-dicts/sword-HNV/Manifest | 1 - - app-dicts/sword-HNV/metadata.xml | 8 -- - app-dicts/sword-HNV/sword-HNV-1.8.ebuild | 12 -- - app-dicts/sword-KJVD/Manifest | 1 - - app-dicts/sword-KJVD/metadata.xml | 8 -- - app-dicts/sword-KJVD/sword-KJVD-1.1.ebuild | 12 -- - app-dicts/sword-RST/Manifest | 1 - - app-dicts/sword-RST/metadata.xml | 8 -- - app-dicts/sword-RST/sword-RST-1.6.ebuild | 12 -- - app-dicts/sword-SpaSEV/Manifest | 1 - - app-dicts/sword-SpaSEV/metadata.xml | 8 -- - app-dicts/sword-SpaSEV/sword-SpaSEV-1.1.ebuild | 12 -- - app-dicts/sword-WEB/Manifest | 1 - - app-dicts/sword-WEB/metadata.xml | 8 -- - app-dicts/sword-WEB/sword-WEB-1.8.ebuild | 12 -- - dev-haskell/alex/Manifest | 4 - - dev-haskell/alex/alex-3.1.3.ebuild | 72 ----------- - dev-haskell/alex/alex-3.1.7.ebuild | 80 ------------ - dev-haskell/alex/alex-3.2.1.ebuild | 83 ------------- - dev-haskell/alex/alex-3.2.4.ebuild | 73 ----------- - dev-haskell/alex/alex-3.2.5.ebuild | 2 +- - dev-haskell/cabal-install/Manifest | 3 - - .../cabal-install/cabal-install-1.18.1.0.ebuild | 54 -------- - .../cabal-install/cabal-install-1.20.0.3-r2.ebuild | 59 --------- - .../cabal-install/cabal-install-1.22.7.0.ebuild | 66 ---------- - .../cabal-install/cabal-install-3.0.0.0.ebuild | 2 +- - dev-haskell/cabal/cabal-2.4.0.1.ebuild | 2 +- - dev-haskell/cabal/cabal-3.0.1.0.ebuild | 2 +- - dev-haskell/colour/Manifest | 1 - - dev-haskell/colour/colour-2.3.3-r1.ebuild | 37 ------ - .../data-default-class-0.1.2.0.ebuild | 2 +- - .../data-default-instances-base-0.1.0.1.ebuild | 2 +- - dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild | 4 +- - .../dense-linear-algebra-0.1.0.0.ebuild | 2 +- - .../dictionary-sharing-0.1.0.0.ebuild | 2 +- - dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild | 2 +- - dev-haskell/haddock-api/haddock-api-2.23.1.ebuild | 2 +- - .../haddock-library/haddock-library-1.8.0.ebuild | 2 +- - dev-haskell/haddock/haddock-2.23.1.ebuild | 2 +- - dev-haskell/happy/Manifest | 2 - - dev-haskell/happy/happy-1.19.12.ebuild | 69 ----------- - dev-haskell/happy/happy-1.19.4.ebuild | 66 ---------- - dev-haskell/happy/happy-1.19.5.ebuild | 4 +- - ...eck-0.6.ebuild => lazysmallcheck-0.6-r1.ebuild} | 12 +- - dev-haskell/openglraw/openglraw-3.3.4.0.ebuild | 2 +- - .../postgresql-simple-0.6.2.ebuild | 2 +- - dev-haskell/shellish/Manifest | 1 - - .../shellish/files/shellish-0.1.4-ghc-7.10.patch | 9 -- - .../shellish/files/shellish-0.1.4-ghc-8.patch | 9 -- - dev-haskell/shellish/metadata.xml | 21 ---- - dev-haskell/shellish/shellish-0.1.4.ebuild | 30 ----- - dev-haskell/size-based/size-based-0.1.2.0.ebuild | 2 +- - dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild | 4 +- - ...{strict-0.3.2.ebuild => strict-0.3.2-r1.ebuild} | 12 +- - dev-haskell/tensor/tensor-1.0.0.1.ebuild | 4 +- - .../testing-type-modifiers-0.1.0.1.ebuild | 2 +- - dev-haskell/vector-space/vector-space-0.16.ebuild | 2 +- - dev-haskell/x11-xft/x11-xft-0.3.1.ebuild | 29 ----- - dev-python/backports-abc/Manifest | 1 - - dev-python/backports-abc/backports-abc-0.5.ebuild | 25 ---- - dev-python/backports-abc/metadata.xml | 13 -- - dev-python/backports-lzma/Manifest | 1 - - .../backports-lzma/backports-lzma-0.0.13.ebuild | 46 ------- - dev-python/backports-lzma/metadata.xml | 12 -- - dev-python/cddb-py/Manifest | 1 - - dev-python/cddb-py/cddb-py-1.4-r1.ebuild | 22 ---- - dev-python/cddb-py/metadata.xml | 11 -- - dev-python/distributed/Manifest | 1 - - .../distributed/distributed-1.18.0-r1.ebuild | 49 -------- - dev-python/distributed/metadata.xml | 17 --- - dev-python/elementtree/Manifest | 1 - - dev-python/elementtree/elementtree-1.2.6-r3.ebuild | 38 ------ - dev-python/elementtree/metadata.xml | 8 -- - dev-python/flup/Manifest | 1 - - dev-python/flup/flup-1.0.2-r1.ebuild | 20 --- - dev-python/flup/metadata.xml | 8 -- - dev-python/id3-py/Manifest | 1 - - dev-python/id3-py/id3-py-1.2-r1.ebuild | 16 --- - dev-python/id3-py/metadata.xml | 11 -- - dev-python/pupynere/Manifest | 1 - - dev-python/pupynere/metadata.xml | 15 --- - dev-python/pupynere/pupynere-1.0.15-r2.ebuild | 31 ----- - dev-python/pyid3lib/Manifest | 1 - - .../pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch | 20 --- - .../pyid3lib/files/pyid3lib-0.5.1-py25.patch | 57 --------- - dev-python/pyid3lib/metadata.xml | 11 -- - dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild | 33 ----- - dev-python/pylzma/Manifest | 1 - - dev-python/pylzma/metadata.xml | 11 -- - dev-python/pylzma/pylzma-0.4.9.ebuild | 31 ----- - dev-python/ruamel-std-pathlib/Manifest | 1 - - dev-python/ruamel-std-pathlib/metadata.xml | 12 -- - .../ruamel-std-pathlib-0.6.4-r1.ebuild | 27 ---- - .../mazesofmonad/mazesofmonad-1.0.9-r3.ebuild | 2 +- - media-sound/jack/Manifest | 1 - - .../jack-3.1.1-add-cddbserver-musicbrainz.patch | 15 --- - media-sound/jack/files/jack-3.1.1-python26.patch | 12 -- - .../files/jack-3.1.1-setup-and-cursesmodule.patch | 47 ------- - media-sound/jack/jack-3.1.1-r3.ebuild | 47 ------- - media-sound/jack/metadata.xml | 16 --- - media-sound/mixxx/Manifest | 1 - - media-sound/mixxx/mixxx-2.2.3-r2.ebuild | 137 --------------------- - profiles/package.mask | 71 +---------- - profiles/updates/3Q-2020 | 7 -- - sys-kernel/linux-headers/linux-headers-3.18.ebuild | 6 +- - sys-kernel/linux-headers/linux-headers-4.4.ebuild | 6 +- - sys-kernel/linux-headers/linux-headers-4.9.ebuild | 6 +- - www-apps/wordpress/Manifest | 2 +- - ...wordpress-5.5.ebuild => wordpress-5.5.1.ebuild} | 0 - 115 files changed, 55 insertions(+), 1865 deletions(-) - delete mode 100644 app-dicts/sword-Dan/Manifest - delete mode 100644 app-dicts/sword-Dan/metadata.xml - delete mode 100644 app-dicts/sword-Dan/sword-Dan-2.1.ebuild - delete mode 100644 app-dicts/sword-FreLSG/Manifest - delete mode 100644 app-dicts/sword-FreLSG/metadata.xml - delete mode 100644 app-dicts/sword-FreLSG/sword-FreLSG-1.3.ebuild - delete mode 100644 app-dicts/sword-HNV/Manifest - delete mode 100644 app-dicts/sword-HNV/metadata.xml - delete mode 100644 app-dicts/sword-HNV/sword-HNV-1.8.ebuild - delete mode 100644 app-dicts/sword-KJVD/Manifest - delete mode 100644 app-dicts/sword-KJVD/metadata.xml - delete mode 100644 app-dicts/sword-KJVD/sword-KJVD-1.1.ebuild - delete mode 100644 app-dicts/sword-RST/Manifest - delete mode 100644 app-dicts/sword-RST/metadata.xml - delete mode 100644 app-dicts/sword-RST/sword-RST-1.6.ebuild - delete mode 100644 app-dicts/sword-SpaSEV/Manifest - delete mode 100644 app-dicts/sword-SpaSEV/metadata.xml - delete mode 100644 app-dicts/sword-SpaSEV/sword-SpaSEV-1.1.ebuild - delete mode 100644 app-dicts/sword-WEB/Manifest - delete mode 100644 app-dicts/sword-WEB/metadata.xml - delete mode 100644 app-dicts/sword-WEB/sword-WEB-1.8.ebuild - delete mode 100644 dev-haskell/alex/alex-3.1.3.ebuild - delete mode 100644 dev-haskell/alex/alex-3.1.7.ebuild - delete mode 100644 dev-haskell/alex/alex-3.2.1.ebuild - delete mode 100644 dev-haskell/alex/alex-3.2.4.ebuild - delete mode 100644 dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild - delete mode 100644 dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild - delete mode 100644 dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild - delete mode 100644 dev-haskell/colour/colour-2.3.3-r1.ebuild - delete mode 100644 dev-haskell/happy/happy-1.19.12.ebuild - delete mode 100644 dev-haskell/happy/happy-1.19.4.ebuild - rename dev-haskell/lazysmallcheck/{lazysmallcheck-0.6.ebuild => lazysmallcheck-0.6-r1.ebuild} (79%) - delete mode 100644 dev-haskell/shellish/Manifest - delete mode 100644 dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch - delete mode 100644 dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch - delete mode 100644 dev-haskell/shellish/metadata.xml - delete mode 100644 dev-haskell/shellish/shellish-0.1.4.ebuild - rename dev-haskell/strict/{strict-0.3.2.ebuild => strict-0.3.2-r1.ebuild} (76%) - delete mode 100644 dev-haskell/x11-xft/x11-xft-0.3.1.ebuild - delete mode 100644 dev-python/backports-abc/Manifest - delete mode 100644 dev-python/backports-abc/backports-abc-0.5.ebuild - delete mode 100644 dev-python/backports-abc/metadata.xml - delete mode 100644 dev-python/backports-lzma/Manifest - delete mode 100644 dev-python/backports-lzma/backports-lzma-0.0.13.ebuild - delete mode 100644 dev-python/backports-lzma/metadata.xml - delete mode 100644 dev-python/cddb-py/Manifest - delete mode 100644 dev-python/cddb-py/cddb-py-1.4-r1.ebuild - delete mode 100644 dev-python/cddb-py/metadata.xml - delete mode 100644 dev-python/distributed/Manifest - delete mode 100644 dev-python/distributed/distributed-1.18.0-r1.ebuild - delete mode 100644 dev-python/distributed/metadata.xml - delete mode 100644 dev-python/elementtree/Manifest - delete mode 100644 dev-python/elementtree/elementtree-1.2.6-r3.ebuild - delete mode 100644 dev-python/elementtree/metadata.xml - delete mode 100644 dev-python/flup/Manifest - delete mode 100644 dev-python/flup/flup-1.0.2-r1.ebuild - delete mode 100644 dev-python/flup/metadata.xml - delete mode 100644 dev-python/id3-py/Manifest - delete mode 100644 dev-python/id3-py/id3-py-1.2-r1.ebuild - delete mode 100644 dev-python/id3-py/metadata.xml - delete mode 100644 dev-python/pupynere/Manifest - delete mode 100644 dev-python/pupynere/metadata.xml - delete mode 100644 dev-python/pupynere/pupynere-1.0.15-r2.ebuild - delete mode 100644 dev-python/pyid3lib/Manifest - delete mode 100644 dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch - delete mode 100644 dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch - delete mode 100644 dev-python/pyid3lib/metadata.xml - delete mode 100644 dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild - delete mode 100644 dev-python/pylzma/Manifest - delete mode 100644 dev-python/pylzma/metadata.xml - delete mode 100644 dev-python/pylzma/pylzma-0.4.9.ebuild - delete mode 100644 dev-python/ruamel-std-pathlib/Manifest - delete mode 100644 dev-python/ruamel-std-pathlib/metadata.xml - delete mode 100644 dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild - delete mode 100644 media-sound/jack/Manifest - delete mode 100644 media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch - delete mode 100644 media-sound/jack/files/jack-3.1.1-python26.patch - delete mode 100644 media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch - delete mode 100644 media-sound/jack/jack-3.1.1-r3.ebuild - delete mode 100644 media-sound/jack/metadata.xml - delete mode 100644 media-sound/mixxx/mixxx-2.2.3-r2.ebuild - rename www-apps/wordpress/{wordpress-5.5.ebuild => wordpress-5.5.1.ebuild} (100%) + 92bf7ccd26d..43512e61410 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 +WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 17% (15240/89150)
Updating files: 18% (16047/89150)
Updating files: 19% (16939/89150)
Updating files: 20% (17830/89150)
Updating files: 21% (18722/89150)
Updating files: 22% (19613/89150)
Updating files: 23% (20505/89150)
Updating files: 24% (21396/89150)
Updating files: 25% (22288/89150)
Updating files: 26% (23179/89150)
Updating files: 27% (24071/89150)
Updating files: 28% (24962/89150)
Updating files: 29% (25854/89150)
Updating files: 30% (26745/89150)
Updating files: 31% (27637/89150)
Updating files: 32% (28528/89150)
Updating files: 33% (29420/89150)
Updating files: 34% (30311/89150)
Updating files: 35% (31203/89150)
Updating files: 35% (31302/89150)
Updating files: 36% (32094/89150)
Updating files: 37% (32986/89150)
Updating files: 38% (33877/89150)
Updating files: 39% (34769/89150)
Updating files: 40% (35660/89150)
Updating files: 41% (36552/89150)
Updating files: 42% (37443/89150)
Updating files: 43% (38335/89150)
Updating files: 44% (39226/89150)
Updating files: 45% (40118/89150)
Updating files: 46% (41009/89150)
Updating files: 47% (41901/89150)
Updating files: 48% (42792/89150)
Updating files: 49% (43684/89150)
Updating files: 50% (44575/89150)
Updating files: 51% (45467/89150)
Updating files: 52% (46358/89150)
Updating files: 53% (47250/89150)
Updating files: 54% (48141/89150)
Updating files: 54% (48503/89150)
Updating files: 55% (49033/89150)
Updating files: 56% (49924/89150)
Updating files: 57% (50816/89150)
Updating files: 58% (51707/89150)
Updating files: 59% (52599/89150)
Updating files: 60% (53490/89150)
Updating files: 61% (54382/89150)
Updating files: 62% (55273/89150)
Updating files: 63% (56165/89150)
Updating files: 64% (57056/89150)
Updating files: 65% (57948/89150)
Updating files: 66% (58839/89150)
Updating files: 67% (59731/89150)
Updating files: 68% (60622/89150)
Updating files: 69% (61514/89150)
Updating files: 70% (62405/89150)
Updating files: 71% (63297/89150)
Updating files: 72% (64188/89150)
Updating files: 73% (65080/89150)
Updating files: 74% (65971/89150)
Updating files: 74% (66250/89150)
Updating files: 75% (66863/89150)
Updating files: 76% (67754/89150)
Updating files: 77% (68646/89150)
Updating files: 78% (69537/89150)
Updating files: 79% (70429/89150)
Updating files: 80% (71320/89150)
Updating files: 81% (72212/89150)
Updating files: 82% (73103/89150)
Updating files: 83% (73995/89150)
Updating files: 84% (74886/89150)
Updating files: 85% (75778/89150)
Updating files: 86% (76669/89150)
Updating files: 87% (77561/89150)
Updating files: 88% (78452/89150)
Updating files: 89% (79344/89150)
Updating files: 89% (79621/89150)
Updating files: 90% (80235/89150)
Updating files: 91% (81127/89150)
Updating files: 92% (82018/89150)
Updating files: 93% (82910/89150)
Updating files: 94% (83801/89150)
Updating files: 95% (84693/89150)
Updating files: 96% (85584/89150)
Updating files: 97% (86476/89150)
Updating files: 98% (87367/89150)
Updating files: 99% (88259/89150)
Updating files: 100% (89150/89150)
Updating files: 100% (89150/89150), 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 |