2023-03-30T09:00:01Z

1 files changed, 65 insertions, 21 deletions

diff --git a/Systole.txt b/Systole.txt
index c99de4413609..3ecbc99567a9 100644
--- a/Systole.txt
+++ b/Systole.txt
@@ -15,28 +15,72 @@ pkgcore 0.12.20
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Systole
 *** syncing Systole
 From https://github.com/SystoleOS/gentoo-overlay
- + b4db93f...03c8bd9 master     -> origin/master  (forced update)
-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 Systole
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Systole
-*** syncing Systole
-Cloning into '/var/lib/repo-mirror-ci/sync/Systole'...
+   03c8bd9..90a00c7  master     -> origin/master
+Updating 03c8bd9..90a00c7
+Fast-forward
+ Slicer-CLI/ACPCTransform/ACPCTransform-9999.ebuild |  2 +-
+ .../AddScalarVolumes/AddScalarVolumes-9999.ebuild  |  2 +-
+ .../ExtractSkeleton/ExtractSkeleton-9999.ebuild    |  2 +-
+ Slicer-CLI/ModelMaker/ModelMaker-9999.ebuild       |  2 +-
+ .../SlicerExecutionModel-1.0.0.ebuild              | 34 ++++++------
+ .../SlicerIGSIO/SlicerIGSIO-9999.ebuild            |  2 +-
+ Slicer-Extension/SlicerIGT/SlicerIGT-9999.ebuild   |  4 +-
+ .../SlicerOpenIGTLink-9999.ebuild                  |  2 +-
+ .../Annotations/Annotations-9999.ebuild            |  2 +-
+ Slicer-Loadable/Cameras/Cameras-9999.ebuild        |  2 +-
+ Slicer-Loadable/Colors/Colors-9999.ebuild          |  2 +-
+ Slicer-Loadable/Data/Data-9999.ebuild              |  2 +-
+ Slicer-Loadable/Markups/Markups-9999.ebuild        |  2 +-
+ Slicer-Loadable/Models/Models-9999.ebuild          |  2 +-
+ Slicer-Loadable/Plots/Plots-9999.ebuild            |  2 +-
+ Slicer-Loadable/Reformat/Reformat-9999.ebuild      |  2 +-
+ Slicer-Loadable/SceneViews/SceneViews-9999.ebuild  |  2 +-
+ .../Segmentations/Segmentations-9999.ebuild        |  2 +-
+ Slicer-Loadable/Sequences/Sequences-9999.ebuild    |  2 +-
+ .../SlicerWelcome/SlicerWelcome-9999.ebuild        |  2 +-
+ .../SubjectHierarchy/SubjectHierarchy-9999.ebuild  |  2 +-
+ Slicer-Loadable/Tables/Tables-9999.ebuild          |  2 +-
+ .../Terminologies/Terminologies-9999.ebuild        |  2 +-
+ Slicer-Loadable/Texts/Texts-9999.ebuild            |  2 +-
+ Slicer-Loadable/Transforms/Transforms-9999.ebuild  |  2 +-
+ Slicer-Loadable/Units/Units-9999.ebuild            |  2 +-
+ .../ViewControllers/ViewControllers-9999.ebuild    |  2 +-
+ .../VolumeRendering/VolumeRendering-9999.ebuild    |  2 +-
+ Slicer-Loadable/Volumes/Volumes-9999.ebuild        |  2 +-
+ .../CropVolumeSequence-9999.ebuild                 |  2 +-
+ Slicer-Scripted/DICOM/DICOM-9999.ebuild            |  2 +-
+ Slicer-Scripted/DICOMLib/DICOMLib-9999.ebuild      |  2 +-
+ .../DICOMPatcher/DICOMPatcher-9999.ebuild          |  2 +-
+ .../DICOMPlugins/DICOMPlugins-9999.ebuild          |  2 +-
+ .../DMRIInstall/DMRIInstall-9999.ebuild            |  2 +-
+ Slicer-Scripted/DataProbe/DataProbe-9999.ebuild    |  2 +-
+ Slicer-Scripted/Endoscopy/Endoscopy-9999.ebuild    |  2 +-
+ .../ExtensionWizard/ExtensionWizard-9999.ebuild    |  2 +-
+ .../ImportItkSnapLabel-9999.ebuild                 |  2 +-
+ .../PerformanceTests/PerformanceTests-9999.ebuild  |  2 +-
+ Slicer-Scripted/SampleData/SampleData-9999.ebuild  |  2 +-
+ .../ScreenCapture/ScreenCapture-9999.ebuild        |  2 +-
+ .../SegmentEditor/SegmentEditor-9999.ebuild        |  2 +-
+ .../SegmentStatistics-9999.ebuild                  |  2 +-
+ Slicer-Scripted/SelfTests/SelfTests-9999.ebuild    |  2 +-
+ .../VectorToScalarVolume-9999.ebuild               |  2 +-
+ Slicer-Scripted/WebServer/WebServer-9999.ebuild    |  2 +-
+ dev-libs/qRestAPI/qRestAPI-9999.ebuild             |  6 +-
+ dev-python/PythonQt_CTK/PythonQt_CTK-3.1.ebuild    |  4 +-
+ sci-libs/SimpleITK/SimpleITK-1.2.4.ebuild          |  2 +-
+ sci-libs/vtkAddon/vtkAddon-0.1.0.ebuild            |  6 +-
+ sci-medical/IGSIO/IGSIO-9999.ebuild                |  4 +-
+ .../OpenIGTLinkIO/OpenIGTLinkIO-9999.ebuild        |  2 +-
+ sci-medical/PlusApp/PlusApp-9999.ebuild            |  2 +-
+ sci-medical/PlusLib/PlusLib-9999.ebuild            |  4 +-
+ sci-medical/Slicer/Slicer-9999.ebuild              | 64 +++++++++++-----------
+ sci-medical/ctk/ctk-0.1.0.ebuild                   | 14 ++---
+ sci-medical/elastix/elastix-9999.ebuild            |  2 +-
+ sci-medical/teem/teem-1.12.0.ebuild                | 10 ++--
+ sci-medical/vmtk/vmtk-9999.ebuild                  |  6 +-
+ 60 files changed, 127 insertions(+), 127 deletions(-)
 *** synced Systole
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ 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 Systole