commit: 3f7fad2f7170cd44f1019865604c6ed196f5b03c
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Mar 13 11:14:03 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Mar 13 11:14:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3f7fad2f
{metadata,profiles}: add the ability to mask per profile in overlay
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
metadata/layout.conf | 4 ++++
profiles/arch.list | 4 ++++
profiles/arches.desc | 4 ++++
.../{profiles => }/default/linux/amd64/17.0/x32/package.mask | 0
profiles/default/linux/amd64/17.0/x32/parent | 9 +++++++++
profiles/profiles.desc | 6 ++++++
6 files changed, 27 insertions(+)
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 91f5b7f8c..a65ab94ad 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -48,3 +48,7 @@ thin-manifests = true
# Sign Git commits, and NOT Manifests
sign-commits = true
sign-manifests = false
+
+# Part of ability to mask features in overlays
+# https://trofi.github.io/posts/201-masking-a-package-in-gentoo-overlay.html
+profile-formats = portage-2
diff --git a/profiles/arch.list b/profiles/arch.list
new file mode 100644
index 000000000..5ed7343ce
--- /dev/null
+++ b/profiles/arch.list
@@ -0,0 +1,4 @@
+# Theo Anderson <tel...@posteo.de> (2021-01-06)
+# New arch created for the purpose of hiding profiles.
+# Assuming no one sets KEYWORDS="~hidden"
+hidden
diff --git a/profiles/arches.desc b/profiles/arches.desc
new file mode 100644
index 000000000..99924d624
--- /dev/null
+++ b/profiles/arches.desc
@@ -0,0 +1,4 @@
+# Theo Anderson <tel...@posteo.de> (2021-01-06)
+# Masked the new hidden arch as testing to keep
+# in line with no stable packages in ::guru
+hidden testing
diff --git a/profiles/profiles/default/linux/amd64/17.0/x32/package.mask
b/profiles/default/linux/amd64/17.0/x32/package.mask
similarity index 100%
rename from profiles/profiles/default/linux/amd64/17.0/x32/package.mask
rename to profiles/default/linux/amd64/17.0/x32/package.mask
diff --git a/profiles/default/linux/amd64/17.0/x32/parent
b/profiles/default/linux/amd64/17.0/x32/parent
new file mode 100644
index 000000000..9f3a62d88
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/x32/parent
@@ -0,0 +1,9 @@
+# Theo Anderson <tel...@posteo.de> (2021-01-06)
+# Paths relative to `profiles`. The first line denotes the
+# parent profile which should inherit any changes we make here.
+# The second line points to the location where the appropriate
+# masks or forces(?) are. It is important to keep the
+# changes separated per profile/feature in case a
+# parent profile picks up on changes intended for a different profile.
+gentoo:default/linux/amd64/17.0/x32
+:default/linux/amd64/17.0/x32
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
new file mode 100644
index 000000000..f2ac76066
--- /dev/null
+++ b/profiles/profiles.desc
@@ -0,0 +1,6 @@
+# Theo Anderson <tel...@posteo.de> (2021-01-06)
+# Create profiles with the hidden arch where dependency conflicts
+# arise and masks are needed. They must match :gentoo profiles.
+# Using parent files within the profiles allows gentoo: profiles
+# to inherit any ::guru masks we choose.
+hidden default/linux/amd64/17.0/x32 dev
