2024-02-20T14:30:00Z

1 files changed, 118 insertions, 21 deletions

diff --git a/zscheile.txt b/zscheile.txt
index 897f907d639f..fe297205f982 100644
--- a/zscheile.txt
+++ b/zscheile.txt
@@ -18,28 +18,125 @@ pkgcore 0.12.24
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync zscheile
 *** syncing zscheile
 From https://github.com/fogti/portage-zscheile
- + ce039a5c...82334ba2 main       -> origin/main  (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 zscheile
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync zscheile
-*** syncing zscheile
-Cloning into '/var/lib/repo-mirror-ci/sync/zscheile'...
+   82334ba2..2ab5cd3a  main       -> origin/main
+Updating 82334ba2..2ab5cd3a
+Fast-forward
+ dev-ml/cudf/Manifest                               |   3 +
+ dev-ml/cudf/cudf-0.10-r1.ebuild                    |  79 +++++++++
+ dev-ml/cudf/files/ounit2.patch                     |  12 ++
+ dev-ml/cudf/metadata.xml                           |  15 ++
+ dev-ml/dose3/Manifest                              |   3 +
+ dev-ml/dose3/dose3-7.0.0-r1.ebuild                 |  51 ++++++
+ dev-ml/dose3/files/nobz.patch                      | 194 +++++++++++++++++++++
+ dev-ml/dose3/metadata.xml                          |  15 ++
+ dev-ml/dune/Manifest                               |   3 +
+ dev-ml/dune/dune-3.14.0.ebuild                     |  68 ++++++++
+ dev-ml/dune/files/50dune-gentoo.el                 |   4 +
+ dev-ml/dune/metadata.xml                           |  15 ++
+ dev-ml/extlib/Manifest                             |   5 +
+ dev-ml/extlib/extlib-1.7.9-r1.ebuild               |  49 ++++++
+ .../files/0001-Add-support-for-OCaml-4.12.patch    |  25 +++
+ ...niv_param-was-removed-for-OCaml-pre-4.00-.patch |  38 ++++
+ dev-ml/extlib/files/extlib-1.7.7-no-git.patch      |   9 +
+ dev-ml/extlib/metadata.xml                         |  15 ++
+ dev-ml/opam-client/Manifest                        |   3 +
+ .../files/debian-Port-to-Dose3-6.0.1.patch         | 142 +++++++++++++++
+ dev-ml/opam-client/metadata.xml                    |  15 ++
+ dev-ml/opam-client/opam-client-2.1.5.ebuild        |  39 +++++
+ dev-ml/opam-core/Manifest                          |   2 +
+ dev-ml/opam-core/metadata.xml                      |  15 ++
+ dev-ml/opam-core/opam-core-2.1.5-r1.ebuild         |  47 +++++
+ dev-ml/opam-format/Manifest                        |   3 +
+ .../files/debian-Port-to-Dose3-6.0.1.patch         | 142 +++++++++++++++
+ dev-ml/opam-format/metadata.xml                    |  15 ++
+ dev-ml/opam-format/opam-format-2.1.5.ebuild        |  50 ++++++
+ dev-ml/opam-installer/Manifest                     |   4 +
+ .../files/debian-Port-to-Dose3-6.0.1.patch         | 142 +++++++++++++++
+ dev-ml/opam-installer/metadata.xml                 |  15 ++
+ dev-ml/opam-installer/opam-installer-2.1.5.ebuild  |  41 +++++
+ dev-ml/opam-repository/Manifest                    |   3 +
+ .../files/debian-Port-to-Dose3-6.0.1.patch         | 142 +++++++++++++++
+ dev-ml/opam-repository/metadata.xml                |  15 ++
+ .../opam-repository/opam-repository-2.1.5.ebuild   |  36 ++++
+ dev-ml/opam-solver/Manifest                        |   3 +
+ .../files/debian-Port-to-Dose3-6.0.1.patch         | 142 +++++++++++++++
+ dev-ml/opam-solver/metadata.xml                    |  15 ++
+ dev-ml/opam-solver/opam-solver-2.1.5.ebuild        |  39 +++++
+ dev-ml/opam-state/Manifest                         |   3 +
+ .../files/debian-Port-to-Dose3-6.0.1.patch         | 142 +++++++++++++++
+ dev-ml/opam-state/metadata.xml                     |  15 ++
+ dev-ml/opam-state/opam-state-2.1.5.ebuild          |  35 ++++
+ dev-ml/opam/Manifest                               |   3 +
+ dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch | 142 +++++++++++++++
+ dev-ml/opam/metadata.xml                           |  15 ++
+ dev-ml/opam/opam-2.1.5.ebuild                      |  40 +++++
+ dev-ml/re/Manifest                                 |   3 +
+ dev-ml/re/files/ounit2.patch                       |  11 ++
+ dev-ml/re/metadata.xml                             |  15 ++
+ dev-ml/re/re-1.11.0.ebuild                         |  36 ++++
+ dev-ml/xml-light/Manifest                          |   2 +
+ dev-ml/xml-light/metadata.xml                      |  15 ++
+ dev-ml/xml-light/xml-light-2.5.ebuild              |  21 +++
+ profiles/categories                                |   1 +
+ 57 files changed, 2172 insertions(+)
+ create mode 100644 dev-ml/cudf/Manifest
+ create mode 100644 dev-ml/cudf/cudf-0.10-r1.ebuild
+ create mode 100644 dev-ml/cudf/files/ounit2.patch
+ create mode 100644 dev-ml/cudf/metadata.xml
+ create mode 100644 dev-ml/dose3/Manifest
+ create mode 100644 dev-ml/dose3/dose3-7.0.0-r1.ebuild
+ create mode 100644 dev-ml/dose3/files/nobz.patch
+ create mode 100644 dev-ml/dose3/metadata.xml
+ create mode 100644 dev-ml/dune/Manifest
+ create mode 100644 dev-ml/dune/dune-3.14.0.ebuild
+ create mode 100644 dev-ml/dune/files/50dune-gentoo.el
+ create mode 100644 dev-ml/dune/metadata.xml
+ create mode 100644 dev-ml/extlib/Manifest
+ create mode 100644 dev-ml/extlib/extlib-1.7.9-r1.ebuild
+ create mode 100644 dev-ml/extlib/files/0001-Add-support-for-OCaml-4.12.patch
+ create mode 100644 dev-ml/extlib/files/0002-caml_hash_univ_param-was-removed-for-OCaml-pre-4.00-.patch
+ create mode 100644 dev-ml/extlib/files/extlib-1.7.7-no-git.patch
+ create mode 100644 dev-ml/extlib/metadata.xml
+ create mode 100644 dev-ml/opam-client/Manifest
+ create mode 100644 dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam-client/metadata.xml
+ create mode 100644 dev-ml/opam-client/opam-client-2.1.5.ebuild
+ create mode 100644 dev-ml/opam-core/Manifest
+ create mode 100644 dev-ml/opam-core/metadata.xml
+ create mode 100644 dev-ml/opam-core/opam-core-2.1.5-r1.ebuild
+ create mode 100644 dev-ml/opam-format/Manifest
+ create mode 100644 dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam-format/metadata.xml
+ create mode 100644 dev-ml/opam-format/opam-format-2.1.5.ebuild
+ create mode 100644 dev-ml/opam-installer/Manifest
+ create mode 100644 dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam-installer/metadata.xml
+ create mode 100644 dev-ml/opam-installer/opam-installer-2.1.5.ebuild
+ create mode 100644 dev-ml/opam-repository/Manifest
+ create mode 100644 dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam-repository/metadata.xml
+ create mode 100644 dev-ml/opam-repository/opam-repository-2.1.5.ebuild
+ create mode 100644 dev-ml/opam-solver/Manifest
+ create mode 100644 dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam-solver/metadata.xml
+ create mode 100644 dev-ml/opam-solver/opam-solver-2.1.5.ebuild
+ create mode 100644 dev-ml/opam-state/Manifest
+ create mode 100644 dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam-state/metadata.xml
+ create mode 100644 dev-ml/opam-state/opam-state-2.1.5.ebuild
+ create mode 100644 dev-ml/opam/Manifest
+ create mode 100644 dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
+ create mode 100644 dev-ml/opam/metadata.xml
+ create mode 100644 dev-ml/opam/opam-2.1.5.ebuild
+ create mode 100644 dev-ml/re/Manifest
+ create mode 100644 dev-ml/re/files/ounit2.patch
+ create mode 100644 dev-ml/re/metadata.xml
+ create mode 100644 dev-ml/re/re-1.11.0.ebuild
+ create mode 100644 dev-ml/xml-light/Manifest
+ create mode 100644 dev-ml/xml-light/metadata.xml
+ create mode 100644 dev-ml/xml-light/xml-light-2.5.ebuild
 *** synced zscheile
- * 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 zscheile