gentoo resync : 25.04.2020

40 files changed, 489 insertions, 218 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4139dc745d72..21b5f14db96d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest
new file mode 100644
index 000000000000..79afdb6853b3
--- /dev/null
+++ b/x11-misc/birdtray/Manifest
@@ -0,0 +1,7 @@
+AUX birdtray-1.7.0-desktop_file_deprecated_category.patch 263 BLAKE2B 9a456d55e242112726f00bcf87041720b9ee56097c50d71e4bf3f318f49a8ad78224954c7eff764d31cd3ba520fb8c895984776a27a3f1b354837e77382cf023 SHA512 186cd5a80d5d2f32c82708f48d137a06aad506fd44bb6b188ec80cd6041e68bfbd33a16f123b79d67bb977836b2815893e221cc60a3e35388e34c3a45abecfe5
+DIST birdtray-1.7.0.tar.gz 398153 BLAKE2B 87e583ab55b828213f5da97a61c3fc710b381b46ab688f02b6d1c4d01a2577451375d7366f0406cf685f1366497204e985de7905b1635161e252c11b9456da61 SHA512 3c2940a3a0e405d3fce1cd0411437ffa56f76c458e42ea059de1bd3fca802621643be39c1a0df3fc3fb0deac2aa53f7631c4bee191efd4b48e591dd05b30a6ab
+DIST birdtray-1.8.0.tar.gz 737802 BLAKE2B b3c52c4380a7d88cb7ab7abdc08979c03f1429564dfb568743c3698f6b7cc630b482181e0f3049fb3fc6e871cea23bf3e400e77ec17da7724f300bbb12f992c4 SHA512 6596b5e8c06b414b18b3256c3194d868ed42aab88486fa174b644d48640c15d2e33b198962e91e5b74e501c33f345cf3e160176a6928c789013076cce91a6eba
+EBUILD birdtray-1.7.0-r1.ebuild 862 BLAKE2B 21c440df982cf6ed61053fc37571c2fa960a29a9d638c88b5bcde64fb3b13ace13035af186db2da7dd0f52871cbd6e97033dda8ea3118f38744177fa8db1a36a SHA512 1516790487053f202f379551554b9cccf96b1c2eb6d84037e60dabd1384df817f7c07a7acfebdbdfc070aa8795c43938a3ca098f9419f12a7ab2770cad91d9af
+EBUILD birdtray-1.8.0.ebuild 739 BLAKE2B 5e86f0dda25dc8ba671cf1fea88f8defac4c051c7ae05004fbfe78950ddfe4131f0929bd7a7ed82731adcb48c225a56ad597306815ac6e9be3bac22a3779f86f SHA512 309b5a63ba487d1e0cfd52032c4395600120ca42bc4f599d77f81c6709b2fbe2ab0744e9bb658e85ff18fa086505e189acf3b0f2c7c117fddc9bf1ad54f352d7
+EBUILD birdtray-9999.ebuild 739 BLAKE2B 5e86f0dda25dc8ba671cf1fea88f8defac4c051c7ae05004fbfe78950ddfe4131f0929bd7a7ed82731adcb48c225a56ad597306815ac6e9be3bac22a3779f86f SHA512 309b5a63ba487d1e0cfd52032c4395600120ca42bc4f599d77f81c6709b2fbe2ab0744e9bb658e85ff18fa086505e189acf3b0f2c7c117fddc9bf1ad54f352d7
+MISC metadata.xml 449 BLAKE2B 1ab261352fabefe2d9c47dfe96681579a5291dd41fbe49df4571a0184c2429680c576bfbc270bb27bf1700b60a7019faf7b87e94fd06a5eaf2f4e8595dc13ca2 SHA512 8504f728cf157d2493e622a8091bae108fbb24cba21f2c00d3bab79f778afa485ba08c225f5964dbe7e586693fefc24721b023a51439fe1a1ffb22e5bdec5f16
diff --git a/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..39890d9c3e53
--- /dev/null
+++ b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A new mail system tray notification icon for Thunderbird"
+HOMEPAGE="https://github.com/gyunaev/birdtray"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git"
+else
+	SRC_URI="https://github.com/gyunaev/${PN}/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-RELEASE_${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-desktop_file_deprecated_category.patch
+)
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/birdtray/birdtray-1.8.0.ebuild b/x11-misc/birdtray/birdtray-1.8.0.ebuild
new file mode 100644
index 000000000000..4820733d2bcb
--- /dev/null
+++ b/x11-misc/birdtray/birdtray-1.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A new mail system tray notification icon for Thunderbird"
+HOMEPAGE="https://github.com/gyunaev/birdtray"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git"
+else
+	SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/birdtray/birdtray-9999.ebuild b/x11-misc/birdtray/birdtray-9999.ebuild
new file mode 100644
index 000000000000..4820733d2bcb
--- /dev/null
+++ b/x11-misc/birdtray/birdtray-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A new mail system tray notification icon for Thunderbird"
+HOMEPAGE="https://github.com/gyunaev/birdtray"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git"
+else
+	SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
new file mode 100644
index 000000000000..104b24bf8de9
--- /dev/null
+++ b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
@@ -0,0 +1,9 @@
+--- a/src/res/com.ulduzsoft.Birdtray.desktop
++++ b/src/res/com.ulduzsoft.Birdtray.desktop
+@@ -28,5 +28,5 @@
+ X-MultipleArgs=false
+ Type=Application
+ Icon=com.ulduzsoft.Birdtray
+-Categories=Application;Network;Email;
++Categories=Network;Email;
+ StartupNotify=true
diff --git a/x11-misc/birdtray/metadata.xml b/x11-misc/birdtray/metadata.xml
new file mode 100644
index 000000000000..31836f413ff2
--- /dev/null
+++ b/x11-misc/birdtray/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ago@gentoo.org</email>
+    <name>Agostino Sarubbo</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>marecki@gentoo.org</email>
+    <name>Marek Szuba</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gyunaev/birdtray</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index af0b7e84e5d9..325de5880892 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,5 +1,5 @@
 DIST gigolo-0.5.0.tar.bz2 246473 BLAKE2B 23459a57467fefcc13c61483397837da51294fe7945619e0580b034dac14da192acb349b2334669f35ec43e1e421664b1765fb1e51164d7dca76769f27cef075 SHA512 5f33f24169c2a8e3a450926668e4611aa0a9c669edb6ef6e53bccd77228ac78b40c4916eb4a20afcd9d5d7e32373e8f13fd1cf43366e65166a9ef09366c9703b
 DIST gigolo-0.5.1.tar.bz2 246788 BLAKE2B 524307017a5d07107ded81af71e7758c60538abec2e75e5ab4e4f3c57ff82ea557e6f7b009ecbd6d7cd42fdf8fe8a8872ff973fc5051753dcc70341fee953bc5 SHA512 a21e2e808db4a16b7bcd9019e936cac57f67a76d6a9a9e34ed3eb7faa4cd5997bc561d1e9817d8e77efbf8ab0a954bc7f25719941672f604cc415caf0cb61e09
 EBUILD gigolo-0.5.0.ebuild 702 BLAKE2B c05d352b9fba57108decb65c9a05c2d6ae8fc147dd1d5007f6b76fba846d114ef5ba6a012d01de013792071ad2a530acde7effeb6e0013eb75dbb9a6fe27e709 SHA512 62df9d4fc278e42ca269679bc375aba360f4ef231008f7f1cb4aef2e0275e061056fc331dcc3b3155bffa5e8ba9f7c972842cc1c76cf0d9896bb2a96fc0ceaaa
-EBUILD gigolo-0.5.1.ebuild 704 BLAKE2B 78ea1385b9d8d677c28027cc541cc57717604f45c5af1b8b9418201752a5e758931db0e99256338c041b43c503dbabd53eff878322e62b83df5163f524685f75 SHA512 2d867f626a72f9fa0645c16fa0b3d339fdeca6fffb641a95fee08456a5d067b76520e5a54061770427938fabcfb61332151dfaa45ac1cd44525ad15640d092a1
+EBUILD gigolo-0.5.1.ebuild 702 BLAKE2B 45ac139c748651de3cbefa4c664d251e9cf768f98cd1ccf307ccf10c1b77bd9f5665981b1a7f8d23a203d673f454837b0d633f1bf59c157d9d3231d3c14fafab SHA512 ad928f09dc22ef67b8a002f4d09350d63b582fdd9392b51cb657476bf37d134e4ca45c0c61378e50630fc39950be55a3560601a8ae02f9c9224357356a816413
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.5.1.ebuild b/x11-misc/gigolo/gigolo-0.5.1.ebuild
index 227fa91f3625..f68f937a31cb 100644
--- a/x11-misc/gigolo/gigolo-0.5.1.ebuild
+++ b/x11-misc/gigolo/gigolo-0.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index ee63fbd04c26..3c243f9b2a31 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,7 +1,3 @@
-DIST grub2-theme-preview-1.3.1.tar.gz 5064 BLAKE2B 4d67058eb725e6a9a65d9fc1ce6bccabf34bdf8215446a6aeab5f537a05b5e402030f1cc32c6e2d722f9c4a2b189e4db410a2f4a4d82306e6c039b771796b3a9 SHA512 69aed10a2612ea442a94748d3491c2300c83aafd4650dd54e520572c809c7ca3890ff3be42eeff7684ecbbfff425b3f44a651e01b5c682a1d0dc792b33b713fb
-DIST grub2-theme-preview-1.3.2.tar.gz 5486 BLAKE2B ed7e29da586bfe4388dab1b8467aa265b11e6ff9a6ad0890d27c0c4b45ec3615f08a8f1bb5a5d00015dfa83e6dd3a7c718039b9fd398e76211c4f8bda2c8f2bb SHA512 f53c1c5bac1874e8feb70619b3d65505bd083966ac9427ea36de7b218bfc068e52cfd58ffa8cc32f06974e5dcaa3581792301228f7bd56dcbf2ff01373b96885
-DIST grub2-theme-preview-1.4.1.tar.gz 197390 BLAKE2B 166d23a97036e0f6054d2d9d9c6a372769a3d4de5aad76ff1949e860064d891ffb331b6690dfb1395a521468349fc31ffa23c2fd34e5dee6ed1657a546470d00 SHA512 5ff9abad4ab0d60f12affef015e957b0e03ab19eb76addeef9d048264baa20e85c67584fa6f4b9e70c700e8b394fd6be5710c7e5588b185bd660101f4c124ce2
-EBUILD grub2-theme-preview-1.3.1.ebuild 521 BLAKE2B 2bef3ecf893d1f272f126c31686206f3a9f1bf8c9ffcb9207e78ff278d27ec0c6e0279cdc6d11eeb6a42d58561e6306cf664575227b9cc2732b7cff21706daff SHA512 5f3b48e65568400f886938085ee8b55fbb274c13148f327b10ead372584f697c7047b5748661b9d0be46be2c2abdc4c161e34c58c16c8b6de8bdbe1fd8b58878
-EBUILD grub2-theme-preview-1.3.2.ebuild 521 BLAKE2B 3c69bdb85f4ae7bdda2d1064354a7ad176a73753b165cc80997747611919ec273975f0ca6a429cbf7d0c3de9759301d6df9ac54f622f8bf61704fdf33402c588 SHA512 c106a58ddcc8965436b03210eb63322f2a760fcf2269cb53ddd34153001cba91345408766f823da67ed04a53a477ff1f22aef9df197f9221113f54f2fe10ff30
-EBUILD grub2-theme-preview-1.4.1.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
+DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a
+EBUILD grub2-theme-preview-1.4.2.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
deleted file mode 100644
index 3c86f369f284..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.2.ebuild
deleted file mode 100644
index 1bcb9c5db84f..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild
index 87db4a2d4a93..87db4a2d4a93 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index 6762f04b3282..e7c64670734c 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,7 @@
+DIST kapow-1.5.10-src.tar.bz2 834452 BLAKE2B 0ca2eb71a13119689ba878b6981bb66d26565035441f0a02d20097becd19a539742b37989543d18db6438f5cdccfa1aed1c698a94a0287b3d0b0b316cb9bd8b4 SHA512 6aa47bcf7ccb0a4c3dba4d675786ed63bd27ef7b6ed4d62074ae8409fcc640574d264c9c4952f764792b8280f11cd3a736f46389db2239b68589595e4424e518
 DIST kapow-1.5.8-src.tar.bz2 834178 BLAKE2B dc24e2d47e3e8286336e4de509e2486f0b6f6c912e5be532e36035e6fbff09a0f0453108b061aff2aa7bab45e1c782b63ee94f6183d17b0b50e04c24611b2e7c SHA512 168e9581b360a905e24d8dc4d01af58823789f4ea6fe533744c14d9c6830720e640923859c2726c51aa9ef9064038a2bb920960c74ca858e3fdc6b0ff17cf861
 DIST kapow-1.5.9-src.tar.bz2 834677 BLAKE2B ed02b76e8c764ccf7f9fb752322dad61113c82348bc4e75af2858136369423a02114b312637460cfa1127fa0389f50ea951aed5e69b3e90d276aa10ea7e52be2 SHA512 a026b2254835b4eb2d211bb8b56d68e6f07c07beb79e2b019d2ce108b6197e812222b5964f889fe31b856a0081107f3fca314684883b3eb3f778f6fe7cceb0b6
+EBUILD kapow-1.5.10.ebuild 1270 BLAKE2B dbff8e11691da3a4be61bcbcff2f915298d6347f99d16549532066ebf66d624ecd7575aff4352b17e1a81e37340a82e57a4e623d6a48d36dc948b8ef25a835c6 SHA512 a52acde6460502f80e7edb343b4e8733da258dbc91ae1e13987b83b86ccd066421a5c261cf24aca6477f224befd10d55dd0b263d31e223e161f4c76bfc7cbb71
 EBUILD kapow-1.5.8.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
 EBUILD kapow-1.5.9.ebuild 1270 BLAKE2B e1ebe6f085891173ca39f0173eaa089245633f90b31bc0eea507a6b825ba910b23a39d8facca6f264579419cf49b5fac5e647da47461cc03a097010c645516d7 SHA512 43aeacbb55847320bd466e12a04a86b967f3f0b5e3d9b303a765a2cb7284d2177f7f41aa7f17d606ec29332f82caf039b2ff38137d53da6c0a24636eb98865e2
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.10.ebuild b/x11-misc/kapow/kapow-1.5.10.ebuild
new file mode 100644
index 000000000000..f9dd263d6279
--- /dev/null
+++ b/x11-misc/kapow/kapow-1.5.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="A punch clock program designed to easily keep track of your hours"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+K_LANGS="
+	ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk
+"
+for K_LANG in ${K_LANGS}; do
+	IUSE+=" l10n_${K_LANG/_/-}"
+done
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	default
+
+	count() { echo ${#}; }
+	local lang_count=$(count ${K_LANGS})
+	local locale_count=$(count translations/${PN}_*.ts)
+	[[ ${lang_count} = ${locale_count} ]] \
+		|| die "Number of LANGS does not match number of locales"
+	unset count
+
+	local lang
+	for lang in ${K_LANGS}; do
+		if ! use l10n_${lang/_/-}; then
+			rm translations/${PN}_${lang}.* || die
+		fi
+	done
+}
+
+src_configure() {
+	eqmake5 kapow.pro PREFIX=/usr
+}
+
+src_install() {
+	export INSTALL_ROOT="${D}"
+	default
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index f81346bf2420..0fc954916855 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.27.tar.gz 405154 BLAKE2B 9ee094145623520a63412f90dfaac1a2bd017d1785c0e987b9c7c527afa37d2604755fa646c2506c4950079a4b5f956e67a776fa71e4ba21a07caa918780d58f SHA512 4b7c64cd3ec1f9e255e94dd144e1b83a25dce5a661727c3664148f0c6e25cef14ed10237653dcb70706f29be549acb9ed8c1c1d7734b7bd44d02ff957b4bf664
-EBUILD py3status-3.27.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
+DIST py3status-3.28.tar.gz 403839 BLAKE2B bc41418d38d8a5d55e2af67c4b68993db69bfa40d5f047fc47bf3e5cda28f56b808b8687ab5081c666398660b837f8c944138094112457eaa0c230cd1f1fa28e SHA512 19447a8afeeb39371551337fbfa62b6cd8b1cb8a4188b2bc18d1a7ec849126d3e8f46fb2cf4cefa2960ed38ff09a0cad7233bfe5711bba5efaeed7cd5da6207c
+EBUILD py3status-3.28.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.27.ebuild b/x11-misc/py3status/py3status-3.28.ebuild
index f08967d407b9..f08967d407b9 100644
--- a/x11-misc/py3status/py3status-3.27.ebuild
+++ b/x11-misc/py3status/py3status-3.28.ebuild
diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest
index fe31e7261344..6d9ff3456d92 100644
--- a/x11-misc/qxkb/Manifest
+++ b/x11-misc/qxkb/Manifest
@@ -1,3 +1,4 @@
-DIST qxkb-0.5.1_pre20150305.tar.gz 176169 BLAKE2B 13b61c951b0cbbee025a78806afc4999e1d63dcc979f43d78218ff8ef6552a1f8057d704560dcf569863c0b2b46e8c3ce292e98fc77f7acfc3f92fc9fdc68a05 SHA512 bfb16af22e12977432a77814ad5d3e8f5ed91c46b885505bba242eb864795837ed09cdd97ac3161f9c82a142ed7fe1d4b37e8d3aa8990cedf956904da290ab44
-EBUILD qxkb-0.5.1_pre20150305.ebuild 739 BLAKE2B e80eb56a35df8dfaf173b15f2ac3a7ff273c85402608359a8fe1201d7c267338e242cdcfd905e7182485b26611d2b878b855600078476a4120638053d1f96456 SHA512 5b5da2f2de919bfe8318100060ba15c308565267685188b825aec8d1f6fae48863b88b215f4fb31025ec6a7b0a221cdfc7a7155adbf10ba99f63dc97c785a496
+AUX qxkb-0.5.1_pre20190821-desktop.patch 1639 BLAKE2B 158d42fd95dd9fab6584adca86d475b2673e349dd79fa2bf694ed0a26fa37daebf3a1def2abeea22a0570390a5406e08a3b3d7b19e0ae503e0f0f18a0824490f SHA512 08a11f2659a5e77bfaa9df5e22e555f147f393dc4c003fd68b704a624d48120bf647f3fb6f659999073f20b4ea32ce09b7b225fe6c202497d7a1c10960f80dc8
+DIST qxkb-0.5.1_pre20190821.tar.gz 176133 BLAKE2B f04dffdb0fcb56e57002ec7384b12345c1bfd13988250701d7aed892552083c6ffe92cab133ea9e7e38b98aba8d47697f029e86288eca8d8571fbe023ff9b57a SHA512 2e95c471006ea8ba3b942d2725bad8ad47d74b8131a99055583782b0d844f0c41b539619e01bb2f6a634ffb1c2db87ca97c69352f761474c2895547207c3932d
+EBUILD qxkb-0.5.1_pre20190821.ebuild 689 BLAKE2B f9a0055e4fa01990da5739a03202033e4340bff9dfb44b0bdeb7dea939eb9271d44410ddeb5d159493a51fb7a795b56f20f3daf71c8c6cf497a8b6a082e3da68 SHA512 e7aa066f218af1f161ac1027b844143061697cf1e8d79b7ee62b62cf84fdcf71761de3c0c9f54a5a8d9038a033f90e98a3800f59252d40e248858f94b745d198
 MISC metadata.xml 323 BLAKE2B bafea289cd876df5467aacfe957ece4a4432d3d93bc8bd4b2bbb78f152fae1b661a0f8a8bc23fe6828a753f9a83c26c97b11378fbb75559cba0ae2417145e44a SHA512 57a0ffd3dd0fa5bfd23de1417c061bd7c2b21c7ded7ddedaf09cd807d9dac8708d3b868d20c0108aa94a228cf8296e45edd6562f7d520760cbf7ee0f25a93509
diff --git a/x11-misc/qxkb/files/qxkb-0.5.1_pre20190821-desktop.patch b/x11-misc/qxkb/files/qxkb-0.5.1_pre20190821-desktop.patch
new file mode 100644
index 000000000000..fcd9cdfb2003
--- /dev/null
+++ b/x11-misc/qxkb/files/qxkb-0.5.1_pre20190821-desktop.patch
@@ -0,0 +1,36 @@
+Fixing QA issue and s/Qt4/Qt5/
+
+ * QA Notice: This package installs one or more .desktop files that do not
+ * pass validation.
+ * 
+ * /usr/share/applications/qxkb.desktop: warning: value "Application;Qt;Utility;"
+ * for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+ *
+
+--- a/desktop/qxkb.desktop	2019-08-21 12:55:03.000000000 +0200
++++ b/desktop/qxkb.desktop	2020-04-14 20:16:07.754707291 +0200
+@@ -3,17 +3,17 @@
+ Type=Application
+ Exec=qxkb
+ Terminal=false
+-Categories=Application;Qt;Utility;
++Categories=Qt;Utility;
+ Icon=qxkb
+ Name=QXKB
+ Name[sr]=КјуИксКБ
+ Name[sr@ijekavian]=КјуИксКБ
+-Comment=Qt4-X11 Keyboard  switcher
+-Comment[ru]= Переключатель раскладки на Qt4
+-Comment[sr]=Кјут4-Икс11 пребацивач распореда тастатуре
+-Comment[sr@ijekavian]=Кјут4-Икс11 пребацивач распореда тастатуре
+-Comment[sr@ijekavianlatin]=Qt4-X11 prebacivač rasporeda tastature
+-Comment[sr@latin]=Qt4-X11 prebacivač rasporeda tastature
++Comment=Qt5-X11 Keyboard  switcher
++Comment[ru]= Переключатель раскладки на Qt5
++Comment[sr]=Кјут5-Икс11 пребацивач распореда тастатуре
++Comment[sr@ijekavian]=Кјут5-Икс11 пребацивач распореда тастатуре
++Comment[sr@ijekavianlatin]=Qt5-X11 prebacivač rasporeda tastature
++Comment[sr@latin]=Qt5-X11 prebacivač rasporeda tastature
+ GenericName=Keyboard  switcher
+ GenericName[ru]=Переключатель раскладки
+ GenericName[sr]=Распоред тастатуре
diff --git a/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild b/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild
deleted file mode 100644
index f800ec6daf1b..000000000000
--- a/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Qt-based keyboard layout switcher"
-HOMEPAGE="https://github.com/disels/qxkb"
-SRC_URI="https://github.com/disels/qxkb/archive/d7474a06055108c833bbb55b6cdef47e0edfb17d.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	x11-apps/setxkbmap"
-
-src_prepare() {
-	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
diff --git a/x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild b/x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild
new file mode 100644
index 000000000000..740ed9271fbc
--- /dev/null
+++ b/x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=ee9a1eee9dc810b33b931601203051d841bc3e7a
+inherit cmake
+
+DESCRIPTION="Qt-based keyboard layout switcher"
+HOMEPAGE="https://github.com/disels/qxkb"
+SRC_URI="https://github.com/disels/qxkb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libxkbfile
+"
+RDEPEND="${DEPEND}
+	x11-apps/setxkbmap
+"
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
index 76ef48bd276d..1572c38d95b8 100644
--- a/x11-misc/rofi-calc/Manifest
+++ b/x11-misc/rofi-calc/Manifest
@@ -1,4 +1,6 @@
 DIST rofi-calc-1.5.tar.gz 1693385 BLAKE2B 7ff21873ee298c4295f2766917318796d6327959e63d99adc86857d2e05534e77062c9546ba8c6cf645a12ae46147e4583a61fc95dbc6953ee642449ff108d40 SHA512 04213b6489cd9e3c5085a88cee07ee9413819c19d4ee08f6e2eef3ad418d21b5acaf1d4ef21f1495d81694e5706f93598c91ada65f1bcc83ce94a6cf5d50ea0c
+DIST rofi-calc-1.6.tar.gz 1694150 BLAKE2B bc1f3a2589c0e704793693e0f007503d1b0eaa363f416f0d111709541f2960f0f5ab31d0eb129000e7f82af3d46ce0a52918cfbfc00d14292a839a40a0986bb0 SHA512 a87523d3d64fbd53e431dba7da674a213fcfbdcaac25906a19bc83aa3feb14da479b702b39fd58ffeb04198ea0a5d52808f7c9c36495defc99c9c83df963e0b6
 EBUILD rofi-calc-1.5.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
+EBUILD rofi-calc-1.6.ebuild 487 BLAKE2B 7e5ebe0a0f34d2fd09d0d6bf5181de919961f24c1dd38ad40e3c80cd249518b097448d2dc1c0cd8177d2d8323595f4e52788b010f93800cd6c10ca269b2aa8b0 SHA512 0abfc58d30bbbe41472a45cac711d0edfb6a9bfe94c7678b0929e79d5ff0fddc0fef320f7369f43a31647b68f9aaaa48d1b68d7839dd665bab84a9e0efe97bf9
 EBUILD rofi-calc-9999.ebuild 467 BLAKE2B fc14f1346f9e5ee3a4199d3f346b0be73ba077311efa515abfef36cecaa6e4299949a6027a0de6190c8ecde529904abb76b2ba2afcf3a605a6433170f66faa34 SHA512 96a703783182f67fb241919b540a5ef2f961a2eed5db80118679bb47eac2c508b695fa1ec389ceaf964860ee9758f878546bf4303e667f9b03757d2289acf2a8
-MISC metadata.xml 370 BLAKE2B 3cab19850ebeec65545fceeda7d1f4be4eec58c742c903e2ebbdb7d9a89540253dbe4be6b368d22f93e66b36f5bf81d5addec44174b23d45dcd4935d62c31597 SHA512 781da549ae0e70ab7dbeada77a20c1ccaaabff1f19629c4affec054880fbdb3c7142ab0a58d2ad2f0f8a297d04f06c842bbc01f8152563d1a7c3d590fe6a9c5e
+MISC metadata.xml 376 BLAKE2B b1094be05c70026df494df22cf0d3b9be6f63a8a6afefaa8356d86499b2c64687a6c2881370303192b9b9789c6aeee68233cbba317710ff46214e181e43c9634 SHA512 7f5960e28ad496fe1eb0ab78fb1471a9b3b5583c3a32c3f06ab9bb939e3da2aee1bc3b4096575ddc9f0e797604b5fcfa7f0418055000d0007acc899c34ccc46c
diff --git a/x11-misc/rofi-calc/metadata.xml b/x11-misc/rofi-calc/metadata.xml
index 08400951b2bf..300495cc81c1 100644
--- a/x11-misc/rofi-calc/metadata.xml
+++ b/x11-misc/rofi-calc/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>robin@hallabro.nu</email>
+		<email>robin@hallabro-kokko.se</email>
 		<name>Robin Hallabro-Kokko</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/x11-misc/rofi-calc/rofi-calc-1.6.ebuild b/x11-misc/rofi-calc/rofi-calc-1.6.ebuild
new file mode 100644
index 000000000000..a267871cd50b
--- /dev/null
+++ b/x11-misc/rofi-calc/rofi-calc-1.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Do live calculations in rofi!"
+HOMEPAGE="https://github.com/svenstaro/rofi-calc"
+SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-misc/rofi
+	>=sci-libs/libqalculate-2.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf -i
+}
diff --git a/x11-misc/sct/Manifest b/x11-misc/sct/Manifest
index 255d2d3c304d..9da99dfb3b57 100644
--- a/x11-misc/sct/Manifest
+++ b/x11-misc/sct/Manifest
@@ -1,3 +1,5 @@
 DIST sct-0.4.tar.gz 4560 BLAKE2B a7434499d43180a20e4345ad207cd7644dd7271f9d1a3929e797263f5580e9f7517a3cb86a65892b68a1619a29cc5bb846fa40e3e8c14f4f5a5a7ab65dfa5ca1 SHA512 7a556c2d26cb2389a3e38e74de992d3fac96b29c637e20d1307e0ea0985c1119a3d05f2108d338612b407f5b5f5362bd3e5582722878d7ae62c568bdc9f46e65
+DIST sct-0.5.tar.gz 4802 BLAKE2B 2a7d522031f159b2a8d8d8b63603ff4094d6726d92ad7ac1675c8fbc4c716a8c8b1ae6fbc12d3fe5238552621ebbbc4416658ac89610d40010bf1560446fc55d SHA512 15f2013e3c6c56ff50078f1aa070b3388e07a780d14e5664542ea47e51e8eb84e937927467bf9ed74127a7382dea16c5ca94d255c8aeaaa696c9a81ca658f4a2
 EBUILD sct-0.4.ebuild 522 BLAKE2B 846877741dc7d50c9bf794a79b483f4ec709106d8795f5315e636c1b09e54c7686ed0162fd0e1a2bb74a2555b7507a888a5a375269837135ff68a3798f994d50 SHA512 7f762239a80f9431b66bb0b05243f0d3e9b4321a34680c7396bd2caa2df6e6112ab43e009ffaf51e801e3fbe421a0e42e628e6d9ef2e413588b5e256aa6b270c
+EBUILD sct-0.5.ebuild 650 BLAKE2B 599fb6acd1305334531072ea8090ba2941749b5f62bf3643607f8cf0ed9ee96611e8889573c57d8e1196835029cb8702ef5234a4dd318045d8244d11ad485508 SHA512 fd4ec6ea983e56388f924b4ec5a7474042ec9427cf1010a619ae3b973e71c42ce5eedb13e2aeab8225d432229b1d2bb27fa51a26b7ca68cc5138cfa6d617be1f
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-misc/sct/sct-0.5.ebuild b/x11-misc/sct/sct-0.5.ebuild
new file mode 100644
index 000000000000..615b8b643af7
--- /dev/null
+++ b/x11-misc/sct/sct-0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Set color temperature of the screen"
+HOMEPAGE="https://www.umaxx.net/"
+SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	dev-libs/libbsd"
+
+RDEPEND="
+	${DEPEND}"
+
+src_prepare() {
+	default
+	sed \
+		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
+		-i Makefile || die
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index d648b327b29b..cc254e45a627 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +1,6 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
+DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
 EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
-EBUILD shared-mime-info-1.10.ebuild 1498 BLAKE2B e5344adc995a43c1bdf551213d5fa11c0b9a3a5a1db2eefb81d1c3c0aaaf78904e32083d45e2faae467fd23f4a344903514adee3b9a1eca8c442c1d5ccc329af SHA512 fc74ce45601ba928f9231a495bc79c4ee62e15585594a1f62e2a19ec31dd8c0ccbb34bf8243f8fbcaa569d0b9b9c82dc31ab48b57363ab610e0a2674f4083a6f
+EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 7c6270263cb0089c883cdaf35c46ce99cde4b43eec2bdecf79317f52e9e191bcb5569009eeb3eddb0d94e874116c89e835d45c312dd65956c91ef0b3cc3a23ab SHA512 3faf32ae9cbb0a1551f6d1999c870ebb81fc398f76b513a52c15afe43f52976d1c15a6aec52de146ed40ebcc04bfe41aaa4557dd77b0825a09178a384001e02b
+EBUILD shared-mime-info-1.15.ebuild 1283 BLAKE2B 69ffee9deae212a9572f240f177cdb7adb7f365cb9391aeeaff29c2ffe59cd703e4161bc1ad8308e2802615e9c84306b58978b139a10b71ec7fc70ef175ab240 SHA512 d2e18b34cd0bdd9c35b66c1bbd422f84185d0fb424ac3cfdd9f01b5b812b0ebb083f81f85c6bf9d378f32b13ae8c3ddae89f3872cbd58540e812082f91d0ccb7
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 9f8ba91c6baf..8ee394b44734 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
new file mode 100644
index 000000000000..1ddca5fbe7d9
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HASH=b27eb88e4155d8fccb8bb3cd12025d5b # don't forget to update on version bumps
+inherit xdg-utils
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
+SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog HACKING NEWS README )
+
+src_configure() {
+	export ac_cv_func_fdatasync=no #487504
+	econf --disable-update-mimedb
+}
+
+src_install() {
+	default
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 3c21739540b9..899dfe274c90 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,4 +1,6 @@
 DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f
+DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3
 EBUILD vdpauinfo-1.3.ebuild 579 BLAKE2B bd17879fe0cbb595de06b973bce5ead8f0443d8d993a2626cefc6651259589cf25c3f795a40634c04cc67bd6dba98c714b2fdff927dc66f505f1f94e1aef5c3b SHA512 b2616a840b284e040fcbc84d067b54be3bf771f0efa6da92a63f2d4fb7379c8fee047b79c38fac6c721a95d86d0afba95c794548e95dac8df028093e5257dfb8
-EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B c350d4c00d47de2ee887f1f2054afc61c3952740f08b6d8bbd366f61181868d462528c8e05120820232f12cb38a6336dcd622cbb59021aee22260e2664ad18bd SHA512 0f638788bf19f242501804988f27118cf49cd5aba4b219f01013f2f7d414a6031dc9079d524c6343421120de41c0ec406c0468dd599f9510ddf7d4beef2c14ba
+EBUILD vdpauinfo-1.4.ebuild 538 BLAKE2B b9e696012b6ccf8c49187ce9055f031230f63d200902e86c4e7d82ac8d14108ef687753fbb11fee476338602156213a9c61fe69672a7e0b6a625b54b946e6523 SHA512 7b6786c616e0aa71cc9d9ba4b7f2233de172dcfa6bbeda8e9d356f092d3f6105158ec17568e9d3d2d86c0830b5f3b3d59b8f402a2042798006725e5aba08207e
+EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B 787c16d503300c983ca2da1eab61967a5bc2d986cf0fd969906345ae144da3e62eea7da3c4a318775271a9694be858bd5d70def0f956923d53de337432869bd1 SHA512 d65b62f29237d55d5ac6d2cc8a0965b67def68c5ea52a71c28514926bc6fdf53b7ba8781b50469a3e8eb92f16199120b6a909d0700179a6ef033f7d8c846ccad
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
new file mode 100644
index 000000000000..39610aa786da
--- /dev/null
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Displays info about your card's VDPAU support"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=x11-libs/libvdpau-1.4
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
index 7f4ca7b3d7bb..1c399e6d2057 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
@@ -13,8 +13,8 @@ SLOT="0"
 KEYWORDS=""
 
 RDEPEND="
+	>=x11-libs/libvdpau-1.4
 	x11-libs/libX11
-	>=x11-libs/libvdpau-1.3
 "
 DEPEND="
 	${RDEPEND}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index a07f9cad3c97..b85ef5de9c37 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -2,7 +2,7 @@ AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e54
 DIST xmobar-0.23.1.tar.gz 96169 BLAKE2B 5d16d3fc0a052614bc86cbc5ab515a5e2879d39d7bdf4541a3a10193c08bdc34a9bb07468ff7142c73e58694fb24c2fe581934404fd5ca737c4736855c60d316 SHA512 0215c02d32d90efff4d041d48b663755ccfb1944281f8a2cabb3e88cc9fd77221da03dd709b9c96f5ca8d7204561fe33fdabf37a2d919a83374df71909cc5978
 DIST xmobar-0.24.2.tar.gz 100179 BLAKE2B a5ca50d66bdb83274be62d1df83545d3527a3d05fc41708be44927ff75519f8686a2afc6671bede1142b881ebef37ede5116abff557b03276d509b031f5292d3 SHA512 c271e50d615d509c2c15ffa716b45df3211cfa143b128126c55a78a056475c9fbb6d7abc60a6a058e20a12aced5f33b94cecc35c73a76505e33e62ea1f1561f8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
-EBUILD xmobar-0.23.1.ebuild 2871 BLAKE2B 0c8464231ca7c52255d52881d236d9aae2c0c2de293b8376e148c276cba17dfaf03ed63abc56f587c26f70cc3a6ae790a4777a2fc61fb00c704270487e1e9f51 SHA512 37d8e2a7afbd9342cefc50b0427bbafbe076935be02aeab1f5f3239854de808b2d95b47765866804c42c452be3d114d562e9ecb434c3a80cdafd6017b381625a
+EBUILD xmobar-0.23.1.ebuild 2873 BLAKE2B 9003714397ca3e41bd863dba59c0f50f6198a5b5d1b0dfdb3a0b388a3dcb6c15e647541ea897c2db05de5f6be98ace56a48b4b94b47d72fa36d8186985b821bd SHA512 6ef3595ef8967f10704a05e438a4ded949e53311613e21b86c811ec112f3c58b6ccddaebc1a8f23c92a8163673646803b0224163d0125077e5eea8d507af3522
 EBUILD xmobar-0.24.2.ebuild 3016 BLAKE2B 771e81a53ddd58930424201798309e89490226df2b03fce58c9741554459329dc12fddefac1642e06727b2a997185f7231c01dd28366334834ecccd58640c453 SHA512 9fe36557429842fdbff4d5de4af26792a08662d816d8e34b308b6663e57e1965570b77e94edebdf082370fa80c72866708c70a1c833f47f3c12619790433f48f
 EBUILD xmobar-0.24.3.ebuild 3035 BLAKE2B 0ef34d81a4b6a6a5c78a21693f03bab0ea6c2d12d70c8a11208542abeb80a8548545769a4c63496fd151ba167187add94d565068cfd14ed5241a23324a8eee44 SHA512 d5897c0ce8f6582e56f759bd61f61ecb06c65b2dbc4c9b3b12dd925626793a9ff4671e27ea88470b161e9e87a0cb8fb2fc093e57751510d195ace6fe3b9e5b7f
 MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
diff --git a/x11-misc/xmobar/xmobar-0.23.1.ebuild b/x11-misc/xmobar/xmobar-0.23.1.ebuild
index 9bafcd89fb83..87e1f0c961b2 100644
--- a/x11-misc/xmobar/xmobar-0.23.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.23.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa dbus inotify mpd mpris timezone wifi xft xpm"
 
 RDEPEND=">=dev-haskell/http-4000.2.4:=
diff --git a/x11-misc/xplanetFX/Manifest b/x11-misc/xplanetFX/Manifest
deleted file mode 100644
index a574bb17ad50..000000000000
--- a/x11-misc/xplanetFX/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xplanetFX-2.6.4-gentoo-path.patch 1525 BLAKE2B b36d03fa5b1222e0ce16d83f2d17b20378e1cbda23467f738d9b4c3996ec4687631f8feedcd011fd9c18cc13eaa632541055ccef4fa4a173497f81fd3d50e20d SHA512 73b479936ec210e80c9e15e9a963ab41526b4da879ddc67d4083a710cc5aeb89929d261644131fe3a169aa4d65b297201eb1c08b674219a770cf9c1182b5d143
-DIST xplanetfx-2.6.14_all.tar.gz 36874844 BLAKE2B ee02daa55fe2e0a64b4691c95e8bac1b95d99d0ddd1e83036d723d46140b54be8d859619815929e205bc386fd5dbe5ffdc8ca3995da73497e93ee79cccee1dfe SHA512 479c297906785f304178cd3ff41eaf955be6b6a50437c02528528f2328cc726bdcc54fedc107df02b346144c2f06a4325a40b94f03f7923081bed48baf0238b5
-EBUILD xplanetFX-2.6.14.ebuild 1536 BLAKE2B 7e7bb87b04ca154cb43f45630d26452b2b403793b144ddd3df819985dde9593c861c18b65ccb573787bdd8f044ecaef85b4f8fa4b1556f0d8d9932c62c285c02 SHA512 62cb5bcd9f571510b055915531ea67425324d8a5a2d3c1e27339ce5edbbc276a127efbe6fed4f4fd612c062168d1c9e9898d364b86562ba5bce6d1d4d6957d55
-MISC metadata.xml 1176 BLAKE2B 873f695dae98cf38ba08a4017205ae2c9b999350782dd20dbcbcd63fc419432a438236670b692f8b6e221ae6bdf2b19d53f76eb4707b173b99a7838c143a623c SHA512 1e81e9920d7407a9cd88b83599282ab1f8079878fdee6739c5a763b0d6781c9dc2dd91c49e7811cd53b32ff6b50db3a77a4ab3d58e296c4f51b478141e61f771
diff --git a/x11-misc/xplanetFX/files/xplanetFX-2.6.4-gentoo-path.patch b/x11-misc/xplanetFX/files/xplanetFX-2.6.4-gentoo-path.patch
deleted file mode 100644
index 0777e076c831..000000000000
--- a/x11-misc/xplanetFX/files/xplanetFX-2.6.4-gentoo-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur usr.orig/bin/xplanetFX usr/bin/xplanetFX
---- usr.orig/bin/xplanetFX	2015-03-05 19:58:41.000000000 +0100
-+++ usr/bin/xplanetFX	2015-03-16 14:28:28.235256123 +0100
-@@ -115,7 +115,7 @@
-     WGETPROXY="-e use_proxy=on -e http_proxy="$PROXY
- fi
- 
--if which gsed; then
-+if which gsed > /dev/null 2>&1; then
-     SEDEXE='gsed'
- else
-     SEDEXE='sed'
-diff -Naur usr.orig/share/xplanetFX/xplanetFX_gtk usr/share/xplanetFX/xplanetFX_gtk
---- usr.orig/share/xplanetFX/xplanetFX_gtk	2015-02-17 16:55:12.000000000 +0100
-+++ usr/share/xplanetFX/xplanetFX_gtk	2015-03-16 14:28:53.147271051 +0100
-@@ -44,10 +44,7 @@
- 
- gobject.threads_init()
- 
--basedir = os.path.dirname(os.path.realpath(__file__))
--if not os.path.exists(os.path.join(basedir, "xplanetFX_gtk.py")):
--    if os.path.exists(os.path.join(os.getcwd(), "xplanetFX_gtk.py")):
--        basedir = os.getcwd()
-+basedir = "/usr/share/xplanetFX"
- sys.path.insert(0, basedir)
- 
- class GUI():
-diff -Naur usr.orig/share/xplanetFX/xplanetFX_tray usr/share/xplanetFX/xplanetFX_tray
---- usr.orig/share/xplanetFX/xplanetFX_tray	2014-05-08 01:46:44.000000000 +0200
-+++ usr/share/xplanetFX/xplanetFX_tray	2015-03-16 14:29:20.634287466 +0100
-@@ -27,10 +27,7 @@
-     
- gobject.threads_init()
- 
--basedir = os.path.dirname(os.path.realpath(__file__))
--if not os.path.exists(os.path.join(basedir, "xplanetFX_gtk.py")):
--    if os.path.exists(os.path.join(os.getcwd(), "xplanetFX_gtk.py")):
--        basedir = os.getcwd()
-+basedir = "/usr/share/xplanetFX"
- sys.path.insert(0, basedir)
- 
- 
diff --git a/x11-misc/xplanetFX/metadata.xml b/x11-misc/xplanetFX/metadata.xml
deleted file mode 100644
index 0d2445092a85..000000000000
--- a/x11-misc/xplanetFX/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<longdescription>Create high quality renderings of mother earth with realistic clouding and lighting effects as your desktop wallpaper with “realtime” capabilities.
-
-xplanet (by Hari Nair) is a great piece of software capable of creating renderings inside our solar system. To raise the quality of it’s output adding some graphical effects, it was a great candidate to link with imagemagick.
-
-The result is xplanetFX, a user-friendly piece of software to configure, run or daemonize xplanet with h/q capabilities to create wallpapers of mother earth on your desktop.
-
-More realistic maps and backgrounds and a sophisticated graphics handling produce nearly photo realistic images of our mothership. It’s GTK GUI makes it really easy to use and provides a lot of settings and a user friendly access to xplanetFX. And even the templating capabilities give xplanetFX an individual and stylish touch.</longdescription>
-</pkgmetadata>
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
deleted file mode 100644
index b8f5f2c89686..000000000000
--- a/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop eutils python-r1
-
-DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
-HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
-SRC_URI="http://repository.mein-neues-blog.de:9000/archive/${P/FX/fx}_all.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	sys-devel/bc
-	x11-misc/xplanet
-	libnotify? ( x11-libs/libnotify )"
-#python
-
-S="${WORKDIR}/usr"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-2.6.4-gentoo-path.patch
-	sed -e "s/Application;//" -i share/applications/*desktop || die
-
-	# These will be installed separately
-	mkdir gentoo || die
-	mv share/${PN}/{autostart,flipview.py,stars/catalog.py,xplanetFX_gtk,xplanetFX_tray} \
-		gentoo || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	domenu share/applications/${PN}.desktop
-	insinto /usr/share/pixmaps
-	doins share/pixmaps/*
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-
-	exeinto /usr/share/${PN}
-	doexe gentoo/autostart
-
-	dodoc share/doc/${PN}/{changelog,README}
-
-	python_scriptinto /usr/share/${PN}/stars
-	python_foreach_impl python_doscript gentoo/catalog.py
-	python_scriptinto /usr/share/${PN}
-	python_foreach_impl python_doscript gentoo/{xplanetFX_gtk,xplanetFX_tray}
-	python_foreach_impl python_domodule gentoo/flipview.py
-}
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index a7481222cec4..ec71f0f9a661 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,5 +1,7 @@
 DIST xorg-server_1.18.4-2.diff.gz 189089 BLAKE2B fa5270bb760a60fe0234a630afd55eb091a6637c696f26ba82427d8e305dbf634966c4ee5b230bab0205b48b490f810dd9838e4c26c5f11f0a7f5ed16732c904 SHA512 d76e2471a29a1fdc7a65aeb724f1d449ab58e9380acb7c0811d8d3d9962618205943b50c7a684bfc6b6432afe2521ae98356662a5437c78e7e3dd075d872248c
 DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b10fd9b08c163fd12e9340c83234746ab47da695f40cf35f7b91caac1480c64364ade46b9753cdace9594c4591646bae3e SHA512 6e030aa132da920092e8b0ed9b414ec883878b84106964ba002e086f9beec821be0cd7a54f5647ca5c54b09198123d6210b8d5620e3fd68369b59cf818be4f85
+DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
 EBUILD xvfb-run-1.18.4_p2.ebuild 773 BLAKE2B f43e286a6a376a355c527990a3600eadb7ca7078ee4e9942aa43f8b6c4679e4fccf7521914065bbc77538a5ff18e64081acfa1367919e2920d414c13b6c6225e SHA512 078d5ce6b8a52c4917c61cfc287caac0400e6db5e44b6df8c67455330e400e3cfce0fd0cd497e7c2d5081ad19076c1ce38191b6668f64bc492a663cb3c9aae4e
 EBUILD xvfb-run-1.19.3_p2.ebuild 743 BLAKE2B 9bc489339913c6139369aacb2898c8f4d4f2e987283dd70029705d28942b88ae2e011ac08bfdf72603fcb98e907869edd5a9cd145f92205ad0fdf38e8555a12b SHA512 9cf5be301ecd7fb6aec136deb9fab6e595fa0bdc1dd7392a1c654675f341056e33c9d4118a4e8dc88955ed12f865a8e3c602bf948ab6b013183dd21f48d2a311
+EBUILD xvfb-run-1.20.8_p2.ebuild 738 BLAKE2B e06641582868613ca7faa32dd64b30da03f820326add7c80e50df883cc3e01c3d921a21e8c59924fa3bd595ba8a5db2592edbbf2afa6b67b198727195d3c6cbe SHA512 484d35e23f170ca795c4dd775ba08358cac43b99c9347337ec6b72c372bd0e5cb3e88b0b91b2506f6841c4e1d6f141f644cd0d0e7a166d30227990f3b5bfaa01
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
new file mode 100644
index 000000000000..2680e79e2987
--- /dev/null
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=xorg-server
+MY_PV=${PV/_p/-}
+DESCRIPTION="Run a command in a virtual X server environment"
+HOMEPAGE="https://packages.debian.org/sid/xvfb"
+SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/patchutils"
+RDEPEND="x11-apps/xauth
+	x11-base/xorg-server[xvfb]"
+
+S="${WORKDIR}"/
+
+src_prepare() {
+	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	eapply_user
+}
+
+src_install() {
+	doman ${PN}.1
+	dobin ${PN}
+}