From 335f688cb926cd99fb1172bad85073c6e4b00b25 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 29 Mar 2021 09:38:26 +0200 Subject: [PATCH 1/3] profiles/*: disable per profile masking in an overlay Currently this breaks pkgcheck/pkgdev and does not work with pkgcore. Mask systemd-swap on all profiles as a temporarily workaround Signed-off-by: Andrew Ammerlaan --- metadata/layout.conf | 4 ---- profiles/arch.list | 4 ---- profiles/arches.desc | 4 ---- profiles/package.mask | 14 ++++++++++++++ profiles/profiles.desc | 11 ----------- 5 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 profiles/arch.list delete mode 100644 profiles/arches.desc create mode 100644 profiles/package.mask delete mode 100644 profiles/profiles.desc diff --git a/metadata/layout.conf b/metadata/layout.conf index 928bfabc49..e2923f6c0a 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -12,7 +12,3 @@ sign-manifests = false # Let's start with new EAPIs if possible eapis-banned = 0 1 2 3 4 5 eapis-deprecated = 6 - -# 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 deleted file mode 100644 index 5ed7343cec..0000000000 --- a/profiles/arch.list +++ /dev/null @@ -1,4 +0,0 @@ -# Theo Anderson (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 deleted file mode 100644 index 99924d624a..0000000000 --- a/profiles/arches.desc +++ /dev/null @@ -1,4 +0,0 @@ -# Theo Anderson (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/package.mask b/profiles/package.mask new file mode 100644 index 0000000000..f5e01cff45 --- /dev/null +++ b/profiles/package.mask @@ -0,0 +1,14 @@ +# Theo Anderson (2021-01-04) +# SELinux profiles do not support systemd +# +# Andrew Ammerlaan (2021-03-29) +# Per profile masking in an overlay is currently not working +# with pkgcore/pkgdev/pkgcheck. Masking this for all profiles +# as a workaround that both makes repoman happy and works with +# pkgcore/pkgdev/pkgcheck. +# Users of non-SELinux profiles can safely unmask this. +# Sorry for the inconvenience. +# +# TODO: Either fix per profile masking in overlays, or move +# this entry to the relevant package.mask files in ::gentoo +>=sys-block/systemd-swap-4.4.0 diff --git a/profiles/profiles.desc b/profiles/profiles.desc deleted file mode 100644 index 313f396602..0000000000 --- a/profiles/profiles.desc +++ /dev/null @@ -1,11 +0,0 @@ -# Theo Anderson (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.1/selinux dev -hidden default/linux/amd64/17.1/hardened/selinux dev -hidden default/linux/amd64/17.1/no-multilib/hardened/selinux dev -hidden default/linux/amd64/17.0/x32 dev -hidden default/linux/x86/17.0/selinux dev -hidden default/linux/x86/17.0/hardened/selinux dev From 3f5ccaafd00b144ec0f3a8c62afbb083a9b89351 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 29 Mar 2021 09:45:36 +0200 Subject: [PATCH 2/3] profiles/*: Fix ProfileError, delete this for now Signed-off-by: Andrew Ammerlaan --- .../default/linux/amd64/17.0/x32/package.mask | 20 ------------------- profiles/default/linux/amd64/17.0/x32/parent | 9 --------- .../linux/amd64/17.1/hardened/selinux/parent | 9 --------- .../17.1/no-multilib/hardened/selinux/parent | 9 --------- .../default/linux/amd64/17.1/selinux/parent | 9 --------- .../linux/x86/17.0/hardened/selinux/parent | 9 --------- .../default/linux/x86/17.0/selinux/parent | 9 --------- profiles/features/selinux/package.mask | 3 --- 8 files changed, 77 deletions(-) delete mode 100644 profiles/default/linux/amd64/17.0/x32/package.mask delete mode 100644 profiles/default/linux/amd64/17.0/x32/parent delete mode 100644 profiles/default/linux/amd64/17.1/hardened/selinux/parent delete mode 100644 profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent delete mode 100644 profiles/default/linux/amd64/17.1/selinux/parent delete mode 100644 profiles/default/linux/x86/17.0/hardened/selinux/parent delete mode 100644 profiles/default/linux/x86/17.0/selinux/parent delete mode 100644 profiles/features/selinux/package.mask diff --git a/profiles/default/linux/amd64/17.0/x32/package.mask b/profiles/default/linux/amd64/17.0/x32/package.mask deleted file mode 100644 index 11bd6dd9e9..0000000000 --- a/profiles/default/linux/amd64/17.0/x32/package.mask +++ /dev/null @@ -1,20 +0,0 @@ -# Pawel Hajdan jr (2012-10-07) -# V8 upstream said they won't support x32, bug #423815 -# Masked packages containing V8. -# Michał Górny (2018-01-12) -# ...and their reverse dependencies. -# Theo Anderson (2021-01-06) -# Is this still relevant? Looks like support was comitted: -# https://codereview.chromium.org/18014003 -www-apps/code-server-bin - -# Andrew Ammerlaan (2021-03-28) -# Depends on QtPy[webengine] --> PyQtWebengine --> Nodejs -# which is masked on this profile -app-editors/kitscenarist -dev-vcs/gitqlient -dev-python/pywebview -media-video/vidify -media-video/vidify-audiosync - - diff --git a/profiles/default/linux/amd64/17.0/x32/parent b/profiles/default/linux/amd64/17.0/x32/parent deleted file mode 100644 index 9f3a62d888..0000000000 --- a/profiles/default/linux/amd64/17.0/x32/parent +++ /dev/null @@ -1,9 +0,0 @@ -# Theo Anderson (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/default/linux/amd64/17.1/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/hardened/selinux/parent deleted file mode 100644 index 1ea01a36af..0000000000 --- a/profiles/default/linux/amd64/17.1/hardened/selinux/parent +++ /dev/null @@ -1,9 +0,0 @@ -# Theo Anderson (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.1/hardened/selinux -:features/selinux diff --git a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent b/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent deleted file mode 100644 index d67371011e..0000000000 --- a/profiles/default/linux/amd64/17.1/no-multilib/hardened/selinux/parent +++ /dev/null @@ -1,9 +0,0 @@ -# Theo Anderson (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.1/no-multilib/hardened/selinux -:features/selinux diff --git a/profiles/default/linux/amd64/17.1/selinux/parent b/profiles/default/linux/amd64/17.1/selinux/parent deleted file mode 100644 index 667ba52c6a..0000000000 --- a/profiles/default/linux/amd64/17.1/selinux/parent +++ /dev/null @@ -1,9 +0,0 @@ -# Theo Anderson (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.1/selinux -:features/selinux diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent deleted file mode 100644 index 6f067f1e06..0000000000 --- a/profiles/default/linux/x86/17.0/hardened/selinux/parent +++ /dev/null @@ -1,9 +0,0 @@ -# Theo Anderson (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/x86/17.0/hardened/selinux -:features/selinux diff --git a/profiles/default/linux/x86/17.0/selinux/parent b/profiles/default/linux/x86/17.0/selinux/parent deleted file mode 100644 index 6eab164c5d..0000000000 --- a/profiles/default/linux/x86/17.0/selinux/parent +++ /dev/null @@ -1,9 +0,0 @@ -# Theo Anderson (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/x86/17.0/selinux -:features/selinux diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask deleted file mode 100644 index b5ea3a429d..0000000000 --- a/profiles/features/selinux/package.mask +++ /dev/null @@ -1,3 +0,0 @@ -# Theo Anderson (2021-01-04) -# SELinux profiles do not support systemd ->=sys-block/systemd-swap-4.4.0 From d097cb2e2b764a1b5972b29e30d138aed1380416 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 29 Mar 2021 09:50:08 +0200 Subject: [PATCH 3/3] sci-electronics/bsc: fix VisibleVcsPkg No keywords in git-r3 ebuilds please Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- sci-electronics/bsc/bsc-0_pre20210124.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-electronics/bsc/bsc-0_pre20210124.ebuild b/sci-electronics/bsc/bsc-0_pre20210124.ebuild index 4581c8485d..a91a917c9d 100644 --- a/sci-electronics/bsc/bsc-0_pre20210124.ebuild +++ b/sci-electronics/bsc/bsc-0_pre20210124.ebuild @@ -19,7 +19,7 @@ else # Waiting for https://github.com/B-Lang-org/bsc/issues/85 EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git" - KEYWORDS="~amd64 ~x86" + KEYWORDS="" fi LICENSE="BSD GPL-3+ MIT"