gentoo resync : 18.05.2019

43 files changed, 625 insertions, 68 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 467d6e3b1581..cc80e4c6def0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 492b60ad8f36..735c9c859466 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,5 +1,5 @@
 DIST colord-1.3.4.tar.xz 1259256 BLAKE2B 08e8ab5dfb9ed76078f8eb7191900109ccbb7dc3eec41d6baaa7e59998488de3062c34894a802d993ab76a2c3d9bdec3a5e07ceec441e5bb5333f2af3c3d3eb8 SHA512 5556cc12cc72bceefd075274a1734b884e88b1a0777f7efde15118cf5d1597aa12c44680bc814dd230f39f39c9ea2dd309bc79170b19ca782488b90cda631937
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
 EBUILD colord-1.3.4.ebuild 4354 BLAKE2B bda2ce104ffb19b1b486be891bbd1a8f2ffed6476418fd3915a09a362976ad3574e7f35995fb0a883b4fd699156bccdc5dbd1fa422c713dbaf226166a3244e36 SHA512 c3f7d55cf967c6dcd5fc909919477b900694afc5c0cfbfd527a90cd2b924941fd25c150e4279bfec7f5d850e9e35479950dcee77360efd4fef04c8eddaf8df3a
-EBUILD colord-1.3.5.ebuild 4355 BLAKE2B 13f8f55fe2db8b0901ce410d54715f84f534eec37d5996a2900e395f19582a627c90ec69448834c9526e150299625c3345ddda0698ded0d150d60c9ba68e1712 SHA512 d9f7bfe463a777f2769019beb1cb69c564f5d5f22ddc007be358feac32fda6c83954568f5f1835ad146d935bafaf58e40a5259f1faac8a8b27a1f0d20f838252
+EBUILD colord-1.3.5.ebuild 4352 BLAKE2B e812d92c9f3c93d30d23755df14eb02c7d177e206fbcccd283ee387be569f8a6407b3f4d000eea0d488f98db2fcc5eaa7aa41c5d035eccf37eede0b67ea07335 SHA512 231fc24215b160a3e398623b4344f4fbad22a2e515dfc5031914e9520abf9d0242f4240258a3bafd76ae14d636db99306c7b7fc6dfcb9a4817e793df9c64de81
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index e4b2be75c428..515755ea8835 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/flow-pomodoro/Manifest b/x11-misc/flow-pomodoro/Manifest
index 525d10dbada3..233f3fde096b 100644
--- a/x11-misc/flow-pomodoro/Manifest
+++ b/x11-misc/flow-pomodoro/Manifest
@@ -1,3 +1,4 @@
+AUX flow-pomodoro-1.2.0-qt-5.12.patch 1256 BLAKE2B b1316ed42f71418a2ce94421f8abb1f4ad560b6c39a686891e8ebc950c333e4bc9057a526fa7f408e2a75399e51daaa880cf22f266236b1def2b1d4a6a39b405 SHA512 ea42b0a7e66e3a1f6fd28f738fd0a1d78a41e506fa6e280e0f96162dd8890e669fa893c2e692f2ac259bcd9e6c9f8f6af68596895c48104ec733c2d7531c0b23
 DIST flow-pomodoro-1.2.0.tar.gz 661888 BLAKE2B 776322a4c7bac37a7c5db7e3776838c8e7365745df87fcda557611055890d586b4fd1baa285d33bbf2bb1c77923c8d4751787dfe88c32dcd7d36827e8f9ff80f SHA512 1f347a679fe85e4751166c6aa8af3fda06c57844c0be7116266b2203d061abd1631cb994c0942f3fea9209064d9a49a230248ac101156132aa66a519438acccc
-EBUILD flow-pomodoro-1.2.0.ebuild 605 BLAKE2B ee3c6fc21f159287afbcfcbbe8630886e5f306ca404e06f433f0922c7b2c800e5282e4038f7306fff8c92858db06b1483a096be35ea8a40af8d7cb5ef435c1de SHA512 89f98dc8e52be494f8122687fc82c8a11b63db79f8cd6f85b77e6f19bfe7282bb72f89d9d42198b7e85ee4a8103c5b8901c2343ffaec5342ddeefb6f1f8b78a1
+EBUILD flow-pomodoro-1.2.0-r1.ebuild 609 BLAKE2B f7b94f1b39e31f6239eb09440dd6a224bce9555ea57f52d0c9059f2be6b9fbbb957a475752480d5f7b29bb219c595ad8939c3ef0275316f9db293f72a1bc223b SHA512 707f974e6380e8a5e17359f2a91641342f0d09ceb5ceeeb9771927e4f93ca576348931fc4960e403bfaae0543cee62c74aa6fc7e46f3503de51902d3d6166aa5
 MISC metadata.xml 255 BLAKE2B 5c67c73b2cd0f3e2c0018103d3b5102c4cabdc35284f694385460e3b6ee7e2a1b9697b1e43e09ef601a14990fae3fd011314f5260a50398c9d878adf2adfab4f SHA512 e132f603e6f94db054583ec2884465f2bc459af138fb1263e49f454166ea4bb750c2c4591e0ed8c385382dbfc5f246316c3b2995aebe094131103cac53046b3b
diff --git a/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch
new file mode 100644
index 000000000000..05ff231d9ea7
--- /dev/null
+++ b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-qt-5.12.patch
@@ -0,0 +1,33 @@
+From 53dfa7dd18290225a62b1cfd10b5566ab90a3fe8 Mon Sep 17 00:00:00 2001
+From: Sergio Martins <iamsergio@gmail.com>
+Date: Fri, 17 Aug 2018 16:22:04 +0100
+Subject: [PATCH] Fix popups with Qt 5.12 (QTBUG-70031)
+
+---
+ src/qml/ChoicePopup.qml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qml/ChoicePopup.qml b/src/qml/ChoicePopup.qml
+index b66359d..6418b54 100644
+--- a/src/qml/ChoicePopup.qml
++++ b/src/qml/ChoicePopup.qml
+@@ -92,7 +92,7 @@ Item {
+                 radius: 2 * _controller.dpiFactor
+ 
+                 Column {
+-                    id: column
++                    id: column1
+                     anchors.fill: parent
+ 
+                     Rectangle {
+@@ -136,8 +136,8 @@ Item {
+                         model: root.model
+                         Choice {
+                             objectName: "taskMenuChoice"
+-                            anchors.left: column.left
+-                            anchors.right: column.right
++                            anchors.left: column1.left
++                            anchors.right: column1.right
+                             topLineVisible: index > 0
+                             height: root.delegateHeight
+                             fontAwesomeIconCode: iconRole
diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
index daa67bf4bb7f..4285248dec78 100644
--- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -14,11 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtquickcontrols-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=dev-qt/qtwidgets-5.6:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.12.patch" )
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index c37ed2bb16d6..4b670f438deb 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,4 +1,4 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 972 BLAKE2B 528745f59870ff84346961d1e654df26eac57a0d8e6d8817b2d2e1a820a90ca3304002d95472e4cf914de5858902b0b7ac36665f72d784ddeb9842c31e5869dd SHA512 5ee946cd562ec403ae3dd25a76fa214bf154ec022b4cf18528ae9596ba41760c665bef265651cc097b8057bfd778482a6c2e86ce3063e5db4d2e075c01be9f0d
+EBUILD gccmakedep-1.0.3-r1.ebuild 971 BLAKE2B 165d1e4122b98b3a8e8ececcf30531da872ebc0f15c7654a2fda6172e1fa65b1ef3ea754ea5b279af870b53cf22d07ed1cf25962fa919191d36d47db5f326103 SHA512 fe274aeb8f04771b0d47a81ca7f6078ad078e0d5bdb8cef1812ba77521cb2a22ed79362365cd3703faa80566c16789df69dd69c6187e8d9aa094cc8af2bd4aae
 EBUILD gccmakedep-9999.ebuild 981 BLAKE2B 1c9d4d14d895ae8a517287549614e2379c988dc7aaa774ecbeb4cf32cfb8cb6f755205bc4d49bc3a7e14cbfa99aec9eedb6c69c49d20bc7a5cbe689fb4c2533c SHA512 3c02e522de69e27289f47f313dd19d401a33ddea4c70cba4ecb3bf23e32d05c5da49ee9127a76047cae6639924cb49dea20892e47b3f732896ce8c02db1f6763
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 8f993fc10cf8..6e6e5f1c58d7 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 7e5743ca8fa8..b4ee2ab8d1e6 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.8.ebuild 485 BLAKE2B ab9a0d08589a10d0123a3d5beeeb82575078850ecd35164ba4b6a090d2d84b47f295fc6da48e00ef9bf5b1cdfcd999a6b6268108b78df05231be64c474a5c35f SHA512 887073fbc522e06e446b4e987ed55162f2146959dd83f75dc82725c6fda179e717dfb36ebdd92545759a852ba58bd37b25fc2f2ea59836d198a1335353379adf
+EBUILD imake-1.0.8.ebuild 484 BLAKE2B d221f406577088ae2b014c61b972c4a12ef2bcb78af7bd90623eeb189aa144534cdb99273ccc0d20f3153d6a676389c8153c5554bebe2f8d10701600e3f51fb7 SHA512 9c728439da7a5ae5582a9688cb972648861e91a8a1d783fc59dc369e0a8d3caed52d5818d8b03bd51bf944bdfb442a077ce81fdef16eec5202a46a97681745de
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index dfa4ff1d736c..3114c42dca1d 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/lineak-defaultplugin/Manifest b/x11-misc/lineak-defaultplugin/Manifest
index 62c39cfad01f..d99ee10db282 100644
--- a/x11-misc/lineak-defaultplugin/Manifest
+++ b/x11-misc/lineak-defaultplugin/Manifest
@@ -2,4 +2,5 @@ AUX lineak-defaultplugin-0.9.0-gcc43.patch 242 BLAKE2B f630601afabd50b5d2da06660
 AUX lineak-defaultplugin-0.9.0-gcc47.patch 274 BLAKE2B d3446b668eed70721e87b43c0b10217e4d2520ae8b910df0086c93b5d8020fecc76d79164ec9567a61ae1e76362213aedcd6ca2069c5dfd1c5bb449a7f095d66 SHA512 1644ec0fe4c3546f427381359d65f25e1e6ad036b99d6909ac4cde11e95d4c97ded30109c751a652905e2f7299605ddcff29779e22f8b2b541fde1d7f9688cc0
 DIST lineak-defaultplugin-0.9.tar.gz 840704 BLAKE2B 37b060ea5b026b1a06992b7986a56a942d1d468d85e82444a4bb1a273e656ff80fddfbf4d53c6d3eddde9bf268f413dc0ce3eaa7a44a62534f533a286e67cf22 SHA512 f110eb42f8711b9fbd38652462d9b44f6f6851c4dc5cdb466b63bd09b8d3320e35d7de82626f2c9409bbf0f96d4f1e4ab2e9a82932452e50b403d343fca1ce4b
 EBUILD lineak-defaultplugin-0.9.0-r1.ebuild 854 BLAKE2B b22ef55d67d0a96d306b47ccdd324db2e6c0c2680d6e216e453f604a8d5512d8e95bc7d67d12f19273fe0cd4e35c4d64ee3f8c4314ec34899f6a85bd271f7ed3 SHA512 2427e1ecd75011f2c3a408f5f19eac5f928c3c031a2d431a407841fd4ddd91889eed891e914f8a048d6dc430f03bbb6dcda08c2926590ab3e83f75d7d919278e
+EBUILD lineak-defaultplugin-0.9.0-r2.ebuild 823 BLAKE2B d82c8f8893d9c850e68e15e222a0b2c8a39d4916b9ad0c16a1dfd88cf55742a02d79092493670b83662bd5119abf8f64d69577377a3451c2a25f032b095a9e1c SHA512 878083cbbe9e615284cea70146fe948bb412cbadbbe99d2cdfd1335b8db364b5de861d281deda7fa13434df46d36a6c63b4a80e9fded218525651f8abd5f9b45
 MISC metadata.xml 362 BLAKE2B 44ba7b6226e667f7980e291c2d547eecafa1cb02386e46980327c416c6b1139619bbb7dfeda83b2cc7761022ccf0b1fdd55cb75aa9ec5db614267c1b99d826db SHA512 a33c009438013270e90019cafb29f493fc54c64afe810c873f6c1767b543f08cc741a3d6ed83833ead57d8dbb2ea8b78188c4f5d0962709b8625bb053c19be82
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..16aac45e5d34
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Mute/unmute and other macros for LINEAK"
+HOMEPAGE="http://lineak.sourceforge.net"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	=x11-misc/lineakd-${PV}*
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+S=${WORKDIR}/${MY_P}
+DOCS=(
+	AUTHORS README
+)
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' default_plugin/Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \
+		USER_LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-misc/lineak-xosdplugin/Manifest b/x11-misc/lineak-xosdplugin/Manifest
index 93556dd3f1f5..f2bc4c6f5f3a 100644
--- a/x11-misc/lineak-xosdplugin/Manifest
+++ b/x11-misc/lineak-xosdplugin/Manifest
@@ -1,5 +1,5 @@
 AUX lineak-xosdplugin-0.9.0-gcc43.patch 260 BLAKE2B 388a7c6e3e89ec3d4ab779127df0a3f83dae83dda8ac60889a8a29189e82e6b41f9c324f076cd3df8da5e22bcba97e92aa7df4ad46dc4c44fe6c665fd7746435 SHA512 3f4d9c929ba3bc1c831bbea2fefa78229e73f9d2f863bbe0e0695eeff84eac6d5d162c6ad4fbf608811c169ec8e75c811623858196c907a59a652498f5cc9fae
 DIST lineak-xosdplugin-0.9.tar.gz 802367 BLAKE2B 76e9f0fd088a1323eb72deca02aa325a908b4308f2d76e10e33c57af7dc41823a6b5572ef861ba337af9b76d07d650b31539aba7d0a4815b19d2abba3ad0cf7c SHA512 5f38616a770dea9336e1af93c209ab1c5232d783e301d949e54ca44dc5b9dc462e8fad6448c6ffbb81d6494f5da91f507da2ed3835e62ecb6ef794f68b5f8009
 EBUILD lineak-xosdplugin-0.9.0-r1.ebuild 754 BLAKE2B 2cf92b49777f7a9f4fa86faaafb4449eafa7024dd91a031c35722992f373d06f8e062abcdf67555fd5e3fd7e29be06792648cd6ae140aa73f752a2551cbd47cf SHA512 9eada73f60942e9b8e5d29987e4f180b8623e6f7f70e86a7cc524cb6f71e46829141cbd326f4b229f8f144e51f0471340d2aa8e2240a016ffefbbc88da9b2d5c
-EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 719 BLAKE2B 0e7be4ed4e0abf92018140c826030e55e2dfccfe9af52412dbede36f888a8ef2d6b1176746a5ea294496a63bcf767b1f47ba345f6cedf62d68d48719cdb29cff SHA512 df6a3352bb2825752d7480010f65b27d2fe6a1b374423761d9e305e90daba61cd4ff680ae5a70f95995ff7488c6b60b3e554f4bd2fd2797406a473cc7c148443
+EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 792 BLAKE2B bd80b6ea6e8249252879a6d78605104cadbf8101364bbd848c7744858b4ad46b5ce50ae80ded8ec84e59e47d92a1ab416e8323a66443746f3d2c382f28a26052 SHA512 3b3b22079966e527f7cb96294469916954db85fadb0491acc185ddcd724469b6b635fdeb49a0e374e339317392e3305a5587110ba5540e7a91a2ae98d6993974
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
index aea5af6276d8..78d709a75198 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -29,7 +29,10 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable debug) --with-x
+	econf \
+		$(use_enable debug) \
+		--with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \
+		--with-x
 }
 
 src_compile() {
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 43e43066de49..9855dec43040 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,3 +1,5 @@
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
+DIST mozo-1.22.1.tar.xz 171976 BLAKE2B c4a1166b605d3fed68b71987dbf70b7f908aabc2c7266415b0d7ce4c8ccb93ad690c72ce83a708f9d3518cfba66128d2cd4bc5413432133299595cf4d2c5a43c SHA512 6cd4ed04d43ae064077fc78ed59644bf6efe4c65c26995742166c57333d470fbe95ca4f4037e786f16dc076e75d938868948e8c2e5c662f35d971b36992f1a9b
 EBUILD mozo-1.22.0.ebuild 1244 BLAKE2B ae23b51bacfed9815d26460f2c7c0242f4a3eb7c28d64e4fc53a73270268ffc684f02857fade291e1cbb808f8358516327b3ec1bfbf4fa7772f4339fc91d8cb2 SHA512 fa4dc0fb9fef1d17abe494d869739f0c80217dfdd7e12acfb312a6ea3ba1598526d9f2e4243367a913a03a8767c8a9d97be0bdc679c5a6503704b2636a3b7da1
+EBUILD mozo-1.22.1.ebuild 1246 BLAKE2B 592a0aefefe293aac4f5939dbd2273905ede3fcd2710b707da5951a91f0e3e172fa3e38ff1b718c27e07d0a7476a4b4c9d6dbaa2e9edfc1c8711d43f7d7b33d4 SHA512 a6a3d232d8ac51fe27eb3d399556831bd4cf40f339b3205ae063339c96ec3f5cec35d1255793b9c50890caef875ab696f2e46be8f97f534c0203c3cb926c7ec1
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.22.1.ebuild b/x11-misc/mozo/mozo-1.22.1.ebuild
new file mode 100644
index 000000000000..9c950c49491a
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.22.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.21.0[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	virtual/libintl
+	!!x11-misc/mate-menu-editor"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 2790f942902e..0ffbdf31032e 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.13.0.tar.xz 104864 BLAKE2B 47e24ccb415bea27db9cb5f0ccd1ce6aebedc2f7140572939e533c3da9aca6aca29227a5be7954944ed82483b4420501adf22152628e3d44a206d4f9d5250412 SHA512 7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089
 DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
 EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1064 BLAKE2B 2281e8f6f34669d2069a36a1a73a9246d1bcd6aa45e9f5f03d2b4f8f661b94975ce446e8d71c8f1384f5ec76d1e6a0a1bc28cabda36275c6ffb98b5563adb12a SHA512 8b27f29933e62f1f0545509924d2deff9712f9975ffcfed25e3d8fe345530bb3746d0df1eb243677ba826d32c1728275052743a152b7ab58bc6715b95fae2964
-EBUILD pcmanfm-qt-0.14.1-r1.ebuild 941 BLAKE2B de66df3a642130cb6abffc94aee48ba8d3b3da5b90d69c496198ff2d6e3e1d4e74e83191502b8df66a876e6241d6603515495b03fb960c38a59d95aa356148fc SHA512 8be6893ce5c83772abd80575028d16d3819cf00a46ef96e4cab65baba40a8b7378bb77758c006d379126be701290135fcf6f40d2397c8b19fb95e655bda8aaa8
+EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1143 BLAKE2B d16f8228d3b317e67b68786220f4ec2e7680170de6e703e50b0c174511bdb04bc569a63d628ecfc096007ca3b15e3f44c9cfd17dbe74e988cdb08e6a2a62e1fb SHA512 fcde9f4053727b670cd68b17dfb3761d15c9910994e88b128dbd1882b204b777905cc46486ccd113e6a844a3ce9531d76984ceb6737a449d8fc57c0cc51cc3fe
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index 1c2abbd2c9bd..e8f40638bef8 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -42,6 +42,13 @@ RDEPEND="${DEPEND}
 
 pkg_postinst() {
 	xdg_desktop_database_update
+
+	if ! has_version lxqt-base/lxqt-meta && ! has_version gnome-base/gvfs; then
+		elog
+		elog "To make use of the 'trash' functionality, please install"
+		elog "the 'gnome-base/gvfs' package."
+		elog
+	fi
 }
 
 pkg_postrm() {
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 1d21a42f25e5..7883233adb50 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,7 +1,9 @@
 AUX pcmanfm-1.2.5-CVE-2017-8934.patch 1451 BLAKE2B 77c6fa0dea7f2a82e3aa4ecf91050852010630e43245f2838538778020a2bfac20a1ab85022337eaa4c3df53b7fc7d833578a09d059638946abee65cba7a49c2 SHA512 1ae582c72dbf4e57cda84df07348414567ed4c4f39b3b6df96a4732b926c502735bfc2c6c62e6e987efd63d21526cb63eb4665d00f0eb7338acd8de1684c36b4
 DIST pcmanfm-1.2.3.tar.xz 406756 BLAKE2B e8f4c166559266b4628f5fda4b7595ea8a28e37aa71cc3ec957ff04af8c919a248da5b189eb52040f2d049f633313cf9386c77b331b8e491ed4b3a69615c5010 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
 DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac2d449064ed3ae74740f8e6981ae129cdfe123b63e57e2a22769273348df1a48def61eeb6a72a5918fdad2847c SHA512 ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3
+DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
 EBUILD pcmanfm-1.2.3.ebuild 1525 BLAKE2B 91dd715d6cad05ca36b3e867d9a206e74f92f20ae2e7077e4af5773634019e0f7200f480bb211cbb0737c594258d8ae73c940fbef97385750113023fb8fe73fa SHA512 b226940a0ddc5968ff2db4ef462e745c9110a6b775d12cc299e3af88353272b8736712b8151c4a2532eefe2d0190d289677bfb0fc85bba6722147d7de9c01c00
 EBUILD pcmanfm-1.2.5.ebuild 1627 BLAKE2B d7092670f43bbe87a423bb5f1492676a09938dd695b0bc48b3adf30d39d309a851f462fb5231f0820ab27cf056df23e07bb72e067f43ab25ebb74b151863e139 SHA512 4bb01a683c3820e1a0d6c8d330e4f02d0ac588f0ad69cb3e96257906aecc4dd87eadf50b75b9c716bd0ab12778eafd64d3efcae379587102c0a385b3b06fca48
+EBUILD pcmanfm-1.3.1.ebuild 1569 BLAKE2B 52397fc6da7dc3afc8addaa8a50597f7aeb445f733f3a6260f06077a3f46c52b45a881149d48171f71e47b58f97901f6a2b87e567081c20cfd51a606311db0ce SHA512 7754b4a340c959579be9a2fc11ac540ee34eedc150f24f81b8ea3b5f06b83e2433c20f91c6b396e0902d35cd587a1b1e005d2ee3438d1d2d396e2fb66dd37e39
 EBUILD pcmanfm-9999.ebuild 1764 BLAKE2B 7886b9c70db89b2d86b2f18b0981fc7fc90e1e4feb23c9551b2a81bf6be0d0bff74026d04174bf507d43e5eacc7df16616bf63d17e8cf194823ccdd560e107c3 SHA512 010cf7f72a855c3cfd8486eb5a7f3f56c90856f204ded84dfc30c5d95972a952e2027469880e39435f0fa08851aae3dfe45ce38e46849d810db238ae9f52d8a0
 MISC metadata.xml 338 BLAKE2B 67489af9d290abeb2c77c1f87dd427ad7bed67ddbc6fd6f60d051ef6d76f6b156a01749c6a3a7c50c5c388f46e1e4fb796d27b4814eec44c23d6c72c79ac7fb4 SHA512 545f77be5c130d6853004c6a263611b821b6f79a937625475670eefbcf7de83aa15bcd0ec26fa6084bf1cf5e19c81c580f9f8258b63967877f6a2600df679140
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
new file mode 100644
index 000000000000..dfb4fe9d202b
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
+is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
+te th tr tt_RU ug uk vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit eutils xdg-utils l10n readme.gentoo-r1
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	x11-misc/shared-mime-info
+	>=x11-libs/libfm-${PV}:=[gtk(+)]
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index b73579bbab26..641e88dbffb9 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,6 +1,8 @@
 DIST vym-2.6.11.tar.bz2 6769869 BLAKE2B a528bb84275800f2aefc8a67b03d7b5dcdfab7e8f0f64f42bba46cda8c9dfad6e16aaeecf778b8bbbd99aac5d28bcbe2ff1c3546806395bbaf40f659e42cd31f SHA512 d6ae8346152ab10e12a68f25b4c13c4d40e1a8471df348ba0df9c05bdbe60f86a97912fcca268ec510246fe655a7dcc2d2e9a9332daee09a2a7dda7d6f880aa1
 DIST vym-2.7.0.tar.bz2 6776315 BLAKE2B 1b25f1fc6b08f9582c2df716db9f9361d89cbe1d96862595eda59708bebc08db1d28755516e4096b63427cd069c59c3542d58c6572ac723a97081033b5e97eaf SHA512 4da1ce7f62e29dca798646a114544b5b4b2d42b0b030113eb231c5cb0d8c990c78fcfb78bd47ce1f3efb43647fa8033d1d8eb87907f6c7f486b4dea552e345e8
+DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
 EBUILD vym-2.6.11.ebuild 1409 BLAKE2B 0603472bb4ae494911dd38511e59e41104abd92b99efaffddff178e5a5b6d7ab5d1d0f31f5d2ade4535221227b2807e411b05e630b8983b8d3284a2ccece6af2 SHA512 de7db950fdde7195193a1be7808caa1d3dd0ca33d66e66c3a388af5096d0527472db5b745c8069b42969f53a3677c451f3eba0579d1306221539b276633967b7
 EBUILD vym-2.7.0.ebuild 1404 BLAKE2B 7a59a7574a500296fdc3ced293d086aa673c0d6640f23242d6fade6d3bbc24ceb0a57b29617dd5a3260af9023c6b695e90932b70d278bffa05c88c584a473944 SHA512 7949993038fd707ce724e5a63e4f4405f20e4ef5b6fa8a4906da67a1ee163ecfaaee1ccdf654e2820739c367ca251b45dd6d4a5fa3828f2beb241198882ce54d
+EBUILD vym-2.7.1.ebuild 1411 BLAKE2B c21f2b833eb6eae27cbb154246189d14f32c4aac7a8996d01e5c0039c76d44b53701c40111e676b1f467644fcd00f27dd394b0ae49aa1a1efaf663d21de78dae SHA512 d8bd941230f65f6cba40baec9c1b68dffe58367a5f060657ffcd6e3fa3ec2dd723db9ba7f1cda8ba25192f9fc1e15e71022e6cee6ba0b323ad86a4b01e46fa5f
 EBUILD vym-9999.ebuild 1389 BLAKE2B acc59d6a479129646d31b4e9693ca90a2317ddef792c5a76af2399090e30a69fcb6c09788b3d53b2b6b599192996ca8738433aba0488df32edf6ef7507660181 SHA512 421995c8d0379b65330a6d1e52c57322632bf883e8d628b9ddc60767385e158619f187ba9860a2bb405e297b7cbf67f8330bbfd2dc4f9a88a3494e67f44e6c60
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
new file mode 100644
index 000000000000..7dd60221c778
--- /dev/null
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW"
+inherit desktop l10n qmake-utils
+
+DESCRIPTION="View Your Mind, a mindmap tool"
+HOMEPAGE="https://www.insilmaril.de/vym/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+DOCS=( README.md doc/vym.pdf )
+
+src_prepare() {
+	default
+
+	if has es ${LINGUAS-es} ; then
+		DOCS+=( doc/vym_es.pdf )
+	fi
+	if has fr ${LINGUAS-fr} ; then
+		DOCS+=( doc/vym_fr.pdf )
+	fi
+
+	remove_locale() {
+		sed -i \
+			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
+			vym.pro || die
+	}
+
+	gunzip doc/vym.1.gz || die
+
+	#remove dead en translation
+	rm lang/vym.en.ts || die
+	remove_locale en
+
+	l10n_find_plocales_changes lang ${PN}. .ts
+	l10n_for_each_disabled_locale_do remove_locale
+
+	"$(qt5_get_bindir)"/lrelease vym.pro || die
+}
+
+src_configure() {
+	eqmake5 vym.pro \
+		PREFIX="${EPREFIX}"/usr \
+		DATADIR="${EPREFIX}"/usr/share \
+		$(usex dbus "" NO_DBUS=1 )
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	doman doc/vym.1
+
+	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
+}
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 3cf5ecba4104..2fa47a46e4fa 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,9 +1,12 @@
-AUX wbar-2.3.3-cfg.patch 291 BLAKE2B 43ac39f4b989398fcdd03cc868905f0c1b1bd90572fe35ed0d02b629a21e2d9232bb3f9973a8bf243afad2898b0f270345a714a492527f30198b950218099bda SHA512 e37e7a192d738defe1d47f5e47dff27761272a1f0dc0866f358777a28dc509d2aba2794b432101bd0a0b3bb198901c09618c2fe251d8e73d3dc79737443fdb7e
-AUX wbar-2.3.3-desktopfile.patch 2416 BLAKE2B 8e57c5abb97e7b160f33657635f4c4b219a7c521fe5a3695b25c9cdb9c009d5d6dccd1400274de25a56b76b44b87f4460ce1a69583a02cb20c1e50542405e995 SHA512 12a1ffc38196fe6bfe32320e42781f1db1ef742cc58474d784033fb9678da91bf00e0c7efbcfe9acedef511c51ca70a2be5746ba7824a652e4b68f731dadde03
-AUX wbar-2.3.3-nowerror.patch 282 BLAKE2B 2384a214b71e5bb76dae52db90fe21b73615a0c26c28f4dde6d6e2ee8da34c00ef323e8c11bb4d53d06098dc98eeab6bcf38eb9afe90b8d4dc7a997330a7609d SHA512 38de89325a8c028e25f91e30e585c04e6be7affbde2c37723c384fc9e1477dc46c1853bf127c94c4c90dd22661b5a9bcf210ea63770e868cb8658faa4fc26946
-AUX wbar-2.3.3-test.patch 247 BLAKE2B 01cee8fa798b961251c233bb2e2c445daf2907fbb44738368a81487240cedb76233c4b3ad8dce18bdc9bf3f6bb6949540e57719d08571ee7a06c6a8d3e057806 SHA512 da5425b8d3a618fae397c453903add62918352a329656610cd4f49b1e8372d79c99f9fb58f715a020fefb23b61cac8108f765a6d58945064a2e91e1a3a50dfd2
+AUX wbar-2.3.3-cfg.patch 176 BLAKE2B ce95f2eb9787e5f342cbdf7a943612cc066ba09038efd15f7c60258c59dfafd5377c9706c5db8690af69dda555333d54ae176368934062787dd1114d00a1ce5c SHA512 2c5035c41130eade51e90b36588915ea46201678f46ef580f61a33cde2aaadc640cd1626ef3aba4695f43f13f304e5d2e9fedee1c69f07d2bb49655edecd4c71
+AUX wbar-2.3.3-desktopfile.patch 1797 BLAKE2B bf87427e36821aadce543fef960ed235530bbd92ebfc12e1e158102ea3b7a76d7acc2bb20d9d6433babcda3ca15aa8dfca2b7cbfc15b45b5e956550374c3a18e SHA512 16689b27fd2d810d67afca43552822b1a4a70b75b1703e983f767bb7f3a4acb1a4782cb44d56c5ce128fce15589da721083f254732ba702fe5ed4ed813bbbfbf
+AUX wbar-2.3.3-nowerror.patch 181 BLAKE2B b014234207a378f516e738ed14808860b8b2fd426a86e466fd06383ca3e5e1ab8b538864929204fa8d5cc4b525539a018a31cf392075bbe4afb911ba7de023a5 SHA512 6dc28969c9e7be4f9e5e72362f4312882d3aecf2a878a9b1c45f018f1f7707d7b714a5e5b9c1199123fe9295e7c4780068570489b5d3185c8374d8c3b6b0ad28
+AUX wbar-2.3.3-test.patch 145 BLAKE2B 8fd715fabb88ae0e2295d4c38d7e8803cae1631df0838a0e06be82293c1b9cbf4e38360036dd33fec7217658d938cd2a35afcbc535ddabe267b68646ac67af94 SHA512 507b47f25fb13658b677572ebcc995be36a510a7e380d73d6a4ae4f3b74a3564b510b79edf9cedb21a4206053f9f212740fdaf4152ccd4adcf6750620cb21c39
 AUX wbar-2.3.4-automake-1.13.patch 238 BLAKE2B 7c8521e72ee19e5e236266608c29942d69fefb35324a62c5f160d11cffd9ab891ce9c95c36a212f645e8e773c7f3aef4ba9864d46b59c076828bbeeb1b69c053 SHA512 62f3c1266a715b3b4368002a4658a2d010b24a6bd2251ab13b8b665370c7e8584a3b10904687d272628cba97785c2bcd0a6bacd643f712cb3e6c9ec940b99f67
+AUX wbar-2.3.4-c++11.patch 1559 BLAKE2B 9b0233ccd33621043504e456307815f2647dc67fbdf20b721bebb5a89777e3cd9b297afba0b7209bce0d432aa19359b0894f3bf5ad4b64b311ed2544c8e6b349 SHA512 cb912821849a04e934832cad49689d3bce544be72c55d96f60da8a59a23a100942414519f1471d8ab68b8a2ec97cd73c48920894aff49afa19bafad477240c12
 AUX wbar-2.3.4-completion.patch 283 BLAKE2B aecc682099788283e42208edd5b4860c8e4be06d9a5776d39086ef7802532d3c77adaf65dbb2eb597d9e9deffb40a41bf8ca2e406973d2316810394b0bd34605 SHA512 dadc31f136b2e85efd19a25698499810de0d6e9dde873d89c50a18e84f4b158f3570c63885270b09541eb89574375ed2c6e630b28b627b5383f23bab5f94d1eb
+AUX wbar-2.3.4-gtk.patch 677 BLAKE2B 6ed51fda1f98b07f5f86acd8a10ce00d4f330210e7ac4aaf1ac5e388dcc1213bfb8f5be6d78eb0d85115ba05dc125f34f1992b46a69ea755dd803c5ae4ab1136 SHA512 f8a0c29e9e4536d9fe60ff350fff73f362e109e04f205cf33383ef4c461102f844c5e43b336fef7631e727c286321c6130d297b40af85b79ea1229286463ed25
 DIST wbar-2.3.4.tgz 189999 BLAKE2B 6c06ae634f276efea336568f38220e40073f6525eb942f9825629fcccf763e119955507e7fb6f12f5501e9072e6b2bf3ba8ac58505ecf8fceb0ef6c4095c6ec2 SHA512 07f3484bd071761d57ef1172c56b30980eef9ce2ee65d1fc21ea20c631a1da1d88c1b8a9e1a1fca0e5f18e7bf1c5697c349a543d72966ce71ff53d7e921147b3
 EBUILD wbar-2.3.4-r2.ebuild 1248 BLAKE2B 9c9eecdb315184d1ffb1e528cac20d24f04c5b8f87ec53c7abe2e6bdfab4166d68e45982d547555491dfabb336b659c5c75475e608999a75bfcc3a7c5af91ac2 SHA512 2bbf0e8c6233e724da9820ad2b4ce8f86f7431b5ca25a8dba4f47ec9bfb5c7b49a0de483901f37fcc4f5e0d30ec365cd03cdcf61da68a0a0031f8a7d7b3b2137
+EBUILD wbar-2.3.4-r3.ebuild 1133 BLAKE2B d9aef4b0947c12d7390ef7cd0a17830771cc054b01ab724e28d6561745c22f35093d413fcdb9ea48ed36d379b8a0aaca6f9be28953d403df916053ff14a8faff SHA512 8a5b2811b68acab0de6293beaf0fe150fe2aa83cb4c18f911502d814b2b835c5ad0971a20027e10208e523bccfff0aa13aa3b94d4f33a61a13668610c0a5b730
 MISC metadata.xml 481 BLAKE2B 6161d8af7bc35f0e741236c79cc71813e7a308d71db65022a1dd35e69f32b70627eee0a2c61f43cbcada132bf19202d299d8a31d9300a02713f40375aa6b7932 SHA512 05a8903618ab4022768e4eec18f1e89a64a99049b135565bfe921d376ba24c1b6081e6afc50cca90109050364c79e09050372a478c2ac1e200fce0c8216b357b
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
index 5ffd82869983..5d64909d28b2 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Sep 21 21:45:22 UTC 2012
-Subject: remove wbar-config for -gtk
-
 --- a/etc/wbar.cfg.in
 +++ b/etc/wbar.cfg.in
 @@ -2,8 +2,3 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
index 79a5de15629d..d2032dfa79f6 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
@@ -1,10 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date:   Fri Sep 21 17:08:32 2012 +0200
-
-	fix desktop file destination and QA issues
-
-diff --git a/configure.ac b/configure.ac
-index 00ad0b6..48fe73d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
@@ -15,8 +8,6 @@ index 00ad0b6..48fe73d 100644
  etc/Makefile \
  etc/wbar.cfg \
  etc/wbar.desktop.in \
-diff --git a/etc/Makefile.am b/etc/Makefile.am
-index ec41c76..d78525e 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
 @@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
@@ -28,8 +19,6 @@ index ec41c76..d78525e 100644
  autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
  
  bashcompletiondir = /etc/bash_completion.d
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index ddf920c..16ee6dd 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
@@ -37,16 +26,12 @@ index ddf920c..16ee6dd 100644
  share/wbar.glade
  src/config/Functions.cc
  src/config/Functions.h
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 327f139..27a8f48 100644
 --- a/po/POTFILES.skip
 +++ b/po/POTFILES.skip
 @@ -1,2 +1,3 @@
  etc/wbar.desktop.in.in
 +share/wbar.desktop.in.in
  
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 87c736b..66027d4 100644
 --- a/share/Makefile.am
 +++ b/share/Makefile.am
 @@ -1,8 +1,17 @@
@@ -69,9 +54,6 @@ index 87c736b..66027d4 100644
 +$(wbardesktop) \
 +$(wbardesktop:.desktop.in.in=.desktop.in)
  
-diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in
-new file mode 100644
-index 0000000..48fc33c
 --- /dev/null
 +++ b/share/wbar.desktop.in.in
 @@ -0,0 +1,12 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
index 2cf163bc4642..32c341b26e0f 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug 26 17:18:37 UTC 2012
-Subject: remove Werror
-
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -8,7 +8,6 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch
index 4468791a4202..fc2cb7c5498c 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-test.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch
@@ -1,7 +1,3 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Sep 21 21:50:34 UTC 2012
-Subject: fix test phase
-
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
diff --git a/x11-misc/wbar/files/wbar-2.3.4-c++11.patch b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
new file mode 100644
index 000000000000..fead9e9b4cb3
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
@@ -0,0 +1,54 @@
+--- a/src/config/Functions.cc
++++ b/src/config/Functions.cc
+@@ -11,7 +11,7 @@
+ #include "Run.h"
+ #include "OptParser.h"
+ 
+-#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png"
++#define ICON_DEFAULT PIXMAPDIR "/" PACKAGE_NAME ".png"
+ 
+ static const gchar *authors[] =
+ {
+@@ -304,7 +304,7 @@
+         
+         if (command.empty())
+         {
+-            command = PACKAGE_NAME" "DEFAULT_ARGV;
++            command = PACKAGE_NAME " " DEFAULT_ARGV;
+         }
+ 
+         if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
+--- a/src/config/Run.cc
++++ b/src/config/Run.cc
+@@ -125,9 +125,9 @@
+ 
+ bool Run::start(std::string command)
+ {
+-    if (system ((PACKAGE_NAME" " + command + " &").c_str()) != 0)
++    if (system ((PACKAGE_NAME " " + command + " &").c_str()) != 0)
+     {
+-        std::cout << _("Error run program: ") << PACKAGE_NAME" " + command << std::endl;
++        std::cout << _("Error run program: ") << PACKAGE_NAME " " + command << std::endl;
+     }
+     return Run::getPID() > 0;
+ }
+@@ -136,7 +136,7 @@
+ {
+     if (Run::getPID() > 0)
+     {
+-        if (system ("killall "PACKAGE_NAME) != 0)
++        if (system ("killall " PACKAGE_NAME) != 0)
+         {
+             std::cout << _("Error kill program: ") << PACKAGE_NAME << std::endl;
+         }
+--- a/src/core/Main.cc
++++ b/src/core/Main.cc
+@@ -81,7 +81,7 @@
+ 
+         if (command.empty())
+         {
+-            command = PACKAGE_NAME" "DEFAULT_ARGV;
++            command = PACKAGE_NAME " " DEFAULT_ARGV;
+         }
+ 
+         if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
diff --git a/x11-misc/wbar/files/wbar-2.3.4-gtk.patch b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
new file mode 100644
index 000000000000..76f2b902759f
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,6 @@
+ AC_DEFINE_UNQUOTED(DEFAULT_ARGV, "$DEFAULT_ARGV" , [ The default argv ])
+ 
+ AC_PROG_INTLTOOL()
+-AM_GLIB_GNU_GETTEXT
+ PKG_PROG_PKG_CONFIG
+ 
+ PKG_CHECK_MODULES(modules, [imlib2 x11])
+--- a/etc/wbar.cfg.in
++++ b/etc/wbar.cfg.in
+@@ -2,8 +2,3 @@
+ c: @PACKAGE_NAME@ @DEFAULT_ARGV@
+ t: none
+ 
+-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
+-c: wbar-config
+-t: Config
+-
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -51,7 +51,7 @@
+ $(top_srcdir)/src/utils/i18n.h
+ 
+ wbar_CXXFLAGS = @modules_CFLAGS@
+-wbar_LDADD = @modules_LIBS@ @INTLLIBS@
++wbar_LDADD = @modules_LIBS@ 
+ 
+ if WBAR_CONFIG
+ wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
new file mode 100644
index 000000000000..f46e060720dc
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A fast, lightweight quick launch bar"
+HOMEPAGE="https://github.com/rodolf0/wbar"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk"
+RDEPEND="
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	gtk? (
+		dev-libs/glib
+		gnome-base/libglade
+		media-libs/freetype:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch
+	"${FILESDIR}"/${PN}-2.3.3-nowerror.patch
+	"${FILESDIR}"/${PN}-2.3.3-test.patch
+	"${FILESDIR}"/${PN}-2.3.4-automake-1.13.patch
+	"${FILESDIR}"/${PN}-2.3.4-c++11.patch
+	"${FILESDIR}"/${PN}-2.3.4-completion.patch
+)
+
+src_prepare() {
+	default
+
+	use gtk || eapply "${FILESDIR}"/${PN}-2.3.4-gtk.patch
+
+	sed -i \
+		-e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
+		etc/Makefile.am || die #482358
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk wbar-config)
+}
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 2b1b70d1ad55..28912b5b2b86 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -4,6 +4,6 @@ AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29
 DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6
-EBUILD x11vnc-0.9.16-r1.ebuild 1897 BLAKE2B adc6b8bae11bc8158f8dc78939aad6f40a22142768c2aab3b714b21f1af7bda11266a0b27e3bbe88fe47eed29afebac9ce066c1694945a7417589a9704390193 SHA512 2a511b4eaf02b03d11c6cb47428bd69c12edcf11a3d1f3fd19a18310aef4fc4d21724e85037cc2f460a994c842350c517692b02bb28bf1c279c6f164df36eccb
+EBUILD x11vnc-0.9.16-r1.ebuild 1839 BLAKE2B d144f710a56ccd92f144315bb18217fbf3d9ff747abca835a52383fe2718c03aa25abddbb31b80b5bc9109794c7e8833602d04735f755820d44a62326e99066e SHA512 b33d6de82001218e7fa03edc3e98c66a2021fdc12ea4e3d00d446a1372629cecebc91ac695949e359e5087ee021fd48e081149098bb3bd8a896935fedc7b146d
 EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0
-MISC metadata.xml 790 BLAKE2B 90e23b3c192f477495a8189840b49f980b16c6dbd388dd51a43106034c0a74d77867d8a64f4fa60b4dc94368a03276fd6e0ada7d761bd8abd7e8b446caa1395b SHA512 9663dd9893db04ac99cb62de85803531fa350c112e7c5335ed1b7b9195c73811f8ed8ce418a13f119e0b3c50093aec48d363b1bf81e6f4c269dd362059742d74
+MISC metadata.xml 725 BLAKE2B dfdda6a6c38d7df5cf8da77b4b2ff64823f5d176711d163d3cb95e50eae631eff64098f774b3886fb1b8baebf16289d7d8958357cdd987ec697f8a915d3a6184 SHA512 07648db4c5c5198e76e08fb5de36424286eccf09e7dc685c61ef0f148c908864275611fbd339cf791551f13a3867f8196a2645ec23927a6f0afe8b4c0bda7e62
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 4ad5dbb6d54e..ff9539136145 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="xdamage">Enable support for the Xdamage library</flag>
 		<flag name="xfixes">Enable support for the Xfixes library</flag>
 		<flag name="xrandr">Enable support for the X xrandr extension</flag>
-		<flag name="xtrap">Enable support for the XTrap library</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">libvncserver</remote-id>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
index b34c657ccd34..b4e3e583f68f 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr xtrap zeroconf"
+IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
 	>=net-libs/libvncserver-0.9.8[ssl?]
@@ -28,7 +28,6 @@ COMMON_DEPEND="
 	xfixes? ( x11-libs/libXfixes )
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )
-	xtrap? ( x11-libs/libXTrap )
 	zeroconf? ( >=net-dns/avahi-0.6.4 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -64,7 +63,6 @@ src_configure() {
 		$(use_with xfixes) \
 		$(use_with xinerama) \
 		$(use_with xrandr) \
-		$(use_with xtrap) \
 		$(use_with zeroconf avahi)
 }
 
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index cd5b2afc8ab3..95c6d863e6b1 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,5 +1,7 @@
 DIST fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz 30667 BLAKE2B bb9b3d3fa2f40acf3248e5cdd91a82c3f736937c03451aba41280b25fc541a3db23c6a57f2ef97ac1ce415d289c0442a387462415827009c68f169f91da589e2 SHA512 d4571f3a64c1f532642f86d4de50d5807afb856179debab77e4495dc48060c68a635d38990d174fbb67169317d7107356344507285271b0bb058f056c1e39a37
 DIST xflux-gui-1.1.10.tar.gz 18828 BLAKE2B a249533ace4ff6293ff9b99a455943c1f099628bec97c2730473f8a9550ba38e78e775a10a0f77c160180f5f5d354ac8c8ac924c1a2eb9f48861491583c93285 SHA512 5e8057e47fe2cc8a59758e9ab6b3adc6a8281b42f6b517e3e1327e5470c82a326c853d5d389fd62f6d6c439be4ab70a6c8771ece87e5b8c90a33775f8b7cd54d
+DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
 EBUILD xflux-gui-1.1.10.ebuild 850 BLAKE2B dbffba8824bd5afb7a743b902fb549bf692285e1350f2b128fdc6cd9641c73ce5059842569d67d1feb99dda8554e911b76da48d21a30b292593296606416de97 SHA512 5333d53788145b32e13bdbf92ff52fb6e2cd1a3ee80d3a3450e8fd52ffced4380132dee758ea005ea57f71c76a01482902c7e9f6948316c46026e744b7495b7f
 EBUILD xflux-gui-1.1.10_p20180910.ebuild 845 BLAKE2B 6a78c9a48e26a5155dfacfddfd5ce804982d5e6cd3e9eaaefe565f828bb42794c91251be13fdfceecd5d69ae227619eeb58c1f285e5a3dbbea003a4fd814baec SHA512 5ae70a858c02e42be5e7ffb181e92c6ca997353958376e328eca6e38219c6511a353ffd3c7f7a9843ef5d18041fa93e69d2107955a48cca201fa26bb4ddfab24
+EBUILD xflux-gui-1.2.0.ebuild 740 BLAKE2B a347c5cb94da0f97adae63ae50bc903c99bba474364ab2bd0a3208c8a23abb9d67c1f7506146d3a0089656feae6e5bf96d6316820d0115b63243e17e28b1702e SHA512 204c588e6a0a53f5bf3b2ac80a56df556825f80ff3cb1e66d844eaf6d38bc37687a4c81f60e08e0460b2d11a348e5e7c8af69033a73f67b0ca2bd7daf89a6dd8
 MISC metadata.xml 856 BLAKE2B a9b5a2682ebacdebcceccafbacc98785964a37d32067bb358d01957fd62b57d2ea897d63abd7d7ab091aab2ea5baa401423656a038478610ea7425f74a09da35 SHA512 584c1896675cab40d1e0dee33deabda4b1cf951fbc4ff8e6c98b05334492db575effb91e801da76db2599f3860871e7150135b0596400484d4e7ad00d7abb82e
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild
new file mode 100644
index 000000000000..17a3f60962e4
--- /dev/null
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A GUI for f.lux"
+HOMEPAGE="https://justgetflux.com/"
+SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libappindicator:3
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/libXxf86vm
+	x11-misc/xflux
+"
+
+S="${WORKDIR}/fluxgui-${PV}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index f7e1b6aa314b..68552bf0f3c1 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,5 +1,7 @@
-AUX xfractint-20.04p09-ldflags.patch 1063 BLAKE2B 033f5b7e24c051277bfbde3e2a266f98f2b94b4b9a2434a9edcda03ae109790d084aadc23050d203b144d100200e751ad7a5130bcce36f8d8f2a4c614378cf48 SHA512 803f0e922218e721de01012a2d6cefa7ed0ab7fa52ddf78e554245560347cbc6df171c1caef857c64afcfc31b5ce163e1af6b7dcc6a0574ca71ef324ff025661
+AUX xfractint-20.04p09-ldflags.patch 1067 BLAKE2B 4faddadfa0105ffedef7552264971bf685121a74ccd449b12f33d525af61c9fa0557fc3e693848883d88a5b868c96f8e3bd2e14764182ecb2655b6ba64a12294 SHA512 af78e1facb6e436fed67e56871172fef742df1eafa75c55a75752dda855f81f7aff35cfaf042cf1f7502f66d4a9c7bf831b781c8641299873cc2537fe5da0ace
 AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6af8d5aaccb824f14ab4659fbd356cb188d8c0f1f0d2c1537a8bbcf1fa560eba9c5a2ced7bd7d7f1 SHA512 1e923957e93a53af47a8bc3205c350b9fe4bbfa9f955c5eb5673c1ce857808bdf0ad020c643c7f81dda1c0b5caf2480005c2f31eabdaa39908ef68649687b5a2
 DIST xfractint-20.04p12.tar.gz 1335480 BLAKE2B eef1cd37846865dab9c2616048b26d6a9674799d9317d9f3e92a783e872772c3322826689ec3bf71fc18cef80d4a13a604314d692685bcb268312085d34483fc SHA512 ef233b417ccdff153e53b70f4ac0500be99e9fc6e87360b341640573592320b2485f18fd6426436432d968d33fa41d4862babf193c3b11c480f514a4602bb8f2
-EBUILD xfractint-20.04_p12.ebuild 1052 BLAKE2B 45b60e972c592ebf6f1ad54438ab0e1ce3c060c4450131f1c80059534c74e8f75910cf98fb398e5985b6a2104b661f3de77f525f4a781ce79a0b3c1e92e6501e SHA512 521f53a85591ef4b937aaca9bc14e5bd7cf99568b3859e85eddfa65de94288eaf6325887b5c048b5204aebbd9c88f7c4f91d53142f2c9a5a4a10e1b820d65fbc
+DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
+EBUILD xfractint-20.04_p12.ebuild 1047 BLAKE2B c44c87eb9a6a4363552b1ea08c4b7af353446b49f5fa5204bcbcf790e59b7a673d70908db82711296a971eff5619c34b74a2a0e5ca7e263c96d4d5343990b881 SHA512 c0de618386ff5eec8bc1a76dbb48e789d35b890c4ec638f9073ef445eda3d2ca9ed9e5e5681583f7da51842e1fbb03b6f1cbfccea37b78dc7b54cbf969db6d33
+EBUILD xfractint-20.04_p14.ebuild 1026 BLAKE2B 3e497a3673814bfa772d8503e00e31d910b1fdc9d3165cdb8f3fa205c935b9790318ad3520a17c739b542d319833f4fa4d25fa1313761321e5437397557d2fa6 SHA512 8bb56f04617fdd5230d12fb43a59a7f29b9eb11bf3008df5157dc67d50b23924713b74e74ee634ebc9b8ec5b775e40e5841ff3567b3d74c0d6a8742451c371b6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
index 382bdc6a285c..eb3d92783aae 100644
--- a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
+++ b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -125,7 +125,7 @@
  
  ifeq ($(AS),/usr/bin/nasm)
diff --git a/x11-misc/xfractint/xfractint-20.04_p12.ebuild b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
index ba46f9dec381..c7793395883e 100644
--- a/x11-misc/xfractint/xfractint-20.04_p12.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -8,8 +8,8 @@ inherit eutils toolchain-funcs
 MY_P=${P/_}
 
 DESCRIPTION="A fractal generator"
-HOMEPAGE="http://www.fractint.org"
-SRC_URI="http://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
+HOMEPAGE="https://www.fractint.org"
+SRC_URI="https://www.fractint.org/ftp/old/linux/${MY_P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
diff --git a/x11-misc/xfractint/xfractint-20.04_p14.ebuild b/x11-misc/xfractint/xfractint-20.04_p14.ebuild
new file mode 100644
index 000000000000..6b8eb5554039
--- /dev/null
+++ b/x11-misc/xfractint/xfractint-20.04_p14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="A fractal generator"
+HOMEPAGE="https://www.fractint.org"
+SRC_URI="https://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXft"
+#	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/xfractint-20.04p09-ldflags.patch" )
+
+src_compile() {
+	# Untested, any x86 archteam dev. is allowed to uncomment this.
+	local myasm="foo"
+#	use x86 && myasm="/usr/bin/nasm"
+	emake CC="$(tc-getCC)" AS="${myasm}" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}/usr" STRIP="true" install
+	newenvd "${FILESDIR}"/xfractint.envd 60xfractint
+}
+
+pkg_postinst() {
+	elog "XFractInt requires the FRACTDIR variable to be set in order to start."
+	elog "Please re-login or \`source /etc/profile\` to have this variable set."
+}
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index a397dcf136c0..99f318eac4f6 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -2,6 +2,8 @@ AUX xkbset-0.5-ldflags.patch 412 BLAKE2B f42d74ab24dd14348bdcddb83aa16ce732a9b91
 DIST xkbset-0.5.tar.gz 13933 BLAKE2B f889bbf527e6ee808d970796815445cfa4803f315916c412d540eaac778f8cfdfa6e3d00e171cb21de589a61e5320de2af4f8b8c19c4c2a45c3cf837da38a0e7 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c
 DIST xkbset_0.5-5.1.diff.gz 3744 BLAKE2B 3294afd74ddfa81d18827ef388935113eeaa6b2b8abfff799b13cec04f76dda2b78be685991933f133f5eb2b8ebcea5dbba6f5e4429d8363c984aa5c6d22de77 SHA512 92c362653088d5249dc26959cc898d4f8882f77b410ae09bbb2f03972940ed64ee2864b6da3425692c5cfa2bfe3b34d8316f5d7aa619f25c6311ac7a91a8db4b
 DIST xkbset_0.5-6.debian.tar.xz 4028 BLAKE2B 5892ffc95e1926515cb98eaa40829f1f1d91009260e53d62834ce3fbc1bf99559ad5df9ff5b8a57cf7989579cbd351a7bb5481f7e284c9adaf954b2f20cb5d05 SHA512 c7d806406756785c77c12152a092c3f1245941682d063d503f3279d033a1adffa29c7b62723c720cdc03ebde882c134c494b30eda240211f899ceffbc874c366
+DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706418a6db8a70aaeb83835c33662c8ebc22f8e3250a8b87d521a02c41e44f7252dce774525a1fa5c4bfbf57f876dd728f SHA512 f927cc1fde5b3d0658d28a8fc1cdaa0c366826f7a8eab19404dda6a66a0e91ce3c262da1e783169a7521eb10a3470e9c75c01e60728daea737ad1319bc0b946f
 EBUILD xkbset-0.5_p5_p1.ebuild 1159 BLAKE2B 77f938b9a6939606617ae7dd98099e7e83ed32fac38a3c648438ef7f6ceb63b5cf75126c890772c42b12858fccfed79c8237b274013b8718aae87b8f4a0def31 SHA512 0e6e53ff85335d789bf9dc12d6e731f8223598785b9a127b37ac0c131e965a77b239c00ef95c245f94f12159b95c4202ff0f73b36e6ce90e976aa0596b8106e6
 EBUILD xkbset-0.5_p6.ebuild 981 BLAKE2B 1a252f0c7b1c33ce5f46906d36e4aaf95a4c27171f6350266ac868e890c40f7d6dace0191393ad301d855f6467ba92645f7a2fa6a400e61f84b9c613eb77f7d2 SHA512 acd96bbb958d997a5ac8642e2706be3a57ced9a71eb9f3fd286327a9d44b016895300bfbc62692c18334055a765c04178f0a9b8afc79a05acddbc2f60d2345a1
+EBUILD xkbset-0.5_p7_p1.ebuild 914 BLAKE2B 4923482a4a06d6604257f670526d25f6c576dea75b283d29dcdf8e30434e832b7cd380dc0ba4ae917636a33ceabd615fc2ade57e8aa7b4845a30126aa9a17625 SHA512 87f29e3cdc4c96c4e840d31500dd69b4f3dd5c9fa64287739ff21da4dfd7066502d0a2edbacc18c3516a78f73422c251da21846c2edd229d63470d3217e56f08
 MISC metadata.xml 306 BLAKE2B 9644abcc0daf089a11619c52345a08744954c73957bfe23d8f30d3546428e5e666f5cbb25fb32b5d21f5c3bfb1d890016eb0aa2621e3557b94c60497e6c7894b SHA512 68c4dd0cd53c28d3b53db38e239dee94fa5377570b86ede8f8aa844bd9a036deb8b777dced87a437b16dc25106e9cb8dd53c8ffa9f42f0a6db60d6f51e897795
diff --git a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
new file mode 100644
index 000000000000..47ac617ee117
--- /dev/null
+++ b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DEBIAN_P=${PV#*_p}
+DEBIAN_P=${DEBIAN_P/_p/.}
+
+DESCRIPTION="User preference utility for XKB extensions for X"
+HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset"
+SRC_URI="
+	https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P}.debian.tar.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+CDEPEND="
+	x11-libs/libX11
+"
+DEPEND="
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	tk? ( dev-perl/Tk )
+"
+
+S=${WORKDIR}/${P/_p*/}
+
+PATCHES=(
+	"${FILESDIR}"/${P/_p*/}-ldflags.patch
+	"${WORKDIR}"/debian/patches/02-clarify-errors.patch
+)
+
+src_compile() {
+	emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
+}
+
+src_install() {
+	dobin xkbset
+	use tk && dobin xkbset-gui
+	doman xkbset.1
+	dodoc README TODO
+}
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 1c98d2050d29..9929f65af397 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2114 BLAKE2B 30103d275cac0485386863ddb8ba664b33c3957cb5f821e937bec73e752447f96f7e8a17f3e7da0e5718d8e9a0595b21cc1252dfd5e0d24ebcfbe6183323b395 SHA512 97e51abd6e11f5f47176a1966cdf607c5dead0ae10643b8d806691b73710e51077e61d385bba2440607d9a32b66a7a0717985062c9a6e51d926fc5080cd9633c
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2113 BLAKE2B c615d9f8aedb385c1165d8cd4dd7f094eea2964b88540c6ce1486c121beb93c3e02d5a6bab472f90b9547aa7171a50ad1e0010ab83a79992c222cea296c9ec97 SHA512 e2496b63ef3413628311affe90a340f3ad2818a9600c3a311092ea4e84a7bb7afc608d10de89c17d2a17fcf8d3e4ac2983bd4915285101847d5390204536b666
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 2d2c29ce331c..22e8a3892488 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="