gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /x11-misc
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
73 files changed, 512 insertions, 481 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b5288fa6117b..959f33f20983 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 056301f1bd8d..e6967510816e 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,3 +1,5 @@
 DIST alacarte-3.11.91.tar.xz 199128 BLAKE2B 711baf87d48b79cf52ad41bc9292c848a0f69477388580b9dddc068c8184178ae1e3c455a5b9ac6d99ef442d4b36544a45852aa134744379fc14b6c69c6a77df SHA512 b4b5ead4ba0b9742ea0530ecb5362afa970125d29750aaf147be6fd477f238b9c360307ce1df2a56330a69cd9c849a0dde4be44b36bf55377f42e30429411935
+DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9
 EBUILD alacarte-3.11.91.ebuild 1335 BLAKE2B baa5b6b922f92788c6dbe63ad969f6e512d66edd3fa62f821b6f0e3775861d32377af03132347e5ac610deb0e2170342f548d9f341f7aea2f60aaa8aa13a4b39 SHA512 9bf1bc0ce59f8ff04ec425850d720c7e8f9ec3d3bdfec7dbd1068d292b7fb332bfcb1185a8edcb5a16f8d1a2233b83ddd36290b6550ee5b2cd7ed65fdd14da53
+EBUILD alacarte-3.36.0.ebuild 817 BLAKE2B 106ce77f3da560dd3cca88e4d187f4a23702142c56a007aa3f7b2226df9ca3e8d6cbaa87a9a3a11d3efb3ee6bc9877b3bc730fab7c1a9c10f16234d87d2a0c27 SHA512 1f7626c7cd30ee654842debd265c2ef4fcc32951139ad4b3eca8927d55558185eb43ac813d505830419746f3999057b33d49c468b97d2c5750ac5e1a5dfbd78f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
new file mode 100644
index 000000000000..03f6ba727ddb
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Simple GNOME menu editor"
+HOMEPAGE="https://git.gnome.org/browse/alacarte"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
index 02446eb0ae9f..0751c6c3cfd2 100644
--- a/x11-misc/fpm2/Manifest
+++ b/x11-misc/fpm2/Manifest
@@ -1,3 +1,3 @@
 DIST fpm2-0.79.tar.bz2 230189 BLAKE2B 6e444dbed72a139fd7cecaa3669c0da042d17dc1adc72ff0350b4b094f990e9d19a953328319ade692088536673ca04df50624919c3a2d087486f09c8dff7fa4 SHA512 2310f69df323c172954932f9a3454fab95d1389854110c1d18bfbb0dff59f0da937cbc2641abe98c7be85b7c5a65234a925acd9f82b5643079864ce529dc92b2
-EBUILD fpm2-0.79-r1.ebuild 640 BLAKE2B e29a5546c5be65d8b968569906f8751a6ffe254c9041349432d0e446cf237149aa9a8599f1f4088e9023d1e0f6c5e59a04d27053256f628dcd811333651d52b3 SHA512 9444a0b070b72547acf245393d6241dec70d756b5d114aa2469441feede6c51304a238002003031bbcf01f359aff3bfb4cb3fd5baa9c7f813dabd90651fa1b5e
+EBUILD fpm2-0.79-r1.ebuild 639 BLAKE2B 58daf07a9cca0a3483b96f17bb2b2f74cd7175917869cc4784d1e4661be606705e74cd34d7d406ed9dcd9d1add08bbf8aae564ccedf0940b9ea9fc7d64ce9aca SHA512 a655b8d7de9f9018b231c453f2b7e834be5dbbeae9342933f82d885094b0adbfff6d404f595c95941aa3c57b394f17a83d03a1fe0b3ef58e381e1580adf48719
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/fpm2/fpm2-0.79-r1.ebuild b/x11-misc/fpm2/fpm2-0.79-r1.ebuild
index daa796383b19..d10f34560837 100644
--- a/x11-misc/fpm2/fpm2-0.79-r1.ebuild
+++ b/x11-misc/fpm2/fpm2-0.79-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A GUI password manager utility with password generator"
-HOMEPAGE="http://als.regnet.cz/fpm2/"
-SRC_URI="http://als.regnet.cz/${PN}/download/${P}.tar.bz2"
+HOMEPAGE="https://als.regnet.cz/fpm2/"
+SRC_URI="https://als.regnet.cz/${PN}/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
index a4ace99bac69..3d3d43995acf 100644
--- a/x11-misc/fracplanet/Manifest
+++ b/x11-misc/fracplanet/Manifest
@@ -1,3 +1,3 @@
 DIST fracplanet-0.5.1.tar.gz 111911 BLAKE2B 81f5986bdf7a0ddc1a7ef8fd08bf07fbc23ae38ac1cdc452de6696354d291205cb1183d16c3a7fa8bfb250158229d84d94f3c24dafa09d20518fb5d19b31471f SHA512 40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e
-EBUILD fracplanet-0.5.1.ebuild 900 BLAKE2B c573a2a41fcf96579c1db37161cf713f0d594ce81724b0e125d20a2040e9c1d6592ad0a14bc5c8e0935b1dbd559466a9d2675db58c8ee3798f12bcd162fca02f SHA512 3b280431b2d0edb3f4613bced41fd9d682c94c61a9d4c541a670e61185d0d26ae3fcae5da9064fa0538da1a48ef17b562453762a0edc72acd7be535c04f36d5f
+EBUILD fracplanet-0.5.1.ebuild 905 BLAKE2B a3508530a8544cec69bc714b0aacec5711180d00d47c99455a6c56b7d69767bbb35172176172f716008b3fc1b626f3598bea404ee51eef2304bcc3d9961e04ee SHA512 57592e2e80b9227aece765e57b6de98854debb4718b827b1636bf94a5bba77db669040186735e6b76cb5c8dba657f2d967d53a4ec32d2f7dc4882a597cd6be49
 MISC metadata.xml 356 BLAKE2B b7514f3974a8e8f91ce709d90bd372dd73f61645ba8e55595570e8cd03aa2038e9b319a2d07b11b319bcd8bad91bb7fbcf87a35852451d6cfcdc30f33d9c9c1e SHA512 71282985fe89e25eaf0c84d2e3b0469317e2e2b1c3de5db8efc9557f8da2970e021e9aa18b625ef8a718feede1232a7c9687bc89615c12b4efd76325d4ad1561
diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 69e53bf216c8..d7c7c844b28a 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit qmake-utils
 
 DESCRIPTION="Fractal planet and terrain generator"
@@ -15,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="dev-libs/libxslt"
 RDEPEND="
 	dev-libs/boost:=
 	dev-qt/qtcore:5
@@ -24,10 +26,8 @@ RDEPEND="
 	virtual/glu
 	virtual/opengl
 "
-DEPEND="
-	${RDEPEND}
-	dev-libs/libxslt
-"
+DEPEND="${RDEPEND}"
+
 HTML_DOCS=( fracplanet.{htm,css} )
 
 src_configure() {
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index 89b6c91e019f..885111e8e885 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,4 +1,4 @@
 AUX fraqtive-0.4.8-qt-includes.patch 438 BLAKE2B 537ab2c470dd14f977cb53278cabf5a4e05e7973b69142f17d4bec1732c588ef181697e1be2c703d273ec1a6d26a53f1374482edb5d422924042c65917d7620f SHA512 0e5ea8dce236a5cdb8086ab0671360aeb15a4d0ac9703969be28373315288d59ccd31b013f932c77bfb5a64faf917f311c30c7cd25c006f08be5a5f40f5735c4
 DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942
-EBUILD fraqtive-0.4.8-r1.ebuild 1017 BLAKE2B 2f88f329cde8d0aca9bcd1625c9c0d3b80f1834178d5df4a515799d6e037933475b8fff783f2d4ba57b7c649522eaffc397fb21eddc96ffd4a7e3d401d5d8210 SHA512 c467b51b56fcc2e0dd30dd22ff54ad403401f390f335c62227305033532b5947b02c5cb5f6a45ace514059a5658bb6c662e1c9853a0fae9c134f437bd87c10af
+EBUILD fraqtive-0.4.8-r2.ebuild 1032 BLAKE2B ea808fb80683dfb4ceaa9258918ab3ec84655867c0080fa313b4ee5ad3d61b692037d397f3f36ebd9c43820361e9747f15f5e4623537d3652211ca6ad0a949c3 SHA512 1fe9fa27683261e0630a32609a61f042bef07d22d621733312da13f953f044947cf9c254a8c1cc88dec6cd66f5e6508d417e661575f6b0532b6c82338b56bc31
 MISC metadata.xml 364 BLAKE2B c40b388c714f4e116db4a5dc2292bf9da6bf0906dd3da66add62a5339e157e7ba728e135e58e818fc80d7cb3ed5c4fa72b4675efc15c30eeac9a8badda8a79d9 SHA512 b3343bcc5cf584c4bbacb0d54e353bca91c3112d9d906dc920ead427fc964e7a71bc632e810f6047a293d00325dfafe532067b6d0d5fb9abcb797ae83c587604
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r1.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
index 331b0ef776a4..7c98c2069002 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8-r1.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 inherit qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
@@ -21,6 +20,7 @@ DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtopengl:5
+	dev-qt/qtxml:5
 	virtual/glu
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-misc/icewmcp/Manifest b/x11-misc/icewmcp/Manifest
deleted file mode 100644
index 2c80058b191d..000000000000
--- a/x11-misc/icewmcp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST IceWMControlPanel-3.2.tar.bz2 586044 BLAKE2B cedf4156548deaacd8c114cd372c1b55a375851b52de124622deac202777730f9fd5096c711b87c7bb6aeb5bec3448185690ca5f8f26209f400b7c5a3246a829 SHA512 017b257bb30c49eb0b13a9570df70f6f8ccb55087121440cd1331f8364ddc6c23fae26c98bae1bd831f2a9fc52bef531cab9313f3e2ea209ce26d776ee64c47e
-EBUILD icewmcp-3.2-r4.ebuild 1474 BLAKE2B faf05a8f52225538b975ac6ac5a776154077d880e126e087bd81aab6c9b604004993cb87b9c28029f805c2137b3a39bda62fc265f61dd66f6211d638ff01a38b SHA512 171152837a999c2afed9f40cbde6fe6a165f4269d5134db466a7aaec12e5048dc17ff7a93c572f8a5afc173fb02cc7b121c88e6f89e4d751d311ef236be9bcfc
-MISC metadata.xml 361 BLAKE2B 175f971e5b3aab6d05312ef598d8330b7a1ea524d6aff192aefbc109b7f49392b08e87b75531c3cdc87b880df2bc0f51fd12ce1fd1d35373a9b9be0296683ffd SHA512 aecb95a7b415e6ca55502d8bc3e1204fcd50b1d44045ba51d753b074050f4b757c48647d8d5e21fe7c9f8be23019b836eb972af4772efab8a28c4f957f7d1302
diff --git a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
deleted file mode 100644
index 7304b1186c53..000000000000
--- a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit multilib python-single-r1
-
-MY_PN=IceWMControlPanel
-DESCRIPTION="A complete control panel for IceWM using gtk & python"
-HOMEPAGE="http://icesoundmanager.sourceforge.net/index.php"
-SRC_URI="mirror://sourceforge/icesoundmanager/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2
-	x11-libs/gtk+:2
-	x11-wm/icewm
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/INSTALL-IceWMCP
-
-src_prepare() {
-	rm -rf licenses
-	mv doc .. || die
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${P}"
-	insinto ${dest}
-	doins -r *
-
-	local w wraps=(
-		"IceWMCP.py IceWMCP"
-		"IceWMCPKeyboard.py IceWMCP-Keyboard"
-		"IceWMCPMouse.py IceWMCP-Mouse"
-		"pyspool.py IceWMCP-PySpool"
-		"IceWMCPWallpaper.py IceWMCP-Wallpaper"
-		"IceWMCPWinOptions.py IceWMCP-WinOptions"
-		"phrozenclock.py PhrozenClock"
-		"icesound.py IceSoundManager"
-		"IceWMCP_GtkPCCard.py GtkPCCard"
-		"IceMe.py iceme"
-		"icepref.py icepref"
-		"icepref_td.py icepref_td"
-		"IceWMCPGtkIconSelection.py IceWMCP-Icons"
-		"IceWMCPEnergyStar.py IceWMCP-EnergyStar"
-	)
-	for w in "${wraps[@]}" ; do
-		set -- ${w}
-		printf '#!/bin/sh\nexec %s %s/%s\n' "${EPYTHON}" "${dest}" "$1" > "${T}"/$2
-		dobin "${T}"/$2
-	done
-
-	dodoc ../doc/*.txt
-	dohtml ../doc/*.html
-	python_optimize "${D}/${dest}"
-}
diff --git a/x11-misc/icewmcp/metadata.xml b/x11-misc/icewmcp/metadata.xml
deleted file mode 100644
index a2abf8b200e4..000000000000
--- a/x11-misc/icewmcp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">icesoundmanager</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index e7c64670734c..e164828016fd 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,7 +1,5 @@
 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.8.ebuild b/x11-misc/kapow/kapow-1.5.8.ebuild
deleted file mode 100644
index 2dd79d2b2ec0..000000000000
--- a/x11-misc/kapow/kapow-1.5.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils qmake-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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/kaqaz/Manifest b/x11-misc/kaqaz/Manifest
index 072c760cc4c0..0fcd6550d541 100644
--- a/x11-misc/kaqaz/Manifest
+++ b/x11-misc/kaqaz/Manifest
@@ -1,5 +1,5 @@
 AUX kaqaz-1.2.0-qt55.patch 239 BLAKE2B 78369f07e9acf49443a8e51cef13c144df605c8ec7087be525e3b41fd2c92dd534b080970066d55e47e5d7b34b6ec2d7fbeb229f7dd520988539ff59359dd698 SHA512 9f97f60532e89c41fd27be1db20471eba9465ed145fdd39f578918525801a385ba58a5a6a649ce47bff754dca7b46515337694e87c55a8198f8a236086867c50
 AUX kaqaz-1.2.0-unbundle-qtsingleapplication.patch 1452 BLAKE2B 7827185411a5531f0eeb320705261bc72b220456a97edc31133e038c64ca5eaa67e54f29ea66a0e44224018fab695def466a215ca9b92aed92f8c78d319ce4df SHA512 c35b4cda2f3895a20b01276b8ab80757182d6f825508a320480fdbb27bd58c9f8d2fa59a6b291f59c2eff0c4d948f3d960c88b144d34f8cba7605698a8b0d2c1
 DIST kaqaz-1.2.0.tar.gz 5824631 BLAKE2B 52e9f8ed5896ddf3415386364fa684927eccda2342d60971a64d4602fa4e83f387bbfd47c7898deb04a798fc0be0a8e905ac9cd2fa58bec12f43b0cd9e3f6f17 SHA512 447d4bb9dd413b07f1f05ab797fe3c277caa1afc7063dccc080ee274f266e07dd04c17b56cacd8baa6e67ba53e0012f2cf5d490493c5fbd24c3e6bfcbf1887c4
-EBUILD kaqaz-1.2.0-r4.ebuild 1072 BLAKE2B e55fc9ee8c88e1add717bae18cbe58a256bcb8a141b4a19ab9c3cfa83b533917193ac84bba008b27fba9d46db56ef2470d9b0e0ef16751b9225bc3d73e8b1fda SHA512 ecc8ad6f5dcee0d6ba6ace6f2826dab71adcd4574f7866282f4e263096109f586078154b1c553b78d3a57b3f83adb61ccfde9e792b8fd53305f5a383af8d2135
+EBUILD kaqaz-1.2.0-r4.ebuild 1069 BLAKE2B 45b1f05dcf825f200fa6107a341a2987b9edfb7afcdfbf372e4cd2100dc74242560fbbd335fa8242aeae95a45b7b1bf6a115990a9bcdea132e1fd905ebc4230f SHA512 cd62664409935e2feecc1a8582b7ff7b202972ccd0b514f07febb388c14c0894a4f3b29b97ed5320237d795010837f5c30f84961a30ed05ae3aee2ed9306e398
 MISC metadata.xml 329 BLAKE2B 5790839b9df9a5edabcf80fecd9d9e8f1c6aa82ebf37d21d989a4bc28466bcfea950c59619f07eea447b09235db66e1607775cb2b3d0299ede1565fe7e4064e3 SHA512 d5a2685890a52c9815b94c233108510f21c57cae6d3ab3a03f869a99eb5cea3724de3597c9b47e23b8526e41164a7a54b9ab14029cf17a7fc3a4679d5957f3db
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild
index 68d849e02856..41c0d7e246ed 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 8746ba802b57..6aac922bda5f 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,6 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
-EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2067 BLAKE2B cc9bccbf51bf4442ce17517dbe2a8144428d4f5c66715dcd1730632a085c0c9e42acb4f659ec3b84b08063eb75884c5a3ddd8e4beed004d0c93a096329f76786 SHA512 daa125ad030a5eda55fc81ee3d411769e3fb4718613edfff9648f2df426d78c700a66094fa9971dad662f7b5e6d765241cc9dcbc6bea5753258007084522b497
-EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2069 BLAKE2B 85ac307153999ed026fa7a05b25e930e204d4782427f7bd7fb7a4d8b82e59424786c40367341522bfbaa9a24bbbd463ef75143306cbeebde5f287291ea7419d0 SHA512 8c25b3c1950da716ffbf3e7d9270f4ac8dcfc0b0d3dc14338b1eab929bb82c42d7938c2069a3b6e2d22b543d3142e6be2f49ab903a8545ebd2dff0518f8a084d
+EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2082 BLAKE2B dce5c3a2287c63eed4ea373740f47181004984d4ee33a7132d509354d994c0fe47bc2f623631990b556c14f1e8cf29d6138a99e85b9bc53d2fcf475997f54f76 SHA512 6fb43d653fbbb9564a6d25cd34ac60db0c8c0cce6998c14aec934e90718c386382fb08241b8ffef5e4e826f2cc508f4fcc6c026129298d7d20cf7ff38e7dfe20
+EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2080 BLAKE2B c3c96fbc74ec7b2c203625b9e5deeed46b129f43f9fe43ea926a54114a8bd5c9dee3588a57658451c80543c464130a28633757d6e876b65ba4b8ca8e4efe3ed8 SHA512 2c41e34a76da2cf56d354eb6dbc57cc5ce921fde1371c3c00b6e3491021a391f1fbf986d685507b3b31c8ceecae8b31605b1b2a7389a355ff7cfac946287ad51
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
index fd4f5e0bfe13..47ae408d0447 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,9 @@ LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-IUSE="ayatana branding"
+IUSE="appindicator branding"
 
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
+COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 )
 	x11-libs/gtk+:3
 	>=x11-misc/lightdm-1.2.2"
 
@@ -56,7 +56,7 @@ src_configure() {
 	local myeconfargs=(
 		--enable-kill-on-sigterm
 		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
-		$(use_enable ayatana libindicator)
+		$(use_enable appindicator libindicator)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
index 9f5a4ca5be0c..c8eeed761446 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,10 +13,10 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+downloa
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana branding"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE="appindicator branding"
 
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
+COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 )
 	x11-libs/gtk+:3
 	>=x11-misc/lightdm-1.2.2"
 
@@ -60,7 +60,7 @@ src_configure() {
 	local myeconfargs=(
 		--enable-kill-on-sigterm
 		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
-		$(use_enable ayatana libindicator)
+		$(use_enable appindicator libindicator)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index d036d51945e9..b024e883e61f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,5 +6,5 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 EBUILD lightdm-1.28.0.ebuild 3920 BLAKE2B 9a50dfa326aac3c678291c95efad0d700f6a940b1bff0c5d8b414777e4029502d4260b6e9afaac7d770bb30231c07a9f98dc1799fc6875b609206e75a249e312 SHA512 3ae4cbeaf8a786861a2a88e47693ebd713350b6139991c91a57abe7a741009480fd82706ac98de1fdedee570d2475f9373a80ef0a8b21bcb9679c640185e5004
-EBUILD lightdm-1.30.0.ebuild 4273 BLAKE2B c05b7258f91bb7e33a2a7b66f062882ebf986f342f7eb711d3c50d4739d8a8bc71dc5a834e6d3aba56df65cbf01f4ca3c00137b31d6e802a312ddf501f889783 SHA512 057d9651bec29fa4abb83b53f97355385798d75c2048d1464e487fe2c1331734ade8e1b75c7c33da0d9b532cb9b4a690111839f8fb940ed45a0d9b9ddc7f54fe
+EBUILD lightdm-1.30.0.ebuild 4269 BLAKE2B 43615f719c69291e9e6dfc602ac6e093968e974c93c8f70fbdd77a08d835bc96f46a311fec518872cc7c4651af3244fffdb122579a353a56f4ad2a84ac4e1910 SHA512 077850b3f85078e822aed1e90148a6abdd59613d281de0b60eebaa6e6da4ca32dd1d8b069f0bda53fa3cf68b66f77605360b4cacef51c1364dae8e3d9a24d933
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
index 66fa6db0d07d..1d2ebf04158b 100644
--- a/x11-misc/lightdm/lightdm-1.30.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 3a3ad5d2cc60..2f003c31cf33 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +1,5 @@
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
-EBUILD obconf-qt-0.14.1.ebuild 898 BLAKE2B 9bc86cbb65762633fbfb15cceb95e07657fd0f5aec46ead8447dc57cfc6a56f0338c9ffc381531a17104f73ce844d02dc579154d35a47a0a7067bc15f72a45ea SHA512 e17583b682360452e3992b1688cb3d470d44fff3932165861fddc8c04a725910c54ce8e7ac7769f6e5310fc3e8e3500a9b404fb37f0c48001960d0d079544ea9
+DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279
+EBUILD obconf-qt-0.14.1.ebuild 904 BLAKE2B 20d540f25296788ccf5531abbeb7ad2d2537d25c0c0914c311df6687027205eed535bbee18c92348155b6c7cfe0970630febab9f7ac844ab1480674305228c70 SHA512 87fa3f6ce4915ab69164b7099ed5cce0212b5a6bc4f74d2d19464af8d276b827f7a70a49cb8059c3573dbaab920748899c6610ea080e48f98c230f9faa71c931
+EBUILD obconf-qt-0.15.0.ebuild 909 BLAKE2B 4f0b479af6c398fef0b881d336e869be225105b8bf4f2aebbafd827fa0c3605d21457b2589839c7532813ddbb2117e36c70dc4b450244139d9e0f43d9999e35a SHA512 cca31af52fb81a7cd8a3a326ae29cafe8b6279c573a60b67a4b73869383bf208119742d77cb943ad88e6748debb73d6e63455e77597bcd2ea43562887cbd0315
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index 7242f202bdd2..27965776487c 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Openbox window manager configuration tool"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
diff --git a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
new file mode 100644
index 000000000000..4979e3f9df38
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Openbox Configuration Tool"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/sed
+	x11-wm/openbox:3
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+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/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 7e5a399eca82..d91561c811f5 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,3 +1,5 @@
 DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
-EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1142 BLAKE2B 1a4466c1d2f6e09d18e9547345b0687640e242c20896cd786e953ce41e3a17099629c8ce100e2746f3fc815524722695f2f21e90f9d2f896625f8665b628fa60 SHA512 b6e7fa2a89710cb5309ffef5d3196a7391f03adc4cbf95f4ef1ee863e7efc715add8c164d93c7c49cacced54acda6911e799b7a09ff19bfdd651453a5446af40
+DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
+EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1148 BLAKE2B f90921c01860b426fc45a0bfbff8105ebe545b501294760b4aff28eed23b809ec5e6983d589929ece717a3f5868a1c1bd16ce071944f0d5ffed8ac37ee7c3389 SHA512 cafe1662e08f4213708a40d360a208087a313ed6f61996664ca55be2b96c88e4b0b0d25ce00415669a0d87d419e745e636b3e22cb05a209ddf7fbcfe57a37658
+EBUILD pcmanfm-qt-0.15.1.ebuild 1096 BLAKE2B fbb76574d117324e398eaebc432b75a5884aed76ca5dfda5f7885e05da6adc0ea64cc43886a5170e781a0db3ab54a96b33ecd4d04bb2c6984259af9c3db2b8a1 SHA512 be78ecf60902fb23d57f78834a97f1b6803b012eec2b2f891de1313b58bca943cad01a6bd55e4a556f4b51501e586af0932d248accde738fff3ca91525680a7f
 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 b0d721048556..e7ec85088df3 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
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
new file mode 100644
index 000000000000..4852d019e3c9
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils xdg-utils
+
+DESCRIPTION="Qt GUI Tabbed Filemanager"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
+	x11-libs/libxcb:=
+	x11-misc/xdg-utils
+	virtual/eject
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "mount password storing" gnome-base/gnome-keyring
+	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/qarma/Manifest b/x11-misc/qarma/Manifest
index 4e9aae564d82..e53e69128f2f 100644
--- a/x11-misc/qarma/Manifest
+++ b/x11-misc/qarma/Manifest
@@ -1,3 +1,3 @@
 DIST qarma-1.tar.gz 20688 BLAKE2B 6cee7ba418c2e71398690b46a7415c9a6708a04757f0cdc9e91c4f9a084fad8668264c3360eb48249b19b601540dbca09546730e09eb208daacb8e8b688cd17f SHA512 011275b73df25a49e9810cabead8811d4c09fe20272c71e6208fb49b12ca59321d51c8dfb4fb32735c9e93c8ce7742122eea40fc14228904abb1447ef4d0f600
-EBUILD qarma-1.ebuild 547 BLAKE2B 7d2095727c2a9f927562b62123b7805cf859c0739d8c28077af26578a6b5c30c606bd4da06637e4f0a86ea945e264122b8ae9d47adb47f7b2ff37aa0f6fdb035 SHA512 e139418cce6783bcf90abbeb3188b311a0d34f7de69789c2d21c701c0f04cb4b2178d197aa587da3b047325b544c8ee65d568283e5091d105e50cbea6d0ee6b7
+EBUILD qarma-1.ebuild 549 BLAKE2B 8bd6c7a5a55d67af982322e251841fdb25590697de0ae405b44288ef6b88d4aca7256c3d0dd51080eee8f761a37d9c0a1f431e95ae462709cd1840aef9a8f7e3 SHA512 17c5d55f693e5d8ee17d362a29e0dd1fbda8e1cac3374164e82b50d36236dc098b6852b8212a4b7f90a001300f86f52c74d81df4a68b7df0704f8ffec6178e42
 MISC metadata.xml 329 BLAKE2B f9d48013dd84184307f58541373a46afbad2ccdddd551856059ae853768a1c56e5164f8e4515c14e9b9c21594e301fe940fbc0793828847b7e7c13bb84a9a087 SHA512 3e4621a6d5076809f5e55dcb5260ee9124e89dcd30ecedfb30acb0997a3d8ffd41294a18e0fd5d51d38013fd9fe289eb65de05a1a0785055a5748a249ea34728
diff --git a/x11-misc/qarma/qarma-1.ebuild b/x11-misc/qarma/qarma-1.ebuild
index e1c4f05d258e..941c13cbebca 100644
--- a/x11-misc/qarma/qarma-1.ebuild
+++ b/x11-misc/qarma/qarma-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
@@ -14,7 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-t${PV}"
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
index 23b98fbd3ec1..c44452217bd1 100644
--- a/x11-misc/qlipper/Manifest
+++ b/x11-misc/qlipper/Manifest
@@ -2,5 +2,5 @@ AUX qlipper-5.0.0-build.patch 1690 BLAKE2B 904b17740275aba865f5dc619a4dd95862f2c
 DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642
 DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b
 EBUILD qlipper-5.0.0.ebuild 774 BLAKE2B d416c001338ac1b644282e4d2ab6c9153030a77c6d73d9ed27c55f98120f11d09a4bfbf6440b64c5352ae58f7b6d59b7d3fb0e9426d6b714d4d7308a8346ec4c SHA512 214ef740bea26e7646f77fee465aba7f25f566783503e5b66556e537cfb29cdca6588614a4de1645c01d84fb7fdfd6830d0285f77d1debf1c6c80e8f6dff0b51
-EBUILD qlipper-5.1.2.ebuild 671 BLAKE2B a0fe5b0260495a908d09d4705501217a7c89e24f1e0bc5d89583de072aa5e7567fa26137a3fff7ac8619544a72e7a75bdb744db8186dfe4bf1454f3fe3daa7d2 SHA512 0f8941454f8227e3392db067595613e8ea97fd55b8a6fe2878c862af9713713483d2ae265e9660920507d6b6834d0bde6df1f691446fc11371b1452598a4e169
+EBUILD qlipper-5.1.2.ebuild 670 BLAKE2B ecf92f459f85223e30131a5161c04b0ffe04bf8a3561deee0fd95b427d8981e922a40daa399f060a9926701a28635aa23cb5f11f44f2972e46fa85c0cb615e34 SHA512 faf2c1784c69bdbd5fd1aaca1ad90bd4f3e84ef6b4c00a23b82a2b0a9be7dd68609285cfb8b73dccd567b523ac3f5c405f5b8cd4914401fc03f45d2160bf0fbe
 MISC metadata.xml 326 BLAKE2B 345890725be13fba9c48c60bcdf1be0b14d41d803820fa1d7fa170d44c442a60c50454552697386ddd3732b3d5226f8c96e66fea9bd1b75a1a7c48a08d8e3520 SHA512 5a8bfb530bd363777d529b7b70eec99ba70e6ee41ad9f6fb5ba7fd4c9259ffd381d4343d7a1c6dce34fc1566f5cab4fd474bc3726bbee49edc92d78250d87775
diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild
index d4b0e226ba39..df5f55a1362f 100644
--- a/x11-misc/qlipper/qlipper-5.1.2.ebuild
+++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pvanek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # bundles x11-libs/libqxt but no qt5 system version is available yet
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index e48da8882ee2..f260e1c71bbe 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,7 @@
 DIST qps-1.10.20.tar.xz 209588 BLAKE2B abf50904a97e9d2f5755bfc25509266de9c4b5a941a1010f93f475f02e8801b970ba112b01727e076c7b232cf23f50f6b8f7d2fe7acf2d8b273686f6a92404f3 SHA512 407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef
 DIST qps-2.0.0.tar.xz 211452 BLAKE2B 9b8501f3e57939b33ea54daf58d84cf37b6b66a0c4a32d546691898a82f19b747eba4eef77db6f07ca917da83fabfbee0f7ad9cd146b92e160c886d5f1905a02 SHA512 b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019
-EBUILD qps-1.10.20.ebuild 727 BLAKE2B 847407026d32e6c3dd083a20a597d10c5a0a71d6c223d73c6934267a67090e716ddb367b349305941a8db361315a1baa5d7f57fa75d90e14c6fbb5a87018a794 SHA512 e99a6f6c61b0f1caf3e4f408f3e44f163d98775ec13933f48528f433d6ab806d6b80d36ae7a7aa3581c9fb162629499425e3d77ff046b75f74c7f75f99fbcfd2
-EBUILD qps-2.0.0.ebuild 729 BLAKE2B be479afee54698012c4da04292620afcec7ecad0029c1e41f03b60a8dc943e4c10f500b7cc99185c1468c50fa81129ca6902406d094387cf6ece6c9972aeba8d SHA512 e4076fa1fad925f6b7d04b55b255e996e3d55de154dfe6151151ee4207573bdf58496ea4b639759f6d0da4c13d7c23e3355d5508deb9068f775d1f7e7ca6ca93
+DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
+EBUILD qps-1.10.20.ebuild 733 BLAKE2B 414d9ea3e21681785e5d1911e8c51e2d840bd23b7b88578b836f6ef0010ae249aed1d445fea5e6fee1c85a0910844f6fe78d3ed846c4743042a669ba8cd1ed3f SHA512 f734a5219314d961c1ab6631e1997820bb5e6000ad7a1e0982b4fe33e3516c6f95f1c42a2cb0fb891e3b5a7c76dd0c90f47a9985ed0004f4d586b5dfd5c94361
+EBUILD qps-2.0.0.ebuild 735 BLAKE2B e0500670a8aaafd62cefb11faceb54123a0eebe49886f5f2e7813dd1016a5a03b2dc6d2bace95a519c99dbc7f3e5389a0b0f72996b911777493bd3aec3223ce6 SHA512 fb3c9d64dfc2badb8ec2b787ec33df6e886f560209a7f321f8d1be95d47b169afdc16c3d598b5d9c9bd8854d109b126fa058a62233d4321969ba6e8af75d0164
+EBUILD qps-2.1.0.ebuild 710 BLAKE2B 5fa26e1db3d2d4615fa5cd71627b011c098853d973c1bc084131caa444e99b47c3ee2828b7b391cf7da7d6e92d4545408be8102857c2a80a068f67e7c2a9c50b SHA512 df03dbc72b3f474c28946aa86a104ac3f7a2a87c2b14151c9addf86ee62ede9708bfa6b81da33d837b717dc715d4e9f9336871031fabc5f9e163cd88b409cbc9
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
index b585aaca7eb8..35616a6fed6b 100644
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ b/x11-misc/qps/qps-1.10.20.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
diff --git a/x11-misc/qps/qps-2.0.0.ebuild b/x11-misc/qps/qps-2.0.0.ebuild
index 62d707ac4e11..2fd670cd0aaa 100644
--- a/x11-misc/qps/qps-2.0.0.ebuild
+++ b/x11-misc/qps/qps-2.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
diff --git a/x11-misc/qps/qps-2.1.0.ebuild b/x11-misc/qps/qps-2.1.0.ebuild
new file mode 100644
index 000000000000..37493153b2d0
--- /dev/null
+++ b/x11-misc/qps/qps-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Process Manager"
+HOMEPAGE="https://lxqt.github.io/"
+SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+"
+RDEPEND="${DEPEND}"
+
+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/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 96c0fdc9fb9a..5d2b6a264167 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,7 @@
 DIST screengrab-1.101.tar.xz 130248 BLAKE2B 0a81b80249322a8c6b4767b9bae70d43eaa41619927fdd799179d6dc9e15fe0cfb8ef50794890d9f9c84787bb88b447f84452b64f88e114aa3393466b1cf443c SHA512 f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13
 DIST screengrab-2.0.0.tar.xz 119296 BLAKE2B 0f3c55a78fb80569b4f42e63b9443018b7296c1b48ad4aa0af4270df19f939c44dbfc932731d6b16b0e15b6a735db333387e110ca221f88aab033ecb7b56cc96 SHA512 f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7
-EBUILD screengrab-1.101.ebuild 785 BLAKE2B 18cd2442b3d5e54a0c6a068495f9eed9aad80c3f93090371e9a0f5643f0b7e42f756c62f193a00e7e2927d1e21adf082d17f0ad6cb43e5555d826e895f678921 SHA512 f893303d92d346c78e4ad087f4d4c1597c01b7bedec494a39c8a395d39b4d58a4dabb03f33c6fef8565d205341a99b5150215f5c0c4f7aef6d25869fd4772ef5
-EBUILD screengrab-2.0.0.ebuild 807 BLAKE2B b0c8ed603a1bfbc5ff3b0d43ecec4a07afa94cab5af51c275ecb5a9665bbfe4588deb927112df62bea76d09c64adb528644d1c391bc4eefa0046770312c35617 SHA512 e8253d20071ff3d8598afb73a2a678bbda2e3d693f4e29a4386b480ffbfc3962bf69b84e0c6fb331eafddbb788dc085b1be5d857a2247bef4be5412cb9ff9f6b
+DIST screengrab-2.0.1.tar.xz 123628 BLAKE2B 62cad8ccbf89c4cb3728311b6dd4883676a0be514f84c6f54633e7001a39470b7209b7416e42a19603cd1ad74661eea87d015cb0c70ed8ff3e181ecc25dbeb71 SHA512 f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02
+EBUILD screengrab-1.101.ebuild 791 BLAKE2B c70c20be057980681a209a5100e65edb3fb5da26308822dcb60d07c28370749af4e8d97ec85caa06fd4cc0ae93e3af5910af5d5cd8fe7bb49a349496f0b32486 SHA512 046e727e33436ce07c1d7afd62cf0f869dd6e3c285a2c650c0260e6a57a4454fce74d331c7047626f78b2a6cfccd89e1582d4096bd3a28a003f9f17fe92dd9bb
+EBUILD screengrab-2.0.0.ebuild 813 BLAKE2B ce9d245a194c0cdce63057c365ef0277c091ca580b434aa110679ab9387f8e03d3b99af8cebb88f8fe9a922c3b0b3aa00d9d5c14b0f643e88724401c6280f117 SHA512 b579f2a8a3642d18a9b4a95bf7db087b0a3b5df3ca8cacd3063a1579d16dede233798366c7e18c31f02ff40391aa43aedea9d8c2d208a915d71acf33739232ee
+EBUILD screengrab-2.0.1.ebuild 811 BLAKE2B 52782dadf5efe96b44dfa443f6c7f6b43b5df7d460e3970ed84d024f2abe06841c461c19c4b3c02a6e34b0390bcabdb6c6fcedf65bd0868ac39b43854ded4c1a SHA512 1956b8073f4e18074713ce80721a5dfa117fed9bd56fac1e21dcd1d0dd88aacacfef20a74e77238c850f03af7aa05727c61985583c616050d2fe6ef6af9ff0b5
 MISC metadata.xml 439 BLAKE2B 87d0955baa4cf7c8587121cb9cbe863bffd94cf8886019b9c97153fdd034aa10425d71e5fbc172be6605534a45cf838b2c04aace8a63e1cf4c6adc91251e2e63 SHA512 991791fce13ef70f4eb0c0916150d0d46ac49dbf5b56b4644cc6b399f6fbbf7f7391ad9359f22f3ffee03759fb3fea1e88905a2f444ede1b37e9a4136f3f6e58
diff --git a/x11-misc/screengrab/screengrab-1.101.ebuild b/x11-misc/screengrab/screengrab-1.101.ebuild
index a8de9640bb18..6070e93aa8ec 100644
--- a/x11-misc/screengrab/screengrab-1.101.ebuild
+++ b/x11-misc/screengrab/screengrab-1.101.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Qt application for getting screenshots"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/screengrab/screengrab-2.0.0.ebuild b/x11-misc/screengrab/screengrab-2.0.0.ebuild
index 40ab78e96627..b58f948c724b 100644
--- a/x11-misc/screengrab/screengrab-2.0.0.ebuild
+++ b/x11-misc/screengrab/screengrab-2.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Qt application for getting screenshots"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/screengrab/screengrab-2.0.1.ebuild b/x11-misc/screengrab/screengrab-2.0.1.ebuild
new file mode 100644
index 000000000000..37ef4c7ac246
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-2.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI Screenshot Utility"
+HOMEPAGE="https://lxqt.github.io/"
+SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	>=dev-libs/libqtxdg-3.5.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtnetwork:5
+	kde-frameworks/kwindowsystem:5[X]
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}"
+
+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/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index cc254e45a627..0fdc557872c3 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,6 +1,5 @@
 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 1499 BLAKE2B 7c6270263cb0089c883cdaf35c46ce99cde4b43eec2bdecf79317f52e9e191bcb5569009eeb3eddb0d94e874116c89e835d45c312dd65956c91ef0b3cc3a23ab SHA512 3faf32ae9cbb0a1551f6d1999c870ebb81fc398f76b513a52c15afe43f52976d1c15a6aec52de146ed40ebcc04bfe41aaa4557dd77b0825a09178a384001e02b
-EBUILD shared-mime-info-1.15.ebuild 1283 BLAKE2B 69ffee9deae212a9572f240f177cdb7adb7f365cb9391aeeaff29c2ffe59cd703e4161bc1ad8308e2802615e9c84306b58978b139a10b71ec7fc70ef175ab240 SHA512 d2e18b34cd0bdd9c35b66c1bbd422f84185d0fb424ac3cfdd9f01b5b812b0ebb083f81f85c6bf9d378f32b13ae8c3ddae89f3872cbd58540e812082f91d0ccb7
+EBUILD shared-mime-info-1.15.ebuild 1275 BLAKE2B 843273dca380f25bc9a10f0512acda41857d32576fe6c00fb2df0af74421f0a891a87239cbdb3dffe97cb2b2f162da37579eebeae61942812805877a244783ff SHA512 ef7eac6866dfe080d98d331dbd04ab3c967ff63509992051bf0eda894d96180cb12caa3c588d6237d44c23d7f926604e9af220da3739c9796e633dcd3f0d79c4
 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
deleted file mode 100644
index 8ee394b44734..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog HACKING NEWS README )
-
-src_configure() {
-	export ac_cv_func_fdatasync=no #487504
-
-	local myeconfargs=(
-		$(use_enable test default-make-check)
-		--disable-update-mimedb
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# FIXME: 0.91 fails with -j9 every second time like:
-	# update_mime_database-update-mime-database.o: file not recognized: File truncated
-	# collect2: ld returned 1 exit status
-	emake -j1
-}
-
-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/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
index 1ddca5fbe7d9..f6f8b023c364 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
@@ -12,7 +12,7 @@ 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"
+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
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index cab46df43bd1..a3ebd5d7ccc0 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,4 +1,4 @@
 AUX shutter-0.90-goocanvas.patch 581 BLAKE2B a944b2d15b16fc429f73456f1aa266e1687a3d765f018b1f206358e140589d12733fff2bd37b8484207abd8849548b2987fad09b7c789481ec167ea1da0cee6d SHA512 2f3e0fbfbc86740efc4aa9ed7a31caf66560948003e3afc5b9dfba9f0935fffe4de5a217fb322ef9135b981030ef79ce964b1de0a28ad28bc36e58e2261f83e5
 DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
-EBUILD shutter-0.94.3.ebuild 2599 BLAKE2B 76073f34d30ba32692c4ce1ce89ac6b4c6dd69ceff261a4a88c6811a09f13d447cfe1e881c824ddd052ff3e9db6acf4c3517773de64b3c504b5799e36a3ab935 SHA512 f2675c32380199ffbaa8041dd7529b74d882c7c4473bc4642daa8a3ac8cf0e7052230e11b893731952eae96d3bbf1e5460de75f9f2148b1f1e2f6bf280d046fe
+EBUILD shutter-0.94.3.ebuild 2601 BLAKE2B 950db9d14ef692b89d48e73f8264d49b776565ba692a7a5a6b712c809a8a4c30ff7c08f2b01b400631eb2da739af479632adadd99e4281a2297a759e132ac21c SHA512 e8155275463b8456a74a7b18180b0705e328f2597359bb87141bb488c0a45c4278bdfd1db3a7d713e4e64bf9e54dcd7d39925f3ac11e2a4915ce71e4636f8923
 MISC metadata.xml 318 BLAKE2B 3e11d3fc694ec5a14878e69c1eccbcf1e4152ac240a266ece373ce2522af05ec7ee4409c1afa209ab464d5fa6985aee388014cd435d42dc1d28ea8ec339bd1ee SHA512 46572230d719235fa4ed51361dafe34de6e8cc3057503b957f422516651e6b9ac99a131abf8e6a5b677f4d76163628ef5940d76c466a2d4ab1f9d60f8d64fef1
diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild
index 18f36792dd4b..4a8e44ee526f 100644
--- a/x11-misc/shutter/shutter-0.94.3.ebuild
+++ b/x11-misc/shutter/shutter-0.94.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit xdg-utils desktop
 
 DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="http://shutter-project.org/"
-#SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+HOMEPAGE="https://shutter-project.org/"
+#SRC_URI="https://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
 SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/snixembed/Manifest b/x11-misc/snixembed/Manifest
new file mode 100644
index 000000000000..e64ed9a1e1ef
--- /dev/null
+++ b/x11-misc/snixembed/Manifest
@@ -0,0 +1,3 @@
+DIST snixembed-0.2.2.tar.gz 5870 BLAKE2B fa0ff00808579419410e462e0271d2bc72db0975c6de5b03751ea9d7831c2d4507ef5886058bfa66d12b5dea79f690103243a0398e77c788ee3d77025580cfbe SHA512 474eba11a31c44437a29d034b3e1e8df1b9a0dbc728566fd8727bc957237763e3c88d175bd6c349aaca5fec8dec7213c17e2241e91aefed1686a2368554be05a
+EBUILD snixembed-0.2.2.ebuild 1006 BLAKE2B 7c2da73d6054bbe3a281a6a990627dc9f40d8135c9815eb3bb80246bd7be6c520644e06b382b48bb5c9070c1c95d0af67a797881933fcffcab2e4bcc0740e387 SHA512 abf5ab3ee3e75abf4ed39cdacd546cc5d202cda53c3fece6f5ff58ea128ff2be87436055c1567e2427cb0b11be2be1861f7035d758bd5e33b93111e03edf598f
+MISC metadata.xml 247 BLAKE2B 25c731c759786cef3c3ffdb2513becb723ad51c2e3902853311cf3845ab1e9c193672430b2ba6510df55ff43039f593a6f73bc8e057ac6237462b814beb69d37 SHA512 4926bbe8526eca3acea716f8f865c02398b29f7b0481eb07cc9c92f17974a44b038db4489bdd5ea9fc8b73e6e7212bd6dd0948727f8290b5002014291e748de8
diff --git a/x11-misc/wbarconf/metadata.xml b/x11-misc/snixembed/metadata.xml
index 2ba8e9e851e4..90af0369c665 100644
--- a/x11-misc/wbarconf/metadata.xml
+++ b/x11-misc/snixembed/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/snixembed/snixembed-0.2.2.ebuild b/x11-misc/snixembed/snixembed-0.2.2.ebuild
new file mode 100644
index 000000000000..aaec6ff02216
--- /dev/null
+++ b/x11-misc/snixembed/snixembed-0.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala
+
+DESCRIPTION="Proxy StatusNotifierItems as XEmbedded systemtray-spec icons"
+HOMEPAGE="https://git.sr.ht/~steef/snixembed"
+SRC_URI="https://git.sr.ht/~steef/snixembed/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/libdbusmenu[gtk3]
+	x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	doc? ( dev-lang/vala[valadoc] )"
+
+src_prepare() {
+	default
+
+	use doc && local VALA_USE_DEPEND="valadoc"
+	vala_src_prepare
+
+	sed -e "s: .git/HEAD .git/index::" \
+		-e "s:\$(shell git describe --always --tags --dirty):${PV}:" \
+		-e "s:valac :${VALAC} :" \
+		-e "s:valadoc :${VALADOC} :" \
+		-i makefile || die
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" BINDIR="/usr/bin" install
+	use doc && HTML_DOCS=( doc/. )
+	einstalldocs
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 02c6be74833e..532248b7e4bc 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -7,5 +7,5 @@ DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
 EBUILD synergy-1.9.1.ebuild 2121 BLAKE2B f70ec2b27f543ba1ea37bce20cfc88b3ea28f5a100d6b72713112dbcf2b1d9df6c032594c3c9131750c403254c3e544d3be2259e08c59c3cc1de7fc64acd9d17 SHA512 ccc1adf63d0d50ae81110f11b3f8a63386df7cc9c8ee59b2f70f19f2282d8138c7faccb5b68b92aa864790837e8e89e22363879eb97815113db5442e8c7a8ed6
-EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B 78030e4049e9212084e8e1915cb1714afdc4c95826c2510e22018e09e9a1df43df07f5040afd84e3d1537985a10f208b698ba2ed2ce41f06f803cdde5b2777fa SHA512 d8b2b8ac78a1ce8d16b80f34d0bf306252632513feb44ebe2c89b04297a8268508cdae0116607acc9b184c2a8d8521f42e1d9818f3a4b8714f8139aa26ee6542
+EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B cadd551ffa38911e4e825ffd7ada68d08f5fd8278f71af7321af48aefa81a632c608cba876a17dda8a1f66e0b5762e220389b68ac03c2bfbcf5446e51d9969c9 SHA512 9a931df7b5d5f37b3f5d951aafad19fbb24def897a46fb1d37ecab62bc07141d0f3e19e36e0f9cdd3903e44f23e7e83b8fe6daa56944dada2906026878d489fd
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index 2de99eaae20b..3a3b2d0bfac9 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic gnome2-utils cmake-utils
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy-core"
+HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core"
 SRC_URI="
 	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
 "
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
index 68e7ed50b824..3f94f5cc5ec1 100644
--- a/x11-misc/vnc2swf/Manifest
+++ b/x11-misc/vnc2swf/Manifest
@@ -1,3 +1,3 @@
 DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
-EBUILD vnc2swf-0.5.0-r1.ebuild 959 BLAKE2B 6154829c5750ef8e5ac4af7f856d6163beaf141837c2b6fdac6aa1c3aa5062732d14169a82f9cdbd179e53811a9cd782b0c87ec9f93e37327749daebfae579c7 SHA512 dce65ca80c31c5caad4e7e9765363100cd2491d86489fedb6667bf8102271f624d8ad5591b0e94d794720ec1cadde26ecdeb14a69c12bcca8486b61e7ea13c2e
+EBUILD vnc2swf-0.5.0-r1.ebuild 962 BLAKE2B 732900f2cf326d2db87a70fb505c34845eeb85b3dec3b61e5eb3dbbb43c135fcdb1c51a9434a377de9cb534c5a2b9f90e555f56595fbecc336149272da9c0df5 SHA512 4af7e15ef99e79e591a891dee41dd06dd7c7ea5cb6ee87255ac5aa7516f6caef08b2facfc9bc50f0339c0f672fc522640c8b0599ee772412d51987e6c9ab8d5e
 MISC metadata.xml 595 BLAKE2B e5cb40382a69ca1f5d8df0825ad2fe0b1df483f25f6f460694de69d3ecb52206436e0b283a6d647f58ceab872df857a50b106a2af52abe91b1ae343dea354463 SHA512 6704b8f85e5439e662e490d581adcfe3b822bfd75e78b91a4074e5cf23267b1e180b91d18cf098c5745587c4e31829d4469bbbee3741fc1535eefe6d737f9732
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 63abdeceb57c..07b8cc0bbeb5 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
-HOMEPAGE="http://www.unixuser.org/~euske/vnc2swf"
-SRC_URI="http://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
+HOMEPAGE="https://www.unixuser.org/~euske/vnc2swf/"
+SRC_URI="https://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/x11-misc/wbarconf/Manifest b/x11-misc/wbarconf/Manifest
deleted file mode 100644
index cc544d1549f2..000000000000
--- a/x11-misc/wbarconf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX wbarconf-0.7.2.2-install.patch 2843 BLAKE2B 5d794bda0b1ee7f4ed2f2d7bfc26ad7a9d361260bc2e828d236f5c8c2c949e5335aeb70267a470d4d8838fc7cdc3751427b016695796f6d3f15b8070748001b3 SHA512 496392ec3236c4330f4c2d09ecc29a5dd0dc89a40adacbb3b27c4dce4b7170e05f22ca083fb10d045cc21253f5e460ba4a73e632d68056df3fe64ea8fd954c7c
-DIST wbarconf-0.7.2.2.tar.gz 764073 BLAKE2B d2dbd517d31332179fef612b8a6dc863976e27eda18e27f917f8e2cc7c9a3cfe9499e82fc6ada8f36491454dc57fa56dc43b7b62bb358aaa69f358ed3d51aa82 SHA512 9be4fe4ccceb8432d601806e4e10c19d4072502b63648e1111537e8a693a64d78f2a08f12598bd7ab0b356a1a24ccf138bcd893cb0cccb5bf7fbf80caf9d9eba
-EBUILD wbarconf-0.7.2.2-r4.ebuild 807 BLAKE2B 58ddb54c829aa9c224234a3651e95391defa3e1680fcf89b2be09b38389cfaeaf0305edddc392458f5e24b9e9842c798071db74aef6a6ec7542e01c5cc68c4e6 SHA512 91d91af4c0844733018a6606f4927e5becd773dba3406c4284d9675c3e1d23dfee1e070c48420265d95b6dc1f6f13b80556420329882ce3cb147c99c21187fa1
-EBUILD wbarconf-0.7.2.2-r5.ebuild 885 BLAKE2B 56f16792d5d4d8701c3150c82990b7efbee31bb1e706fa03d70d798337692087d2cdcbad2bb19dfb03fa66d5c5e4fa6dc7c696e1d7b2b731a07bfd434747196d SHA512 351e21813d6e1df69ab5d7c48e4f179a3c6279c94af9451a25437f3c7f8eb5342741a34acdb247e06dabd5e3c571abab79e3db3c904df3e2284eedf7bdece59c
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
deleted file mode 100644
index 040d435bc797..000000000000
--- a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- wbarconf/install.sh
-+++ wbarconf/install.sh
-@@ -1,5 +1,6 @@
- #!/bin/sh
- startdir=$1
-+version=0.7.2.2
- 
- if [ $(echo $1|wc -w) -eq 0 ];then
- 	echo "Usage: install.sh /path/to"
-@@ -8,29 +9,28 @@
- 	exit 1
- fi
- 
--echo "Installing in to $startdir..."
-+echo "Installing in to ${startdir}..."
- 
-+cd "$(dirname "$(readlink -f "$0")")" || exit 1
- 
--mkdir -p $startdir/bin/ || return 1
--install -m0755 wbarconf $startdir/bin/ || return 1
-+mkdir -p "${startdir}"/bin/ || exit 1
-+install -m0755 wbarconf "${startdir}"/bin/ || exit 1
- 
--mkdir -p $startdir/share/wbarconf/
--install -m0644 README $startdir/share/wbarconf/ || return 1
--install -m0644 COPYING $startdir/share/wbarconf/ || return 1
-+mkdir -p "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
-+install -m0644 README "${startdir}"/share/doc/wbarconf-${version}/ || exit 1
-+install -m0644 wbarbacks/README "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
- 
--mkdir -p $startdir/share/locale/ || return 1
--cp -av locale/* $startdir/share/locale/ || return 1
--chmod 0755 -R  $startdir/share/ || return 1
--find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
--install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
-+find . -type d -name LC_MESSAGES -exec mkdir -p "${startdir}/share/{}" \; || exit 1
-+find . -type f -name wbarconf.mo -exec install -m0644 '{}' "${startdir}/share/{}" \; || exit 1
- 
--cp -av wbarbacks $startdir/share/wbarconf/ || return 1
--chmod 0655 -R  $startdir/share/wbarconf/ || return 1
-+mkdir -p "${startdir}"/share/wbarconf/wbarbacks/ || exit 1
-+install -m0644 messages.pot "${startdir}"/share/wbarconf/ || exit 1
-+find ./wbarbacks -type f -name "*.png" -exec install -m0644 '{}' "${startdir}/share/wbarconf/{}" \; || exit 1
- 
--mkdir -p $startdir/share/pixmaps/
--install -m0644 wbarconf.png $startdir/share/pixmaps/ || return 1
-+mkdir -p "${startdir}"/share/pixmaps/ || exit 1
-+install -m0644 wbarconf.png "${startdir}"/share/pixmaps/ || exit 1
- 
--mkdir -p $startdir/share/applications/
--install -m0644 wbarconf.desktop $startdir/share/applications/ || return 1
-+mkdir -p "${startdir}"/share/applications/ || exit 1
-+install -m0644 wbarconf.desktop "${startdir}"/share/applications/ || exit 1
- 
- echo "Installation complete."
---- wbarconf/wbarconf.desktop
-+++ wbarconf/wbarconf.desktop
-@@ -2,10 +2,10 @@
- Name=WbarConf
- Exec=wbarconf 
- Type=Application
--Icon=wbarconf.png
-+Icon=wbarconf
- Terminal=false
- StartupNotify=true
--Categories=GTK;Utility; 
-+Categories=GTK;Utility;
- Comment=Configuration tool for wbar
- Comment[de]=Konfigurationswerkzeug für Wbar
- Comment[fi]=Asetustyökalu wbar:lle
---- wbarconf/wbarconf
-+++ wbarconf/wbarconf
-@@ -51,7 +51,7 @@
-     print("Gettext error, defaulting to english!")
-     #    return message
- 
--wbarversion="0.7.2.1"
-+wbarversion="0.7.2.2"
- 
- ITEM_ID = 0
- ITEM_ICON = 1
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
deleted file mode 100644
index 3caca84352cf..000000000000
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=x11-misc/wbar-1.3.3
-	$(python_gen_cond_dep '
-		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/${P}-install.patch )
-
-src_compile() {
-	python_fix_shebang wbarconf
-}
-
-src_install() {
-	./install.sh "${ED%/}/usr" || die "./install.sh failed."
-}
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
deleted file mode 100644
index 91921185ba32..000000000000
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=x11-misc/wbar-1.3.3
-	$(python_gen_cond_dep '
-		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-install.patch
-)
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	python_fix_shebang wbarconf
-}
-
-src_install() {
-	./install.sh "${ED}/usr" || die "./install.sh failed"
-	if [[ "${P}" != "${PF}" ]]; then
-		mv "${ED}"/usr/share/doc/{${P},${PF}} || die
-	fi
-}
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 411b0b93ac13..05fc69221aad 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,5 +1,6 @@
 AUX xbindkeys-apply-mask-on-release-event-status.patch 986 BLAKE2B fb8cd2b05f2be572e558d36540d1c4dd9bda2d92620a48dde328edeb8bc568537b28e52f9afbede970c726f74f2ee196aea8979b8caf34a579e72b650b2995fc SHA512 6a0fa8fff688074a9c7e635d450412c4734944439f0603d38017c532a454ba971b78c05bae3bcd49f96f64d5238e6114770c66aaae5a10d9eaac08de9c31e95c
 DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
-EBUILD xbindkeys-1.8.6-r1.ebuild 702 BLAKE2B 3812e75321e826a9a00bc75de946f0210d36f1a76735f30698ad3e4ad3edca121f380641762dd438f6285224bb776a22a9c9894cdfa3aca8bb098679015173f5 SHA512 5118129d54e4543d1632a25695368ce45078ed079874b7cb5317eac0259b1706a4c62494f1ab0cba541f6042a5b9c6d37d949d1ddf4f54ae0e40a008568143e0
-EBUILD xbindkeys-1.8.6.ebuild 627 BLAKE2B 1da223057085494638b9fd069f7a0d5ec3f7b9ed9a9e66448e90ef15461b87bcca668a83aed092762f9b8d922f76c886c55810004da4f491df1da4aeee8943c3 SHA512 7754808c9aaba270a8930c0cf3ba46d92153042bd7a215e8eaae2e31738a04002b47ec0e1502c4865ae172842c43bcb8acea3ee595131f7237791302c2bae984
+DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
+EBUILD xbindkeys-1.8.6-r1.ebuild 701 BLAKE2B 1b72bc9693648a4eee6c6233b5ae8505f73fd3181c73436f77a8ba6a7797643e56fc34ebc6b23bedaf7011163616ad3c837d94a4b7f77c5141720fe34d4c701c SHA512 c9e3d967375a19566a3c89407105faaf2f28d85113c0c61f91a1f91c2f25f682ed3743e99c9913e6a4e2bfc675171a5858291a0a681a26caa9b68eaa8fa6c7bb
+EBUILD xbindkeys-1.8.7-r1.ebuild 692 BLAKE2B cf9c27caf702264aa33a0e51f777bc1abc20b6426e3b80710919a064d947231b7844bd9d78f80cef52ac40836d97ce8b61975708cb06ff4fdd0930ebf906b5a6 SHA512 42750081b5d0d09778ec062071b47fa83407e91420ee55a709a424b308553207550d5f57ac5fbdc3b1dbdf5a78e38660bc3839e620d33cab8fabe52cb318efbe
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
index 14de366f5dcc..ff72ad31364c 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Tool for launching commands on keystrokes"
-SRC_URI="http://www.nongnu.org/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
+SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
deleted file mode 100644
index fe9f53d5bb50..000000000000
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Tool for launching commands on keystrokes"
-SRC_URI="http://www.nongnu.org/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="guile tk"
-
-RDEPEND="x11-libs/libX11
-	guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
-	tk? ( dev-lang/tk )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable tk) \
-		$(use_enable guile)
-}
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild
new file mode 100644
index 000000000000..28112e839030
--- /dev/null
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool for launching commands on keystrokes"
+SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="guile tk"
+
+RDEPEND="
+	x11-libs/libX11
+	guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
+	tk? ( dev-lang/tk )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS="
+	AUTHORS BUGS ChangeLog README TODO xbindkeysrc
+"
+
+src_configure() {
+	econf \
+		$(use_enable guile) \
+		$(use_enable tk)
+}
diff --git a/x11-misc/xcalendar/Manifest b/x11-misc/xcalendar/Manifest
index bbf95b1a0a43..97ffc7e2c1de 100644
--- a/x11-misc/xcalendar/Manifest
+++ b/x11-misc/xcalendar/Manifest
@@ -1,5 +1,5 @@
 AUX xcalendar-4.0-implicits.patch 381 BLAKE2B ea6ad6617227900cf7cfd67957109d28b5e820ae87c0796367808c2442865cc94dee718ac91550f392947b77a52bca1f952e9faac14178da4b0b90cf1ede6e63 SHA512 56c68560d2f2d75b5e7427e870189771f85994e934f7d813eaa89e34002d769b9aa1e24ab49a84a395d1535963802a249171e423e47c5d0e741e1a6e9a07fbc2
 AUX xcalendar-4.0-motif-gentoo.diff 1104 BLAKE2B 3176c538d92a776faef7fbaa02985964a64609eb5e3d79edd97d095309c2fec3e6cc0f621cadc97a09ed3e10fbeb35e627214c9f7ad758486125f1d61bef3fd1 SHA512 b6f15a68e2698a1d3f8dca2be8cc0751dae447268c6bca76aeccaa5a919dc31d3675fbb8d49d7d0d3293c50835b2628346f1ea5f7eb1da6152bb1ac73282ad59
 DIST xcalendar-4.0+i18n.tar.gz 48635 BLAKE2B 939880d749dc36973d69d6ed6f1d2c36dfeccea6d17a9ce77bde122af8c3a19bdf683b0c1838ba11a769ef4a8977a93cc1e67c40dacac4c87d2cb7a565e3ba60 SHA512 c9b3756bf857e4956360cb3efa1e185bdc09d6053e1b8db040822c73320589ef825330184fa3a8b949f94a89a6ef56438927886b3740922a4bca7dbab9285a4d
-EBUILD xcalendar-4.0-r2.ebuild 1260 BLAKE2B 5540df0555a476effd878ecad3bfe9a5e34f0af69b723ad2df858c6b93ea94537099664cf7428c60a1a639bd156a4368ac76bba953d11e785fcbbe3fcaac5ad0 SHA512 34a2074304b67ef232231bfb0f3b2792589ab67706286e840f0ac53ddb9f885dfd4458c3b2c385915faf84684990d7035ac533585491186e324c412f144f3281
+EBUILD xcalendar-4.0-r2.ebuild 1261 BLAKE2B c4a21bf2cd528d26134d591b51825d2f9894511e3933a38fea2566b81594ddb9320c7cf9127cbdaadb1dd3e173d3565caa773cacb0199c409f802fd55df0e11b SHA512 26a77861afdbf0dc03fd4ff4e593e044a0bbee77841df19e9b2c62216b42e7d41aeac7616eb57dd4450980c3025bfccf5fbcf0365d91b84d069df7e394bd383a
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index 3478ecfa79e2..b89bdea80b70 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="A simple interactive calendar program with a notebook capability"
-HOMEPAGE="http://www.freebsd.org/"
+HOMEPAGE="https://www.freebsd.org/"
 SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i18n.tar.gz"
 
 LICENSE="HPND"
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
index 9ef1dac1ebbe..9de34a474f39 100644
--- a/x11-misc/xearth/Manifest
+++ b/x11-misc/xearth/Manifest
@@ -1,4 +1,4 @@
 AUX xearth-1.1-include.patch 231 BLAKE2B 803cdd036a1018ab85bd3acc30a6f6168a3596c04dd7de7196983b6c53b10e443d2ed043f61faa35b1ab87f28496f5865f128008b604efed41a74af3effc0d0e SHA512 9e4fd1d44eeda5c79ab22ceeb20fd005cab71869bcadd17adcb1cee10157c35145e7c7aa6d3c62f3da1be83cc79763b9ad77cfaddd4021dbcb56c8efcbccadb7
 DIST xearth-1.1.tar.gz 157887 BLAKE2B 2dfc43b1a8fadeb7d30a4234496f44171cd138975e84b295e60d0f9855c1f3b011340b2b3aecb98d75fde2a71fdddb4e959ba84e89204f246915b7cd1a76efc1 SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
-EBUILD xearth-1.1-r1.ebuild 872 BLAKE2B 06ed8c47df0d7119b0687755f5329c48fbaf064e239fdb90e5395f60bda3c8957a79853c811413e57908fd5ee3731a210c03406033ed55839c1fa07b5dcc98c2 SHA512 03f140a2b0abaf2632f2ec2c26ecb100376e140f5fd4d74305a0006e95ff3770a1f64489d6ac8a1da6938ef747dbad1e9b35581724e79dd0217b3a48568a3470
+EBUILD xearth-1.1-r1.ebuild 873 BLAKE2B f3ed79afb2306ed7b166e00be122ceafb5a0affb325b78770dbec8e50a654a02f117a2c1064c15751bf1ab4e02b80d9c95b10440aaace158437d940d2c3af304 SHA512 c0f06f7772dfe7f7ffff190121b0bff693bfd286d7709ce4d4967445839af33f23488b0094cb46d5976a8b3ba52f3707f3922ac24443b43c4beb825d79ebe368
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index d46796f0ed79..52016d87ae19 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils toolchain-funcs
 
-HOMEPAGE="http://hewgill.com/xearth/original/"
+HOMEPAGE="https://hewgill.com/xearth/original/"
 DESCRIPTION="Xearth sets the X root window to an image of the Earth"
 SRC_URI="ftp://cag.lcs.mit.edu/pub/tuna/${P}.tar.gz
 	ftp://ftp.cs.colorado.edu/users/tuna/${P}.tar.gz"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index a906c0ef663c..6c80c82ffead 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -4,7 +4,9 @@ AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b8732
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
 DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
+DIST xlockmore-5.64ALPHA0.tar.xz 1944032 BLAKE2B 859561b8a4986ffc34c1a229b95779253618739d77538e1bb1cf1d3c3af473a666d2fc1ea8c64938db191b3cf2d2fde19785c0fbc3bb0f5a7eb55fa01f3aecda SHA512 b4fa3826ba63de4f118955fbd8a2e6e8f4384ba02d3aae7e900d9d4c488527845eb99fceb4192c59341eb4a3e2bb80eaae768c3f136fd636c75a495417089b34
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
+EBUILD xlockmore-5.64_alpha0.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
new file mode 100644
index 000000000000..2071d0700818
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index b85ef5de9c37..f9eed008cc96 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 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
+EBUILD xmobar-0.23.1.ebuild 2874 BLAKE2B df35ca980a34b443b73170fb496fa0cf9d41861a54d1c804b113e4e72b979799b3bb4a2134287f2374590baebc4e258f08e1175a8958d0c56dd1b4da4e8ac92e SHA512 5eb9e8afde181c8ae13da72013ca22b77ae79ed16b57f0a8dd89df395725354fd6c31f95255763e6d6d7d45520525d07bffc0044a03b7a42eb9e9b5c55177e4d
+EBUILD xmobar-0.24.2.ebuild 3017 BLAKE2B 0b304a167a5da7222cba30e8d4b88a4566e7891a960eedafe6f555e5a7afbe6434d0117fa02390d05f2ec4bd1e78c0dddca57ad57a4ea6cc87aa99bb1a6a08f0 SHA512 284eba89d9aed6997268b90d1aa0b6fc83d6c7e031bc267a071caad9308e8235bfc8c25c9b2ba86ca1cac1e070296575d10f3337c387bba9193fa9253bbe0ed6
+EBUILD xmobar-0.24.3.ebuild 3036 BLAKE2B 3d844be3c3ac6f677693cbc84c5fe4b91c59411ff03ba22a598bc27b4efb55f4bd6bda751e8ee30ef59c423be27c5c9739b1c8d18c7d762e562dfd8e27b28f27 SHA512 bb8c785a79532028f89ea28d6f77422da2a628bf6cd422f9bb0283c90063625c56730862eb8ae3b72b194f62ad0816ff97e8ddb0ef4f1254fe79c02f831a8651
 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 87e1f0c961b2..4ae5b8af980c 100644
--- a/x11-misc/xmobar/xmobar-0.23.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ CABAL_FEATURES="bin"
 inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://xmobar.org"
+HOMEPAGE="https://xmobar.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
index a2af6c18c6a3..e87d7fd1a21b 100644
--- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ CABAL_FEATURES="bin"
 inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://xmobar.org"
+HOMEPAGE="https://xmobar.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 6b9108e73b3e..9c2fcc1f822d 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ CABAL_FEATURES="bin"
 inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://xmobar.org"
+HOMEPAGE="https://xmobar.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a1c5d8f71207..9e9aff296d4f 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -16,5 +16,5 @@ DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 EBUILD xscreensaver-5.38-r1.ebuild 3437 BLAKE2B f8fbcb02b9f5927e395a13b438235cc4b4d5b8f0660253085d890326151dbebdc826ba89b401c855a86a7f037828527408cf44484478d72e2722fdd0048d7dfa SHA512 2237ff0d15867e50b564c8889d251afc7e2a08431701f9a8a36e9120ca47c6665b03be86eec4ec2f6fc1a38352dca5297fcd60d813d1b73856707447a2e14f87
 EBUILD xscreensaver-5.43-r3.ebuild 3476 BLAKE2B 573c05f1255f99c769b96c605952a525ace1ee8782e6c5408fd4a02501e584654478fededc8396d3eb0fa69b1096ebf2b9d87390a2f5b79264e61f2ad67b7c54 SHA512 525acd033e5cabd0cc7d0a03f72f7e86bcbe229c11aaa2de78a2639dc20657258416782003adbc528ae610af694429236c6f5381aec7e135b6f8a16b17726bb8
-EBUILD xscreensaver-5.44-r2.ebuild 3622 BLAKE2B 29bb402356942a6ac6addd0fd125c83ca16d4c80b92d19478604ed64fa3799d9917070f68abc825b3d023c16c6f8df2ddbbb76f7eabe96c779edac6e1598752c SHA512 7a2c229aa36829fd7fc70d42c534d63014899a2ea707cd8e0252d60e0585000e6038bfd4fe0db0b416c4cc860a9c2846350035b4033b8872c0be21ff0e32ab24
+EBUILD xscreensaver-5.44-r2.ebuild 3620 BLAKE2B 8b31476686597311466918725f85c0be7bcc566e9bf872a36cc7e9d6c5ade6eaf0a532a67dafae89a220913e22d58bfb78f0803dc8a1b60b378e096cc87686e8 SHA512 30d6c2f02e7ef813ffd5f35b8446e2ee638a6dc523dcff664e8b77751e1b253e8d0e35ea4842ba102363e74dc2c070f0ecc95c9c426119729c6483f664522f20
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 5a2b2cd498bf..60a494c33632 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index ec71f0f9a661..b90b083957b9 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -3,5 +3,5 @@ DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b
 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
+EBUILD xvfb-run-1.20.8_p2.ebuild 737 BLAKE2B 614c1d8d9efdf63d7ff78b80cb45ab25d417fbcc2f2139fc5035ed02459e2b4e17bb3dd8b7623b7397e34f59e5cf1b439ca058d6215e37b903467d7865f0d95f SHA512 e94d3e9b316c5c878e97c521d5c994412580c14f9dd3310a11899c25a54958661cde1ee2b0333dcab74c2189a47b51a4d8a4e804737754c53134f0c7aad6512b
 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
index 2680e79e2987..abcfe943c509 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /x11-misc
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)