diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 172 |
1 files changed, 15 insertions, 157 deletions
diff --git a/gentoo.txt b/gentoo.txt index 3a103b169bf2..16e6145f5a98 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -29,164 +29,22 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 182f386c941..13678c124ce master -> origin/master -Updating 182f386c941..13678c124ce -Fast-forward - kde-plasma/bluedevil/Manifest | 2 +- - .../bluedevil/{bluedevil-5.21.3.ebuild => bluedevil-5.21.4.ebuild} | 0 - kde-plasma/breeze-grub/Manifest | 2 +- - .../{breeze-grub-5.21.3.ebuild => breeze-grub-5.21.4.ebuild} | 0 - kde-plasma/breeze-gtk/Manifest | 2 +- - .../breeze-gtk/{breeze-gtk-5.21.3.ebuild => breeze-gtk-5.21.4.ebuild} | 0 - kde-plasma/breeze-plymouth/Manifest | 2 +- - .../{breeze-plymouth-5.21.3.ebuild => breeze-plymouth-5.21.4.ebuild} | 0 - kde-plasma/breeze/Manifest | 2 +- - kde-plasma/breeze/{breeze-5.21.3.ebuild => breeze-5.21.4.ebuild} | 0 - kde-plasma/discover/Manifest | 2 +- - kde-plasma/discover/{discover-5.21.3.ebuild => discover-5.21.4.ebuild} | 2 ++ - kde-plasma/drkonqi/Manifest | 2 +- - kde-plasma/drkonqi/{drkonqi-5.21.3.ebuild => drkonqi-5.21.4.ebuild} | 0 - kde-plasma/kactivitymanagerd/Manifest | 2 +- - ...{kactivitymanagerd-5.21.3.ebuild => kactivitymanagerd-5.21.4.ebuild} | 0 - kde-plasma/kde-cli-tools/Manifest | 2 +- - .../{kde-cli-tools-5.21.3.ebuild => kde-cli-tools-5.21.4.ebuild} | 0 - kde-plasma/kde-gtk-config/Manifest | 2 +- - .../{kde-gtk-config-5.21.3.ebuild => kde-gtk-config-5.21.4.ebuild} | 0 - kde-plasma/kdecoration/Manifest | 2 +- - .../{kdecoration-5.21.3.ebuild => kdecoration-5.21.4.ebuild} | 0 - kde-plasma/kdeplasma-addons/Manifest | 2 +- - .../{kdeplasma-addons-5.21.3.ebuild => kdeplasma-addons-5.21.4.ebuild} | 0 - kde-plasma/kgamma/Manifest | 2 +- - kde-plasma/kgamma/{kgamma-5.21.3.ebuild => kgamma-5.21.4.ebuild} | 0 - kde-plasma/khotkeys/Manifest | 2 +- - kde-plasma/khotkeys/{khotkeys-5.21.3.ebuild => khotkeys-5.21.4.ebuild} | 0 - kde-plasma/kinfocenter/Manifest | 2 +- - .../{kinfocenter-5.21.3.ebuild => kinfocenter-5.21.4.ebuild} | 0 - kde-plasma/kmenuedit/Manifest | 2 +- - .../kmenuedit/{kmenuedit-5.21.3.ebuild => kmenuedit-5.21.4.ebuild} | 0 - kde-plasma/kscreen/Manifest | 2 +- - kde-plasma/kscreen/{kscreen-5.21.3.ebuild => kscreen-5.21.4.ebuild} | 0 - kde-plasma/kscreenlocker/Manifest | 2 +- - .../{kscreenlocker-5.21.3.ebuild => kscreenlocker-5.21.4.ebuild} | 0 - kde-plasma/ksshaskpass/Manifest | 2 +- - .../{ksshaskpass-5.21.3.ebuild => ksshaskpass-5.21.4.ebuild} | 0 - kde-plasma/ksysguard/Manifest | 2 +- - .../ksysguard/{ksysguard-5.21.3.ebuild => ksysguard-5.21.4.ebuild} | 0 - kde-plasma/kwallet-pam/Manifest | 2 +- - .../{kwallet-pam-5.21.3.ebuild => kwallet-pam-5.21.4.ebuild} | 0 - kde-plasma/kwayland-integration/Manifest | 2 +- - ...and-integration-5.21.3.ebuild => kwayland-integration-5.21.4.ebuild} | 0 - kde-plasma/kwayland-server/Manifest | 2 +- - .../{kwayland-server-5.21.3.ebuild => kwayland-server-5.21.4.ebuild} | 0 - kde-plasma/kwin/Manifest | 2 +- - kde-plasma/kwin/{kwin-5.21.3.ebuild => kwin-5.21.4.ebuild} | 0 - kde-plasma/kwrited/Manifest | 2 +- - kde-plasma/kwrited/{kwrited-5.21.3.ebuild => kwrited-5.21.4.ebuild} | 0 - kde-plasma/libkscreen/Manifest | 2 +- - .../libkscreen/{libkscreen-5.21.3.ebuild => libkscreen-5.21.4.ebuild} | 0 - kde-plasma/libksysguard/Manifest | 2 +- - .../{libksysguard-5.21.3.1.ebuild => libksysguard-5.21.4.ebuild} | 0 - kde-plasma/libkworkspace/Manifest | 2 +- - .../{libkworkspace-5.21.3.ebuild => libkworkspace-5.21.4.ebuild} | 0 - kde-plasma/milou/Manifest | 2 +- - kde-plasma/milou/{milou-5.21.3.ebuild => milou-5.21.4.ebuild} | 0 - kde-plasma/oxygen/Manifest | 2 +- - kde-plasma/oxygen/{oxygen-5.21.3.ebuild => oxygen-5.21.4.ebuild} | 0 - kde-plasma/plasma-browser-integration/Manifest | 2 +- - ...tegration-5.21.3.ebuild => plasma-browser-integration-5.21.4.ebuild} | 0 - kde-plasma/plasma-desktop/Manifest | 2 +- - .../{plasma-desktop-5.21.3.ebuild => plasma-desktop-5.21.4.ebuild} | 0 - kde-plasma/plasma-disks/Manifest | 2 +- - .../{plasma-disks-5.21.3.ebuild => plasma-disks-5.21.4.ebuild} | 0 - kde-plasma/plasma-firewall/Manifest | 2 +- - .../{plasma-firewall-5.21.3.ebuild => plasma-firewall-5.21.4.ebuild} | 1 + - kde-plasma/plasma-integration/Manifest | 2 +- - ...lasma-integration-5.21.3.ebuild => plasma-integration-5.21.4.ebuild} | 0 - .../{plasma-meta-5.21.3.ebuild => plasma-meta-5.21.4.ebuild} | 2 +- - kde-plasma/plasma-nm/Manifest | 2 +- - .../plasma-nm/{plasma-nm-5.21.3.ebuild => plasma-nm-5.21.4.ebuild} | 0 - kde-plasma/plasma-pa/Manifest | 2 +- - .../plasma-pa/{plasma-pa-5.21.3.ebuild => plasma-pa-5.21.4.ebuild} | 0 - kde-plasma/plasma-sdk/Manifest | 2 +- - .../plasma-sdk/{plasma-sdk-5.21.3.ebuild => plasma-sdk-5.21.4.ebuild} | 0 - kde-plasma/plasma-systemmonitor/Manifest | 2 +- - ...a-systemmonitor-5.21.3.ebuild => plasma-systemmonitor-5.21.4.ebuild} | 0 - kde-plasma/plasma-thunderbolt/Manifest | 2 +- - ...lasma-thunderbolt-5.21.3.ebuild => plasma-thunderbolt-5.21.4.ebuild} | 0 - kde-plasma/plasma-vault/Manifest | 2 +- - .../{plasma-vault-5.21.3.ebuild => plasma-vault-5.21.4.ebuild} | 0 - kde-plasma/plasma-workspace-wallpapers/Manifest | 2 +- - ...llpapers-5.21.3.ebuild => plasma-workspace-wallpapers-5.21.4.ebuild} | 0 - kde-plasma/plasma-workspace/Manifest | 2 +- - .../{plasma-workspace-5.21.3.ebuild => plasma-workspace-5.21.4.ebuild} | 0 - kde-plasma/plymouth-kcm/Manifest | 2 +- - .../{plymouth-kcm-5.21.3.ebuild => plymouth-kcm-5.21.4.ebuild} | 0 - kde-plasma/polkit-kde-agent/Manifest | 2 +- - .../{polkit-kde-agent-5.21.3.ebuild => polkit-kde-agent-5.21.4.ebuild} | 0 - kde-plasma/powerdevil/Manifest | 2 +- - .../powerdevil/{powerdevil-5.21.3.ebuild => powerdevil-5.21.4.ebuild} | 0 - kde-plasma/sddm-kcm/Manifest | 2 +- - kde-plasma/sddm-kcm/{sddm-kcm-5.21.3.ebuild => sddm-kcm-5.21.4.ebuild} | 0 - kde-plasma/systemsettings/Manifest | 2 +- - .../{systemsettings-5.21.3.ebuild => systemsettings-5.21.4.ebuild} | 0 - kde-plasma/xdg-desktop-portal-kde/Manifest | 2 +- - ...op-portal-kde-5.21.3.ebuild => xdg-desktop-portal-kde-5.21.4.ebuild} | 0 - kde-plasma/xembed-sni-proxy/Manifest | 2 +- - .../{xembed-sni-proxy-5.21.3.ebuild => xembed-sni-proxy-5.21.4.ebuild} | 0 - 101 files changed, 54 insertions(+), 51 deletions(-) - rename kde-plasma/bluedevil/{bluedevil-5.21.3.ebuild => bluedevil-5.21.4.ebuild} (100%) - rename kde-plasma/breeze-grub/{breeze-grub-5.21.3.ebuild => breeze-grub-5.21.4.ebuild} (100%) - rename kde-plasma/breeze-gtk/{breeze-gtk-5.21.3.ebuild => breeze-gtk-5.21.4.ebuild} (100%) - rename kde-plasma/breeze-plymouth/{breeze-plymouth-5.21.3.ebuild => breeze-plymouth-5.21.4.ebuild} (100%) - rename kde-plasma/breeze/{breeze-5.21.3.ebuild => breeze-5.21.4.ebuild} (100%) - rename kde-plasma/discover/{discover-5.21.3.ebuild => discover-5.21.4.ebuild} (96%) - rename kde-plasma/drkonqi/{drkonqi-5.21.3.ebuild => drkonqi-5.21.4.ebuild} (100%) - rename kde-plasma/kactivitymanagerd/{kactivitymanagerd-5.21.3.ebuild => kactivitymanagerd-5.21.4.ebuild} (100%) - rename kde-plasma/kde-cli-tools/{kde-cli-tools-5.21.3.ebuild => kde-cli-tools-5.21.4.ebuild} (100%) - rename kde-plasma/kde-gtk-config/{kde-gtk-config-5.21.3.ebuild => kde-gtk-config-5.21.4.ebuild} (100%) - rename kde-plasma/kdecoration/{kdecoration-5.21.3.ebuild => kdecoration-5.21.4.ebuild} (100%) - rename kde-plasma/kdeplasma-addons/{kdeplasma-addons-5.21.3.ebuild => kdeplasma-addons-5.21.4.ebuild} (100%) - rename kde-plasma/kgamma/{kgamma-5.21.3.ebuild => kgamma-5.21.4.ebuild} (100%) - rename kde-plasma/khotkeys/{khotkeys-5.21.3.ebuild => khotkeys-5.21.4.ebuild} (100%) - rename kde-plasma/kinfocenter/{kinfocenter-5.21.3.ebuild => kinfocenter-5.21.4.ebuild} (100%) - rename kde-plasma/kmenuedit/{kmenuedit-5.21.3.ebuild => kmenuedit-5.21.4.ebuild} (100%) - rename kde-plasma/kscreen/{kscreen-5.21.3.ebuild => kscreen-5.21.4.ebuild} (100%) - rename kde-plasma/kscreenlocker/{kscreenlocker-5.21.3.ebuild => kscreenlocker-5.21.4.ebuild} (100%) - rename kde-plasma/ksshaskpass/{ksshaskpass-5.21.3.ebuild => ksshaskpass-5.21.4.ebuild} (100%) - rename kde-plasma/ksysguard/{ksysguard-5.21.3.ebuild => ksysguard-5.21.4.ebuild} (100%) - rename kde-plasma/kwallet-pam/{kwallet-pam-5.21.3.ebuild => kwallet-pam-5.21.4.ebuild} (100%) - rename kde-plasma/kwayland-integration/{kwayland-integration-5.21.3.ebuild => kwayland-integration-5.21.4.ebuild} (100%) - rename kde-plasma/kwayland-server/{kwayland-server-5.21.3.ebuild => kwayland-server-5.21.4.ebuild} (100%) - rename kde-plasma/kwin/{kwin-5.21.3.ebuild => kwin-5.21.4.ebuild} (100%) - rename kde-plasma/kwrited/{kwrited-5.21.3.ebuild => kwrited-5.21.4.ebuild} (100%) - rename kde-plasma/libkscreen/{libkscreen-5.21.3.ebuild => libkscreen-5.21.4.ebuild} (100%) - rename kde-plasma/libksysguard/{libksysguard-5.21.3.1.ebuild => libksysguard-5.21.4.ebuild} (100%) - rename kde-plasma/libkworkspace/{libkworkspace-5.21.3.ebuild => libkworkspace-5.21.4.ebuild} (100%) - rename kde-plasma/milou/{milou-5.21.3.ebuild => milou-5.21.4.ebuild} (100%) - rename kde-plasma/oxygen/{oxygen-5.21.3.ebuild => oxygen-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-browser-integration/{plasma-browser-integration-5.21.3.ebuild => plasma-browser-integration-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-desktop/{plasma-desktop-5.21.3.ebuild => plasma-desktop-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-disks/{plasma-disks-5.21.3.ebuild => plasma-disks-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-firewall/{plasma-firewall-5.21.3.ebuild => plasma-firewall-5.21.4.ebuild} (98%) - rename kde-plasma/plasma-integration/{plasma-integration-5.21.3.ebuild => plasma-integration-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-meta/{plasma-meta-5.21.3.ebuild => plasma-meta-5.21.4.ebuild} (98%) - rename kde-plasma/plasma-nm/{plasma-nm-5.21.3.ebuild => plasma-nm-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-pa/{plasma-pa-5.21.3.ebuild => plasma-pa-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-sdk/{plasma-sdk-5.21.3.ebuild => plasma-sdk-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-systemmonitor/{plasma-systemmonitor-5.21.3.ebuild => plasma-systemmonitor-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-thunderbolt/{plasma-thunderbolt-5.21.3.ebuild => plasma-thunderbolt-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-vault/{plasma-vault-5.21.3.ebuild => plasma-vault-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-workspace-wallpapers/{plasma-workspace-wallpapers-5.21.3.ebuild => plasma-workspace-wallpapers-5.21.4.ebuild} (100%) - rename kde-plasma/plasma-workspace/{plasma-workspace-5.21.3.ebuild => plasma-workspace-5.21.4.ebuild} (100%) - rename kde-plasma/plymouth-kcm/{plymouth-kcm-5.21.3.ebuild => plymouth-kcm-5.21.4.ebuild} (100%) - rename kde-plasma/polkit-kde-agent/{polkit-kde-agent-5.21.3.ebuild => polkit-kde-agent-5.21.4.ebuild} (100%) - rename kde-plasma/powerdevil/{powerdevil-5.21.3.ebuild => powerdevil-5.21.4.ebuild} (100%) - rename kde-plasma/sddm-kcm/{sddm-kcm-5.21.3.ebuild => sddm-kcm-5.21.4.ebuild} (100%) - rename kde-plasma/systemsettings/{systemsettings-5.21.3.ebuild => systemsettings-5.21.4.ebuild} (100%) - rename kde-plasma/xdg-desktop-portal-kde/{xdg-desktop-portal-kde-5.21.3.ebuild => xdg-desktop-portal-kde-5.21.4.ebuild} (100%) - rename kde-plasma/xembed-sni-proxy/{xembed-sni-proxy-5.21.3.ebuild => xembed-sni-proxy-5.21.4.ebuild} (100%) + 13678c124ce..9e84ca8132d 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 sync gentoo +*** syncing gentoo +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 15% (13283/85463)
Updating files: 16% (13675/85463)
Updating files: 17% (14529/85463)
Updating files: 18% (15384/85463)
Updating files: 19% (16238/85463)
Updating files: 20% (17093/85463)
Updating files: 21% (17948/85463)
Updating files: 22% (18802/85463)
Updating files: 23% (19657/85463)
Updating files: 24% (20512/85463)
Updating files: 25% (21366/85463)
Updating files: 26% (22221/85463)
Updating files: 27% (23076/85463)
Updating files: 28% (23930/85463)
Updating files: 29% (24785/85463)
Updating files: 30% (25639/85463)
Updating files: 31% (26494/85463)
Updating files: 32% (27349/85463)
Updating files: 33% (28203/85463)
Updating files: 33% (28377/85463)
Updating files: 34% (29058/85463)
Updating files: 35% (29913/85463)
Updating files: 36% (30767/85463)
Updating files: 37% (31622/85463)
Updating files: 38% (32476/85463)
Updating files: 39% (33331/85463)
Updating files: 40% (34186/85463)
Updating files: 41% (35040/85463)
Updating files: 42% (35895/85463)
Updating files: 43% (36750/85463)
Updating files: 44% (37604/85463)
Updating files: 45% (38459/85463)
Updating files: 46% (39313/85463)
Updating files: 47% (40168/85463)
Updating files: 48% (41023/85463)
Updating files: 49% (41877/85463)
Updating files: 49% (42269/85463)
Updating files: 50% (42732/85463)
Updating files: 51% (43587/85463)
Updating files: 52% (44441/85463)
Updating files: 53% (45296/85463)
Updating files: 54% (46151/85463)
Updating files: 55% (47005/85463)
Updating files: 56% (47860/85463)
Updating files: 57% (48714/85463)
Updating files: 58% (49569/85463)
Updating files: 59% (50424/85463)
Updating files: 60% (51278/85463)
Updating files: 61% (52133/85463)
Updating files: 62% (52988/85463)
Updating files: 62% (53694/85463)
Updating files: 63% (53842/85463)
Updating files: 64% (54697/85463)
Updating files: 65% (55551/85463)
Updating files: 66% (56406/85463)
Updating files: 67% (57261/85463)
Updating files: 68% (58115/85463)
Updating files: 69% (58970/85463)
Updating files: 70% (59825/85463)
Updating files: 71% (60679/85463)
Updating files: 72% (61534/85463)
Updating files: 73% (62388/85463)
Updating files: 74% (63243/85463)
Updating files: 75% (64098/85463)
Updating files: 76% (64952/85463)
Updating files: 77% (65807/85463)
Updating files: 77% (65940/85463)
Updating files: 78% (66662/85463)
Updating files: 79% (67516/85463)
Updating files: 80% (68371/85463)
Updating files: 81% (69226/85463)
Updating files: 82% (70080/85463)
Updating files: 83% (70935/85463)
Updating files: 84% (71789/85463)
Updating files: 85% (72644/85463)
Updating files: 86% (73499/85463)
Updating files: 87% (74353/85463)
Updating files: 88% (75208/85463)
Updating files: 89% (76063/85463)
Updating files: 90% (76917/85463)
Updating files: 91% (77772/85463)
Updating files: 92% (78626/85463)
Updating files: 93% (79481/85463)
Updating files: 94% (80336/85463)
Updating files: 94% (81124/85463)
Updating files: 95% (81190/85463)
Updating files: 96% (82045/85463)
Updating files: 97% (82900/85463)
Updating files: 98% (83754/85463)
Updating files: 99% (84609/85463)
Updating files: 100% (85463/85463)
Updating files: 100% (85463/85463), done. *** 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 32 gentoo |