diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /profiles/features | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'profiles/features')
| -rw-r--r-- | profiles/features/prefix/packages | 1 | ||||
| -rw-r--r-- | profiles/features/prefix/standalone/profile.bashrc | 6 | ||||
| -rw-r--r-- | profiles/features/selinux/package.mask | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/profiles/features/prefix/packages b/profiles/features/prefix/packages index d347ce23ab0f..25c444c13e76 100644 --- a/profiles/features/prefix/packages +++ b/profiles/features/prefix/packages @@ -19,6 +19,7 @@ -*sys-fs/e2fsprogs -*virtual/dev-manager -*sys-apps/shadow +-*virtual/ssh # we don't want this either (as baselayout-prefix provides the functions.sh # file that this was added to ../base/packages for) diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index ff58c68a562c..76ef2455b35a 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -14,7 +14,11 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the einfo "Prefixifying dynamic linkers..." for h in gcc/config/*/*linux*.h; do ebegin " Updating $h" - sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h + if [[ "${h}" == gcc/config/rs6000/linux*.h ]]; then + sed -i -r "s,(DYNAMIC_LINKER_PREFIX\s+)\"\",\1\"${EPREFIX}\",g" $h + else + sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h + fi eend $? done diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index 45bd08d58a8c..d92f83aeac0e 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -51,6 +51,7 @@ gnome-extra/gnome-shell-extension-dash-to-panel gnome-extra/gnome-shell-extension-desktop-icons gnome-extra/gnome-shell-extension-desktop-icons-ng gnome-extra/gnome-shell-extension-gsconnect +gnome-extra/gnome-shell-extension-pop-shell gnome-extra/gnome-tweaks x11-themes/zukitwo-shell gnome-extra/office-runner |