unmask pgo useflag, mask firefox from gentoo tree, clean some duplicate use masks

3 files changed, 7 insertions, 11 deletions

diff --git a/conf/intel/portage/package.mask/00-kogaion.package.mask b/conf/intel/portage/package.mask/00-kogaion.package.mask
index 8242721..cac92e2 100644
--- a/conf/intel/portage/package.mask/00-kogaion.package.mask
+++ b/conf/intel/portage/package.mask/00-kogaion.package.mask
@@ -23,3 +23,6 @@ sys-block/open-iscsi::kogaion
 
 # mask gentoo baselayout, user our own
 sys-apps/baselayout::gentoo
+
+# mask firefox from gentoo, use our own as it builds with PGO
+www-client/firefox::gentoo
diff --git a/conf/intel/portage/profile/package.use.mask/00-kogaion.mask b/conf/intel/portage/profile/package.use.mask/00-kogaion.mask
index 37d3879..75d3b05 100644
--- a/conf/intel/portage/profile/package.use.mask/00-kogaion.mask
+++ b/conf/intel/portage/profile/package.use.mask/00-kogaion.mask
@@ -1,16 +1,5 @@
-kde-base/solid -networkmanager
-
-# media-gfx/blender wants Python 3.3
-# need to unmask its use flag
-media-gfx/blender -python_single_target_python3_3 -python_targets_python3_3
-
 # http://bugs.rogentos.ro/show_bug.cgi?id=4115
 media-sound/audacity -ffmpeg
 
-# USE=systemd unmasking, no need to keep them masked
-sys-auth/polkit -systemd
-sys-power/upower -systemd
-sys-fs/udisks -systemd
-
 # We use a builtin module for sys-fs/zfs
 sys-fs/zfs -kernel-builtin
diff --git a/conf/intel/portage/profile/use.mask b/conf/intel/portage/profile/use.mask
index 3d10488..e24f46d 100644
--- a/conf/intel/portage/profile/use.mask
+++ b/conf/intel/portage/profile/use.mask
@@ -6,6 +6,7 @@
 
 # Unmask Python 3.3 stuff
 -python_targets_python3_3
+-python_single_target_python3_3
 
 # Unmask systemd for everything
 -systemd
@@ -18,3 +19,6 @@
 
 # calamares needs polkit-qt[qt5] so unmask qt5 useflag
 -qt5
+
+# unmask pgo
+-pgo