From d39569a4ef0b3795ba00cf27f8b703dfa9a8e63c Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Thu, 21 Jun 2018 11:54:11 +0300
Subject: [PATCH] Desktop Profile cleaning.

---
 app-admin/eselect-vala/Manifest               |   1 -
 .../eselect-vala/eselect-vala-0.1.2.ebuild    |   2 +-
 app-misc/stardict-enru-dictset/Manifest       |   3 +-
 .../stardict-enru-dictset-1.0.0.ebuild        |   2 +-
 app-portage/ewo/ewo-0.4.1.ebuild              |   2 +-
 dev-lang/vala/vala-0.40.6.ebuild              |   2 +-
 dev-libs/gxml/gxml-0.16.3.ebuild              |   2 +-
 .../vala-common/vala-common-0.40.6.ebuild     |   2 +-
 dev-util/colormake/Manifest                   |   8 +-
 dev-util/colormake/colormake-0.2-r2.ebuild    |   2 +-
 games-emulation/gens-gs/gens-gs-7-r4.ebuild   |   2 +-
 .../zod-engine-data-20110906.ebuild           |   2 +-
 .../zod-engine/zod-engine-20110906-r1.ebuild  |   2 +-
 .../liberation-fonts/files/60-liberation.conf |  28 +++
 .../liberation-fonts-1.07.4.ebuild            |  31 ++++
 profiles/desktop/package.accept_keywords      | 175 ++----------------
 profiles/desktop/package.mask                 |   1 -
 sci-misc/labview/Manifest                     |   3 +-
 sci-misc/labview/labview-8.6.0.ebuild         |   2 +-
 sci-misc/qcad/qcad-3.7.1.0.ebuild             |   2 +-
 .../gtk-engines-equinox-1.50-r2.ebuild        |   2 +-
 21 files changed, 92 insertions(+), 184 deletions(-)
 create mode 100644 media-fonts/liberation-fonts/files/60-liberation.conf
 create mode 100644 media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild

diff --git a/app-admin/eselect-vala/Manifest b/app-admin/eselect-vala/Manifest
index 05b592f0..76aeaa53 100644
--- a/app-admin/eselect-vala/Manifest
+++ b/app-admin/eselect-vala/Manifest
@@ -1,2 +1 @@
 DIST eselect-vala-0.1.2.tar.gz 9595 SHA256 8bad6e94c9542284662902a7ffd9b2cb77fb71821ef82a63c8178d41e89d09be SHA512 84a4ce0bd5be021a744dec2dd32a9c7701c49151bb0d10bb8dee086b9bc54ecad487a412db0eb908e3a33c3585eba71a05b2967ab882946823d7c54864617c8f WHIRLPOOL e64ccc8ed7226789f701d09cb2ad1c76c3c98038111677a29178a49952e2b67615c49c23052ef68907777e7854ea1f2b3f65367e46cfba77e90ce4d3d1e40c46
-EBUILD eselect-vala-0.1.2.ebuild 530 SHA256 7f1a4598d5ac016434e429d6babbbb3c9961da092f7c504050063a32846a8008 SHA512 13d95066fad0ff1693f01c36d5131eb911135c8be90544c23c0fca02595d58d8e71f1f7125e7a7f6eb2a9aad138cd74697040f31d3bf1fce6753ddc9231dd8b0 WHIRLPOOL 7cb81bd43baf9d6e0bd96489dc1ece5fbcbb833908a41fe84523e8a76298aa75cfcde9b813e3d897fabbc646329e50f2f75da90463818f22dde2a871205ee9e6
diff --git a/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild b/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild
index 3be49890..98938162 100644
--- a/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild
+++ b/app-admin/eselect-vala/eselect-vala-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-admin/eselect
diff --git a/app-misc/stardict-enru-dictset/Manifest b/app-misc/stardict-enru-dictset/Manifest
index 8b259e02..d4fba65f 100644
--- a/app-misc/stardict-enru-dictset/Manifest
+++ b/app-misc/stardict-enru-dictset/Manifest
@@ -1,2 +1 @@
-DIST stardict-enru-dictset-1.0.0.tar.bz2 214522779 RMD160 acd7e9a6f1c1069ce00372188f98f2fee5459381 SHA1 4879a699bb82c4b060916ab008a1f128e1c69df4 SHA256 7b6ede1d52e3f47b649a033fa545949503f0347f22e27898ddc6e8711f13c3e0
-EBUILD stardict-enru-dictset-1.0.0.ebuild 469 RMD160 ff41d1099bfa81dd7d018ebf0a7a79f335e6d89b SHA1 f8a0c44f9ac122e9068fb81b0549d1e5dbb7ddcd SHA256 090e2fd8bc2031df67275c8c42a7a8aceaca741cec5b4f07114539cf83491398
+DIST stardict-enru-dictset-1.0.0.tar.bz2 214522779 SHA256 7b6ede1d52e3f47b649a033fa545949503f0347f22e27898ddc6e8711f13c3e0 SHA512 28cb6bfe1cad72dd9f91335fba37ddaffcc06ab3bc58f3396f2b1990c55495bee33a05193fb32e96bcc0dec42b47ab21f5cc5b1dac2f79b778611491f2a2e8f7 WHIRLPOOL e2b7e2bdf6c533c2aee7d8a2f9c4fde463dcb92b32ec56b9fe1d5cce88b32453e16663ed457159c603db3e72968aab66100c05a49a0e6405b9a735b2ef56bdfe
diff --git a/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild b/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild
index da866863..100cd3d9 100644
--- a/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild
+++ b/app-misc/stardict-enru-dictset/stardict-enru-dictset-1.0.0.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 inherit eutils
 
 SRC_URI="http://files.backbone.ws/projects/stardict-dicts/${P}.tar.bz2"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 
 DESCRIPTION="Set of en/ru dictionaries for stardict"
 
diff --git a/app-portage/ewo/ewo-0.4.1.ebuild b/app-portage/ewo/ewo-0.4.1.ebuild
index 93680aad..60d8b314 100644
--- a/app-portage/ewo/ewo-0.4.1.ebuild
+++ b/app-portage/ewo/ewo-0.4.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://ewo-gentoo.googlecode.com/"
 SRC_URI="http://ewo-gentoo.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 RDEPEND="app-portage/genlop"
 DEPEND=""
diff --git a/dev-lang/vala/vala-0.40.6.ebuild b/dev-lang/vala/vala-0.40.6.ebuild
index 598990cc..7bc0a0c0 100644
--- a/dev-lang/vala/vala-0.40.6.ebuild
+++ b/dev-lang/vala/vala-0.40.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/vala/0.40/vala-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/gxml/gxml-0.16.3.ebuild b/dev-libs/gxml/gxml-0.16.3.ebuild
index ade8ddb7..055b10b1 100644
--- a/dev-libs/gxml/gxml-0.16.3.ebuild
+++ b/dev-libs/gxml/gxml-0.16.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/GXml"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/vala-common/vala-common-0.40.6.ebuild b/dev-libs/vala-common/vala-common-0.40.6.ebuild
index 91475023..b9d8d421 100644
--- a/dev-libs/vala-common/vala-common-0.40.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-util/colormake/Manifest b/dev-util/colormake/Manifest
index a27c2325..b07bb332 100644
--- a/dev-util/colormake/Manifest
+++ b/dev-util/colormake/Manifest
@@ -1,7 +1 @@
-AUX colormake-0.2-cmake.patch 351 RMD160 2d9d5802467daee4f79d8941f3ad78c8ccdc800a SHA1 3fc4d1cbde9e700c4ef7c75ece1d104caf37fbba SHA256 73ce615d4a37f59fe40f80fc9d203b89ad9730b60201d068d38d583aafee8c13
-AUX colormake-0.2-disable-broken-tagging.patch 661 RMD160 c9cee92d1a83b3696ec2ee75ef037ab4734112b8 SHA1 5e2fde865ffe028f5bfea6cb69fd938b5671105c SHA256 b61d0262b8a69edf7c20b07c5698122a35ad251ea5e542bd9926a622daefa944
-AUX colormake-0.2-save-pipe-exit-status.patch 177 RMD160 a20943339dfaa80fc733e5837e1b7bd0cc4e90b3 SHA1 979ee9eaf4878c6be528ef02772c4752a48942a7 SHA256 98a95b839da18d36bbca507e1374db4c1bccea8bbb41e590d75dc4fa40051c5c
-DIST colormake-0.2.tar.gz 9871 RMD160 b39e22de6ed72a5874af56e2fc46774a9452af4d SHA1 d24e1cd27c121aba86b1610616848228eebd1393 SHA256 8e7cc49acbc2b9b52ce2d87993f709e6813f0ba3aff0b0bbe7630c3a24aff969
-EBUILD colormake-0.2-r2.ebuild 700 RMD160 66008f2895bc2aad342dd48162c69f9c8e9562d9 SHA1 c14a4f53a24139c670e8308284d7b82d0a725480 SHA256 7d177dee64dd67c231a46ca224f7180118abcec2e676037fade4f67a967e3844
-MISC ChangeLog 401 RMD160 d85ebf7cd9ddd355508f8955725f432ff44998db SHA1 a73e3197c52ee026c17301fa44e0e20bd3c8a05c SHA256 8e421e7b3cf41b42e39be0004ed37851540ca994de9c9d2e76bfce9a6110746e
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+DIST colormake-0.2.tar.gz 9871 SHA256 8e7cc49acbc2b9b52ce2d87993f709e6813f0ba3aff0b0bbe7630c3a24aff969 SHA512 2f648799a52497c36089fbfdbce56b2d88f4e8df2ca24027ef71b422d969e4dbcaf95b0bbe89d010dc80e34cde9d49b5cc07792c48340d4a961dd58e21a6dfbe WHIRLPOOL a59700e699a5b92634a913b980fc7f052fadcb69b0b4be4368199e358917da3dfe5408992e93d408b322bdc4346672eebf00be592ae368d8b235a0499bd89499
diff --git a/dev-util/colormake/colormake-0.2-r2.ebuild b/dev-util/colormake/colormake-0.2-r2.ebuild
index 691df8f2..7523d80e 100644
--- a/dev-util/colormake/colormake-0.2-r2.ebuild
+++ b/dev-util/colormake/colormake-0.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vanilla"
 RDEPEND="dev-lang/perl"
 
diff --git a/games-emulation/gens-gs/gens-gs-7-r4.ebuild b/games-emulation/gens-gs/gens-gs-7-r4.ebuild
index a5112b9e..81cc32b3 100644
--- a/games-emulation/gens-gs/gens-gs-7-r4.ebuild
+++ b/games-emulation/gens-gs/gens-gs-7-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.soniccenter.org/gerbilsoft/gens/${MY_PV}/${PN}-${MY_PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="opengl"
 
 RDEPEND="opengl? (
diff --git a/games-strategy/zod-engine-data/zod-engine-data-20110906.ebuild b/games-strategy/zod-engine-data/zod-engine-data-20110906.ebuild
index d98b2357..a9a9c275 100644
--- a/games-strategy/zod-engine-data/zod-engine-data-20110906.ebuild
+++ b/games-strategy/zod-engine-data/zod-engine-data-20110906.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zod/linux_releases/${MY_P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="bindist"
 
diff --git a/games-strategy/zod-engine/zod-engine-20110906-r1.ebuild b/games-strategy/zod-engine/zod-engine-20110906-r1.ebuild
index 9f04f6ce..69179681 100644
--- a/games-strategy/zod-engine/zod-engine-20110906-r1.ebuild
+++ b/games-strategy/zod-engine/zod-engine-20110906-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zod/${MY_P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+editor +launcher"
 
 RDEPEND="
diff --git a/media-fonts/liberation-fonts/files/60-liberation.conf b/media-fonts/liberation-fonts/files/60-liberation.conf
new file mode 100644
index 00000000..c2d1e8d8
--- /dev/null
+++ b/media-fonts/liberation-fonts/files/60-liberation.conf
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<!-- Symlinking this file to /etc/fonts/conf.d/ will allow 
+         you to use liberation fonts instead of the microsoft truetype fonts.
+         (from http://uwstopia.nl/blog/2007/05/free-your-fonts) -->
+
+	<!-- Liberation fonts -->
+	<match target="pattern">
+		<test qual="any" name="family"><string>Times New Roman</string></test>
+		<edit name="family" mode="assign"><string>Liberation Serif</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Arial</string></test>
+		<edit name="family" mode="assign"><string>Liberation Sans</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Courier</string></test>
+		<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
+	</match>
+	<match target="pattern">
+		<test qual="any" name="family"><string>Arial Narrow</string></test>
+		<edit name="family" mode="assign"><string>Liberation Sans Narrow</string></edit>
+	</match>
+
+</fontconfig>
+
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild
new file mode 100644
index 00000000..e9d3d85a
--- /dev/null
+++ b/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit font
+
+DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
+HOMEPAGE="https://pagure.io/liberation-fonts"
+SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}-ttf-${PV}.tar.gz )
+	fontforge? ( https://releases.pagure.org/liberation-fonts/${P}.tar.gz )"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="GPL-2-with-exceptions"
+IUSE="fontforge X"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
+
+DEPEND="fontforge? ( media-gfx/fontforge )"
+RDEPEND=""
+
+pkg_setup() {
+	if use fontforge; then
+		FONT_S="${S}/${PN}-ttf-${PV}"
+	else
+		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
+		S="${FONT_S}"
+	fi
+	font_pkg_setup
+}
diff --git a/profiles/desktop/package.accept_keywords b/profiles/desktop/package.accept_keywords
index 80af5d71..d75d29fb 100644
--- a/profiles/desktop/package.accept_keywords
+++ b/profiles/desktop/package.accept_keywords
@@ -1,6 +1,5 @@
 <app-accessibility/festival-ru-1 ~amd64
 <app-accessibility/pidgin-festival-3 ~amd64
-<app-accessibility/speech-tools-2.2 ~amd64
 <app-admin/cpuset-2 ~amd64
 <app-admin/eselect-opencascade-1 ~amd64
 <app-admin/eselect-vala-1 ~amd64
@@ -8,85 +7,45 @@
 <app-admin/paxtest-1 ~amd64
 <app-antivirus/clamav-1 ~amd64
 <app-antivirus/clamtk-6 ~amd64
-<app-arch/lbzip2-2.6 ~amd64
-<app-emulation/aqemu-1 ~amd64
-app-emulation/fuse ~amd64
-<app-editors/gvim-7.5 ~amd64
-app-emulation/libspectrum ~amd64
+<app-emulation/fuse-2 ~amd64
+<app-emulation/libspectrum-2 ~amd64
 <app-editors/oxygenxml-12 ~x86
-<app-editors/vim-7.5 ~amd64
-<app-editors/vim-core-7.5 ~amd64
 <app-emulation/playonlinux-5 ~amd64
-<app-emulation/spice-0.14 ~amd64
-<app-emulation/spice-protocol-0.13 ~amd64
 <app-emulation/virtualbox-additions-5.2 ~amd64
 <app-emulation/virtualbox-5.2 ~amd64
 <app-emulation/virtualbox-modules-5.2 ~amd64
-<app-emulation/wine-3 ~amd64
+<app-emulation/wine-4 ~amd64
 <app-emulation/wine-staging-4 ~amd64
-app-emulation/winetricks ~amd64
-<app-eselect/eselect-java-0.3 ~amd64
-app-forensics/chkrootkit ~amd64
+<app-emulation/winetricks-20190101 ~amd64
+<app-forensics/chkrootkit-1 ~amd64
 <app-laptop/samsung-tools-2.4 ~amd64
-<app-misc/stardict-enru-dictset-1.1 ~amd64
 =app-pda/libimobiledevice-9999 **
 <app-portage/deltup-1 ~amd64
-<app-portage/eix-0.33 ~amd64
 <app-portage/ewo-1 ~amd64
 =app-portage/findcruftfiles-9999 **
 <app-portage/genlop-0.31 ~amd64
-<app-portage/gentoolkit-3.2 ~amd64
 <app-portage/getdelta-1 ~amd64
-<app-shells/quoter-4 ~amd64
-<app-shells/gentoo-zsh-completions-20170101 ~amd64
-<app-shells/push-3 ~amd64
+<app-shells/gentoo-zsh-completions-20190101 ~amd64
 <app-shells/zsh-completions-1 ~amd64
 <app-text/cuneiform-2 ~amd64
-<app-text/dos2unix-7.4 ~amd64
-<app-text/dvipsk-6 ~amd64
 <app-text/libetonyek-0.2 ~amd64
 <app-text/libmwaw-0.4 ~amd64
-<app-text/libwpd-0.11 ~amd64
-<app-text/libwpg-0.4 ~amd64
 <app-text/libwps-0.5 ~amd64
-<app-text/libodfgen-0.2 ~amd64
-<app-text/poppler-0.63 ~amd64
-<app-text/ps2pkm-1.9 ~amd64
 <app-text/texlive-2018 ~amd64
 <app-text/texlive-core-2018 ~amd64
-<app-text/ttf2pk2-2.1 ~amd64
-<app-text/xdvik-23 ~amd64
-<app-text/yagf-1 ~amd64
 <app-vim/youcompleteme-20170101 ~amd64
-<dev-db/sqlite-3.22 ~amd64
 <dev-lang/gnu-smalltalk-4 ~amd64
 <dev-lang/nasm-2.14 ~amd64
-<dev-lang/rust-1.27 ~amd64
-<dev-lang/spidermonkey-1.9 ~amd64
 <dev-lang/vala-1 ~amd64
 <dev-libs/d0_blind_id-1.1 ~amd64
 <dev-libs/gmp-6.2 ~amd64
 <dev-libs/go-fuse-1 ~amd64
 =dev-libs/go-usb-9999 **
 =dev-libs/gobject-plugin-9999 **
-<dev-libs/kpathsea-6.3 ~amd64
-<dev-libs/libixion-0.10 ~amd64
 <dev-libs/libgee-1 ~amd64
-<dev-libs/gxml-1 ~amd64
-<dev-libs/libpipeline-1.5 ~amd64
-<dev-libs/libtasn1-5 ~amd64
 <dev-libs/libwacom-1 ~amd64
-<dev-libs/lzo-2.10 ~amd64
-<dev-libs/nspr-5 ~amd64
 <dev-libs/nss-4 ~amd64
 <dev-libs/vala-common-1 ~amd64
-<dev-python/chardet-2.4 ~amd64
-<dev-python/enum34-1.2 ~amd64
-<dev-python/idna-2.6 ~amd64
-<dev-python/ipaddress-1.1 ~amd64
-<dev-python/pyasn1-0.2 ~amd64
-<dev-python/urllib3-2 ~amd64
-<dev-python/urwid-1.4 ~amd64
 <dev-qt/linguist-tools-5.10 ~amd64
 <dev-qt/qtconcurrent-5.10 ~amd64
 <dev-qt/qtcore-5.10 ~amd64
@@ -107,7 +66,6 @@ app-forensics/chkrootkit ~amd64
 <dev-qt/qtwidgets-5.10 ~amd64
 <dev-qt/qtx11extras-5.10 ~amd64
 <dev-qt/qtxml-5.10 ~amd64
-<dev-tex/bibtexu-4 ~amd64
 <dev-texlive/texlive-basic-2018 ~amd64
 <dev-texlive/texlive-fontsextra-2018 ~amd64
 <dev-texlive/texlive-fontsrecommended-2018 ~amd64
@@ -124,17 +82,12 @@ app-forensics/chkrootkit ~amd64
 <dev-texlive/texlive-science-2018 ~amd64
 <dev-util/bdelta-1 ~amd64
 <dev-util/cargo-0.28 ~amd64
-<dev-util/cmake-3.7 ~amd64
-<dev-util/cmocka-1.2 ~amd64
-<dev-util/colormake-1 ~amd64
-<dev-util/cppcheck-2 ~amd64
+<dev-util/cmake-3.12 ~amd64
 <dev-util/glade-3.21 ~amd64
 <dev-util/kbuild-0.2 ~amd64
-<dev-util/mdds-1.3 ~amd64
 <dev-util/perf-5 ~amd64
-<dev-util/pkgconfig-1 ~amd64
 =dev-util/valadoc-9999 **
-<dev-util/valgrind-3.12 ~amd64
+<dev-util/valgrind-3.14 ~amd64
 <games-action/extreme-tuxracer-0.8 ~amd64
 <games-action/minetest-1 ~amd64
 <games-arcade/frozen-bubble-2.3 ~amd64
@@ -144,7 +97,7 @@ app-forensics/chkrootkit ~amd64
 <games-emulation/fceux-2.3 ~amd64
 games-emulation/higan ~amd64
 games-emulation/gens-gs ~amd64
-<games-emulation/snes9x-1.55 ~amd64
+<games-emulation/snes9x-2 ~amd64
 <games-fps/doom3-2 ~amd64
 <games-fps/urbanterror-5 ~amd64
 <games-fps/urbanterror-data-5 ~amd64
@@ -155,74 +108,22 @@ games-emulation/gens-gs ~amd64
 <games-strategy/0ad-1 ~amd64
 <games-strategy/0ad-data-1 ~amd64
 <games-strategy/dunelegacy-0.97 ~amd64
-<games-strategy/zod-engine-20170101 ~amd64
-<games-strategy/zod-engine-data-20170101 ~amd64
 <games-util/joystick-1.7 ~amd64
 <games-util/steam-client-meta-1 ~amd64
 <games-util/steam-games-meta-1 ~amd64
 <games-util/steam-launcher-2 ~amd64
 <games-util/steam-meta-1 ~amd64
-<kde-apps/kdenlive-18 ~amd64
-<kde-frameworks/kdbusaddons-5.38 ~amd64
-<kde-frameworks/solid-5.38 ~amd64
-<kde-frameworks/karchive-5.38 ~amd64
-<kde-frameworks/kjobwidgets-5.38 ~amd64
-<kde-frameworks/kiconthemes-5.38 ~amd64
-<kde-frameworks/kxmlgui-5.38 ~amd64
-<kde-frameworks/knewstuff-5.38 ~amd64
-<kde-frameworks/knotifyconfig-5.38 ~amd64
-<kde-frameworks/kservice-5.38 ~amd64
-<kde-frameworks/kwidgetsaddons-5.38 ~amd64
-<kde-frameworks/kwallet-5.38 ~amd64
-<kde-frameworks/kauth-5.38 ~amd64
-<kde-frameworks/ki18n-5.38 ~amd64
-<kde-frameworks/kglobalaccel-5.38 ~amd64
-<kde-frameworks/kconfigwidgets-5.38 ~amd64
-<kde-frameworks/kguiaddons-5.38 ~amd64
-<kde-frameworks/kio-5.38 ~amd64
-<kde-frameworks/kdoctools-5.38 ~amd64
-<kde-frameworks/kinit-5.38 ~amd64
-<kde-frameworks/ktextwidgets-5.38 ~amd64
-<kde-frameworks/kcoreaddons-5.38 ~amd64
-<kde-frameworks/extra-cmake-modules-5.38 ~amd64
-<kde-frameworks/sonnet-5.38 ~amd64
-<kde-frameworks/kcrash-5.38 ~amd64
-<kde-frameworks/kded-5.38 ~amd64
-<kde-frameworks/kitemviews-5.38 ~amd64
-<kde-frameworks/knotifications-5.38 ~amd64
-<kde-frameworks/kconfig-5.38 ~amd64
-<kde-frameworks/kcodecs-5.38 ~amd64
-<kde-frameworks/kbookmarks-5.38 ~amd64
-<kde-frameworks/attica-5.38 ~amd64
-<kde-frameworks/kwindowsystem-5.38 ~amd64
-<kde-frameworks/kcompletion-5.38 ~amd64
-<media-fonts/liberation-fonts-2 ~amd64
-<media-gfx/blender-2.80 ~amd64
+<kde-apps/kdenlive-19 ~amd64
 <media-gfx/freecad-1 ~amd64
 <media-gfx/graphite2-1.4 ~amd64
-<media-gfx/graphviz-2.41 ~amd64
-<media-gfx/imagemagick-7 ~amd64
-<media-gfx/librecad-2.1 ~amd64
-<media-gfx/shotwell-1 ~amd64
 <media-libs/alsa-lib-1.1.5 ~amd64
 <media-libs/avidemux-core-3 ~amd64
 <media-libs/avidemux-plugins-3 ~amd64
 <media-libs/faac-1.30 ~amd64
-<media-libs/freetype-2.7 ~amd64
 <media-libs/glm-1 ~amd64
-<media-libs/gst-plugins-bad-1.13 ~amd64
-<media-libs/harfbuzz-1.5 ~amd64
-<media-libs/lcms-2.8 ~amd64
 =media-libs/libfilteraudio-9999 **
 <media-libs/libmtp-1.2 ~amd64
-<media-libs/libpng-1.7 ~amd64
-<media-libs/mediastreamer-2.10 ~amd64
-<media-libs/mesa-13 ~amd64
-<media-libs/opencv-2.5 ~amd64
 <media-libs/openimageio-1.9 ~amd64
-<media-libs/speex-1.3 ~amd64
-<media-libs/speexdsp-1.3 ~amd64
-<media-libs/x264-0.1 ~amd64
 <media-libs/x265-3 ~amd64
 <media-libs/xvid-1.4 ~amd64
 <media-plugins/alsa-plugins-1.1.5 ~amd64
@@ -231,99 +132,57 @@ games-emulation/gens-gs ~amd64
 <media-sound/alsa-utils-1.1.5 ~amd64
 =media-sound/apulse-9999 **
 <media-sound/audacious-3.10 ~amd64
-<media-sound/audacity-2.1 ~amd64
-<media-sound/jack-audio-connection-kit-1 ~amd64
+<media-sound/audacity-2.3 ~amd64
 <media-sound/mp3unicode-2 ~amd64
-<media-tv/kodi-17 ~amd64
 <media-video/avidemux-3 ~amd64
-<media-video/cinelerra-20170101 ~amd64
-<media-video/ffmpeg-3.4 ~amd64
-<media-video/ffmpegthumbnailer-2.3 ~amd64
 <media-video/lives-2 ~amd64
-<media-video/mpv-1 ~amd64
 <media-video/v4l2ucp-3 ~amd64
-<media-video/vlc-2.3 ~amd64
-<net-analyzer/hping-4 ~amd64
 <net-analyzer/nethogs-0.9 ~amd64
 <net-fs/samba-5 ~amd64
 <net-fs/smbnetfs-1 ~amd64
-<net-libs/gnutls-3.4 ~amd64
 <net-libs/libeXosip-4.1 ~amd64
 <net-libs/libtorrent-rasterbar-1.2 ~amd64
-<net-libs/rb_libtorrent-1.1 ~amd64
 =net-libs/tox-9999 **
-net-im/telegram-desktop-bin ~amd64
+<net-im/telegram-desktop-bin-2 ~amd64
 =net-im/utox-9999 **
 =net-im/viber-9999 ~amd64
-<net-misc/freerdp-2.1 ~amd64
-<net-misc/netifrc-0.4 ~amd64
 <net-misc/remmina-1.3 ~amd64
-<net-misc/spice-gtk-0.34 ~amd64
-<net-p2p/deluge-1.4 ~amd64
-<net-print/cups-2.2 ~amd64
 <net-voip/linphone-3.7 ~amd64
 <sci-geosciences/googleearth-8 ~amd64
-<sci-misc/labview-9 ~amd64
-<sci-misc/qcad-4 ~amd64
 <sys-apps/gcp-1 ~amd64
 =sys-apps/hardinform-9999 **
-<sys-apps/hwids-20170101 ~amd64
-<sys-apps/i2c-tools-3.2 ~amd64
 <sys-apps/net-tools-1.61 ~amd64
 =sys-apps/uksmstat-9999 **
-<sys-apps/util-linux-2.28 ~amd64
 <sys-block/whdd-3 ~amd64
-<sys-devel/boost-m4-0.5 ~amd64
-<sys-devel/clang-5.1 ~amd64
-<sys-devel/clang-runtime-5.1 ~amd64
-<sys-devel/gcc-5.5 ~amd64
-<sys-devel/gettext-0.20 ~amd64
-<sys-devel/llvm-5.1 ~amd64
-<sys-devel/llvm-common-5.1 ~amd64
 <sys-devel/prelink-20160101 ~amd64
-sys-firmware/intel-microcode ~amd64
-sys-fs/android-file-transfer ~amd64
+<sys-firmware/intel-microcode-20190101 ~amd64
 <sys-fs/bcache-tools-2 ~amd64
 =sys-fs/go-mtpfs-9999 **
 <sys-fs/jmtpfs-1 ~amd64
 <sys-fs/mtpfs-1.2 ~amd64
 <sys-fs/simple-mtpfs-1 ~amd64
-<sys-fs/udev-234 ~amd64
 <sys-kernel/backbone-sources-4.16 ~amd64
 <sys-kernel/vanilla-sources-4.17 ~amd64
-sys-kernel/linux-firmware ~amd64
+<sys-kernel/linux-firmware-20190101 ~amd64
 <sys-kernel/linux-headers-5 ~amd64
-<sys-libs/compiler-rt-5.1 ~amd64
-<sys-libs/compiler-rt-sanitizers-5.1 ~amd64
 <sys-libs/ldb-1.4 ~amd64
-<sys-libs/libomp-5.1 ~amd64
-<sys-libs/libseccomp-2.4 ~amd64
 <sys-libs/talloc-2.2 ~amd64
 <sys-libs/tdb-1.4 ~amd64
 <sys-libs/tevent-1 ~amd64
-<sys-libs/timezone-data-2017 ~amd64
+<sys-libs/timezone-data-2019 ~amd64
 <sys-power/powerstat-1 ~amd64
-<sys-power/powertop-2.9 ~amd64
-<sys-process/acct-6.7 ~amd64
-<sys-process/atop-3 ~amd64
-<sys-process/procps-3.4 ~amd64
-<virtual/rust-1.24 ~amd64
 www-client/firefox ~amd64
 <www-plugins/mozplugger-3 ~amd64
-<www-plugins/adobe-flash-25 ~amd64
-x11-drivers/nvidia-drivers ~amd64
-<x11-drivers/xf86-input-evdev-2.11 ~amd64
+<www-plugins/adobe-flash-40 ~amd64
+<x11-drivers/nvidia-drivers-500 ~amd64
 =x11-drivers/snail-9999 **
 <x11-drivers/xf86-video-intel-2.100 ~amd64
 <x11-libs/libdrm-2.5 ~amd64
 <x11-libs/libva-2 ~amd64
 <x11-libs/libva-intel-driver-2 ~amd64
 <x11-libs/wxGTK-3.1 ~amd64
-<x11-misc/arandr-0.2 ~amd64
 =x11-misc/primus-9999 **
-<x11-misc/trayion-1 ~amd64
 <x11-plugins/pidgin-bot-sentry-2 ~amd64
 <x11-plugins/whatsapp-purple-1 ~amd64
 <x11-themes/audacious-themes-0.5 ~amd64
-<x11-themes/gtk-engines-equinox-2 ~amd64
 <x11-wm/awesome-4.3 ~amd64
diff --git a/profiles/desktop/package.mask b/profiles/desktop/package.mask
index bee584e5..b899c835 100644
--- a/profiles/desktop/package.mask
+++ b/profiles/desktop/package.mask
@@ -1,4 +1,3 @@
 >=media-fonts/liberation-fonts-2.00.0
 =media-plugins/caps-plugins-0.9.24 # brokes equiilizer
-=app-text/libmwaw-0.3.13
 =sys-fs/udev-238 #  error: size of array ‘a’ is negative
diff --git a/sci-misc/labview/Manifest b/sci-misc/labview/Manifest
index 93eb88b6..140cf010 100644
--- a/sci-misc/labview/Manifest
+++ b/sci-misc/labview/Manifest
@@ -1,2 +1 @@
-DIST labview-8.6.0.tar.bz2 297269546 RMD160 2570e53998c173a962e5636f3fb72c31f4fe5516 SHA1 558e2afa2455b951f3dcd78eacfcb546acd85b64 SHA256 29b416b8d598c9b880ebac059e72ed8bf6e1b6f28b74edf99fb5f9098bb24aa5
-EBUILD labview-8.6.0.ebuild 444 RMD160 225de5f48081c5dfb970e4aaf6657f00f4849528 SHA1 84013d3d70cbf64f652afd3a1b3ba0cc2d6f0216 SHA256 8047ac50acb48f513eeaa306752490deb13d881a05dbac332619ef258009c99d
+DIST labview-8.6.0.tar.bz2 297269546 SHA256 29b416b8d598c9b880ebac059e72ed8bf6e1b6f28b74edf99fb5f9098bb24aa5 SHA512 d7e029e54cf71a9a2f79c8871ae4baad514c6fc879de17a94be7e565c358f1455a88f30d390c868b80f0683aba9495b0c1212652e7b31817e03940c037c8388e WHIRLPOOL 2f97db4d92c05b78e1f774b8ccbac7d7b207e19ab393cfa12069205c886a3633f62dbeb4656ac1e9f889803c8bde2583ec34048b935c2101ebe8ba6d4f9c5a07
diff --git a/sci-misc/labview/labview-8.6.0.ebuild b/sci-misc/labview/labview-8.6.0.ebuild
index 3a436c55..a2772b71 100644
--- a/sci-misc/labview/labview-8.6.0.ebuild
+++ b/sci-misc/labview/labview-8.6.0.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 inherit eutils
 
 SRC_URI="http://files.backbone.ws/projects/labview/${P}.tar.bz2"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 
 DESCRIPTION="LabVIEW System Design Software"
 
diff --git a/sci-misc/qcad/qcad-3.7.1.0.ebuild b/sci-misc/qcad/qcad-3.7.1.0.ebuild
index 4aa78f85..7ac2ef19 100644
--- a/sci-misc/qcad/qcad-3.7.1.0.ebuild
+++ b/sci-misc/qcad/qcad-3.7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/qcad/qcad/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 LINGUAS=( de en es fr it ja nl pl pt ru sl )
 IUSE=""
diff --git a/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r2.ebuild b/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r2.ebuild
index c1581b5a..2353dbad 100644
--- a/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r2.ebuild
+++ b/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://gnome-look.org/CONTENT/content-files/121881-${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+animations"
 
 RDEPEND="x11-libs/gtk+"