2020-10-26T10:00:01Z

1 files changed, 9 insertions, 93 deletions

diff --git a/spikyatlinux.txt b/spikyatlinux.txt
index c9db519e4da6..f46a9d4ba1e7 100644
--- a/spikyatlinux.txt
+++ b/spikyatlinux.txt
@@ -24,101 +24,17 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://github.com/spikyatlinux/ebuilds_for_gentoo
-   2d892a1..a5dcd4f  master     -> origin/master
-Updating 2d892a1..a5dcd4f
-Fast-forward
- Manifest                                       |  32 ++++++++++++-------------
- app-benchmarks/Manifest.gz                     | Bin 240 -> 239 bytes
- app-benchmarks/s-tui/ChangeLog                 |   3 +++
- app-benchmarks/s-tui/Manifest                  |   4 ++--
- app-benchmarks/s-tui/Manifest.gz               | Bin 578 -> 407 bytes
- app-office/Manifest.gz                         | Bin 412 -> 412 bytes
- app-office/hibiscus/ChangeLog                  |   3 +++
- app-office/hibiscus/Manifest                   |   4 ++--
- app-office/hibiscus/Manifest.gz                | Bin 896 -> 557 bytes
- app-portage/Manifest.gz                        | Bin 731 -> 728 bytes
- app-portage/logclean/ChangeLog                 |   3 +++
- app-portage/logclean/Manifest                  |   4 ++--
- app-portage/logclean/Manifest.gz               | Bin 571 -> 397 bytes
- app-portage/portconf/ChangeLog                 |   3 +++
- app-portage/portconf/Manifest                  |   4 ++--
- app-portage/portconf/Manifest.gz               | Bin 572 -> 564 bytes
- app-portage/remerge/ChangeLog                  |   3 +++
- app-portage/remerge/Manifest                   |   4 ++--
- app-portage/remerge/Manifest.gz                | Bin 566 -> 397 bytes
- app-portage/showbuild/ChangeLog                |   3 +++
- app-portage/showbuild/Manifest                 |   4 ++--
- app-portage/showbuild/Manifest.gz              | Bin 565 -> 564 bytes
- app-text/Manifest.gz                           | Bin 414 -> 414 bytes
- app-text/ascii-design/ChangeLog                |   3 +++
- app-text/ascii-design/Manifest                 |   4 ++--
- app-text/ascii-design/Manifest.gz              | Bin 910 -> 729 bytes
- app-text/pdfarranger/ChangeLog                 |   3 +++
- app-text/pdfarranger/Manifest                  |   4 ++--
- app-text/pdfarranger/Manifest.gz               | Bin 578 -> 397 bytes
- dev-java/Manifest.gz                           | Bin 241 -> 239 bytes
- dev-java/jameica/ChangeLog                     |   3 +++
- dev-java/jameica/Manifest                      |   4 ++--
- dev-java/jameica/Manifest.gz                   | Bin 1398 -> 722 bytes
- dev-util/Manifest.gz                           | Bin 581 -> 579 bytes
- dev-util/apktool-bin/ChangeLog                 |   3 +++
- dev-util/apktool-bin/Manifest                  |   4 ++--
- dev-util/apktool-bin/Manifest.gz               | Bin 897 -> 723 bytes
- dev-util/bluegriffon/ChangeLog                 |   3 +++
- dev-util/bluegriffon/Manifest                  |   4 ++--
- dev-util/bluegriffon/Manifest.gz               | Bin 595 -> 401 bytes
- dev-util/platform-tools/ChangeLog              |   3 +++
- dev-util/platform-tools/Manifest               |   4 ++--
- dev-util/platform-tools/Manifest.gz            | Bin 932 -> 739 bytes
- kde-misc/Manifest.gz                           | Bin 245 -> 245 bytes
- kde-misc/ksmoothdock/ChangeLog                 |   3 +++
- kde-misc/ksmoothdock/Manifest                  |   4 ++--
- kde-misc/ksmoothdock/Manifest.gz               | Bin 573 -> 568 bytes
- kde-plasma/Manifest.gz                         | Bin 243 -> 242 bytes
- kde-plasma/discover/ChangeLog                  |   3 +++
- kde-plasma/discover/Manifest                   |   4 ++--
- kde-plasma/discover/Manifest.gz                | Bin 904 -> 560 bytes
- media-gfx/Manifest.gz                          | Bin 409 -> 412 bytes
- media-gfx/photocollage/ChangeLog               |   3 +++
- media-gfx/photocollage/Manifest                |   4 ++--
- media-gfx/photocollage/Manifest.gz             | Bin 577 -> 402 bytes
- media-gfx/posterazor/ChangeLog                 |   3 +++
- media-gfx/posterazor/Manifest                  |   4 ++--
- media-gfx/posterazor/Manifest.gz               | Bin 1101 -> 914 bytes
- media-video/Manifest.gz                        | Bin 239 -> 240 bytes
- media-video/mystiq/ChangeLog                   |   3 +++
- media-video/mystiq/Manifest                    |   4 ++--
- media-video/mystiq/Manifest.gz                 | Bin 572 -> 399 bytes
- profiles/Manifest.gz                           | Bin 3253 -> 2918 bytes
- sys-kernel/Manifest.gz                         | Bin 241 -> 245 bytes
- sys-kernel/zenpower/ChangeLog                  |   3 +++
- sys-kernel/zenpower/Manifest                   |   4 ++--
- sys-kernel/zenpower/Manifest.gz                | Bin 577 -> 401 bytes
- www-apps/Manifest.gz                           | Bin 242 -> 245 bytes
- www-apps/rutorrent/ChangeLog                   |   3 +++
- www-apps/rutorrent/Manifest                    |   4 ++--
- www-apps/rutorrent/Manifest.gz                 | Bin 570 -> 566 bytes
- www-client/Manifest.gz                         | Bin 240 -> 239 bytes
- www-client/badwolf/ChangeLog                   |   3 +++
- www-client/badwolf/Manifest                    |   4 ++--
- www-client/badwolf/Manifest.gz                 | Bin 753 -> 575 bytes
- x11-themes/Manifest.gz                         | Bin 756 -> 755 bytes
- x11-themes/arcbreeze/ChangeLog                 |   3 +++
- x11-themes/arcbreeze/Manifest                  |   4 ++--
- x11-themes/arcbreeze/Manifest.gz               | Bin 576 -> 571 bytes
- x11-themes/nx-plasma-look-and-feel/ChangeLog   |   3 +++
- x11-themes/nx-plasma-look-and-feel/Manifest    |   4 ++--
- x11-themes/nx-plasma-look-and-feel/Manifest.gz | Bin 579 -> 571 bytes
- x11-themes/qtstyleplugins/ChangeLog            |   3 +++
- x11-themes/qtstyleplugins/Manifest             |   4 ++--
- x11-themes/qtstyleplugins/Manifest.gz          | Bin 736 -> 731 bytes
- x11-themes/sierrabreeze/ChangeLog              |   3 +++
- x11-themes/sierrabreeze/Manifest               |   4 ++--
- x11-themes/sierrabreeze/Manifest.gz            | Bin 406 -> 399 bytes
- 88 files changed, 136 insertions(+), 64 deletions(-)
+ + a5dcd4f...574f36a master     -> origin/master  (forced update)
+fatal: refusing to merge unrelated histories
+*** syncing spikyatlinux
+!!! failed syncing spikyatlinux
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint sync spikyatlinux
+Cloning into '/var/lib/repo-mirror-ci/sync/spikyatlinux'...
 *** syncing spikyatlinux
 *** synced spikyatlinux
- * 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 spikyatlinux