Reorganizing branches

[negril]

Pretext

From talking with @Ionic, we came to the conclusion that we would like to clean up the branches to ease rebasing against exherbo master as upstream.

To have a starting point I wrote down my ideas so we can collect thoughts as we didn't reach a conclusion on details like names yet.

Concept

• create a new branch at 0c63784 called exherbo/master
• pull master from exherbo
• use the existing patches we collected and rebase on top of exherbo/master similar to what I have done in negril/gentoo/feature/eapi7, negril/gentoo/feature/eapi7-test-base, negril/gentoo/feature/eapi7-test-updates and negril/gentoo/feature/eapi8
• use those development branches as basis for a "live" branch called gentoo/testing where we collect those for end user usage. This might see frequent rebasing and/or merging, hence breakage of the git history, which we are willing to accept as we have to make frequent changes in the intermediate future trying to fix a lot of things.
• send finalized changes to exherbo upstream

If anyone has thoughts or questions please share them. We are unsure at the moment how many people would be affected.

Note

There is a helper commit in negril/gentoo/wip/bugfix/limit_ci to avoid unneeded runs of the exherbo ci that we need to remove at some point.

[MageSlayer]

Have you already talked to exherbo guys?
Are they willing to accept changes to support Gentoo?

[negril]

We can file pull requests with anything we like. If it complete the CI/CD pipeline it will likely get accepted.

[bqv]

This would be good. I would like to help out with the work here, but there's so many repos and branches that I can't get the full picture. The ebuild in GURU was my way of trying to figure that out, but clear branches here works too :)

[negril]

I went ahead an pushed a bunch of branches implementing the outlined changes.

gentoo/testing is usable with current ::gentoo . It's missing the fix for associative arrays from gentoo/bugfix/declare_-A which needs testing and support for GLEP 82 which has yet to be implemented.

[Ionic]

Okay, nice, now that the eapi8 branch should be up to date with what I had, I can start pulling your additional work from the gentoo/testing branch.

This said, I'll also have to rebase the gentoo/* branches again to add additional commits that slipped through before. Will tell you once that's done.

[negril]

Could you show me your rebased gentoo/* branches before you force push them?