summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2020-01-09 06:53:20 -0600
committerBen Kohler <bkohler@gentoo.org>2020-01-09 06:55:52 -0600
commitfedd97b17389635d1375276cb670ec60f238860d (patch)
treef0fb106f02fd38697e640302331b6d56ef804e78
parentsys-kernel/gentoo-sources: Linux patch 5.4.9 and 5.4.10 (diff)
downloadgentoo-fedd97b1738.tar.gz
gentoo-fedd97b1738.tar.bz2
gentoo-fedd97b1738.zip
profiles: remove fam from desktop profiles & unmask on glib
Closes: https://bugs.gentoo.org/657694 Closes: https://bugs.gentoo.org/697476 Signed-off-by: Ben Kohler <bkohler@gentoo.org>
-rw-r--r--profiles/default/linux/package.use.mask4
-rw-r--r--profiles/targets/desktop/make.defaults2
2 files changed, 1 insertions, 5 deletions
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 5a1539179aa5..3758f1a59fac 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -39,10 +39,6 @@ sys-auth/pam_mktemp -prevent-removal
sys-devel/gcc hardened
sys-libs/glibc hardened
-# Samuli Suominen <ssuominen@gentoo.org> (2012-04-30)
-# This is replaced by native CONFIG_INOTIFY_USER support wrt #413403
-=dev-libs/glib-2* fam
-
# Samuli Suominen <ssuominen@gentoo.org (2012-03-20)
# This is masked in base/package.use.mask as Linux only.
sys-auth/consolekit -acl
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 0d420b3b94ec..91e965bf815d 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif gpm gtk icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif flac gif gpm gtk icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"