diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
| commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
| tree | f82923fbca262493e83dd1382e561a2fae24cc46 /profiles/features | |
| parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
| parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'profiles/features')
| -rw-r--r-- | profiles/features/prefix/package.mask | 2 | ||||
| -rw-r--r-- | profiles/features/selinux/package.mask | 7 | ||||
| -rw-r--r-- | profiles/features/selinux/package.use.mask | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask index 4b5eef8c610b..d7c27784d855 100644 --- a/profiles/features/prefix/package.mask +++ b/profiles/features/prefix/package.mask @@ -16,9 +16,9 @@ gnome-extra/gnome-user-share gnome-extra/office-runner sys-apps/gentoo-systemd-integration sys-apps/systemd-readahead +sys-kernel/installkernel-systemd-boot sys-process/systemd-cron www-misc/profile-sync-daemon <x11-wm/mutter-3.30 <gnome-base/gnome-shell-3.30 <virtual/service-manager-1 - diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index b09cf0660c37..d49714cde9a5 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -60,18 +60,11 @@ gnome-extra/gnome-user-share # python2_7-only packages that depend on portage # cause unresolvable deps =app-admin/bcfg2-1.2.4-r1 -app-admin/packagekit -~app-admin/packagekit-base-1.1.12 -app-admin/packagekit-gtk -app-admin/packagekit-qt <app-admin/salt-2018 <app-admin/webapp-config-1.55 -app-backup/deja-dup app-portage/distpatch -app-portage/euscan <app-portage/g-sorcery-0.2.1-r1 =app-portage/gs-elpa-0.1.3 <app-portage/layman-2.4.2 app-portage/metagen =app-portage/overlint-0.5.2 -gnome-extra/gnome-packagekit diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask index 3b50e65f7edd..9f0f0f4923e9 100644 --- a/profiles/features/selinux/package.use.mask +++ b/profiles/features/selinux/package.use.mask @@ -30,5 +30,4 @@ net-wireless/bluez user-session # Jason Zaman <perfinion@gentoo.org> (2019-12-01) # SELinux userspace 3.0 dropped python2.7 support app-admin/matter python_targets_python2_7 -app-portage/euscan python_targets_python2_7 kde-frameworks/frameworkintegration appstream |