gentoo resync : 18.11.2019

37 files changed, 258 insertions, 215 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 60fe43fa26e1..74d41faaef6d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 057bbf2a43b0..bfb9e13a21b9 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,8 @@
-DIST libinput-gestures-2.40.tar.gz 18082 BLAKE2B ef01449a6fa381361876909487460f2a11e86887b1a3885b1459c218206e80d76ccf53dbebe39d39c360bee5da7a32028673d2165c244df584ae6e8078957d33 SHA512 70c22f7225f4a1f7e0a4d0a83f84370f2649ef01d9a72756b2d4bb4be92ac2265c9aff9302642609065da0e1769b719f616e2d8ee843aca01ce66f1891732890
 DIST libinput-gestures-2.41.tar.gz 18098 BLAKE2B 792ebab29cb5ea24cbb696eac6ed651632db4079d8470784f45a1055d99c9672f8bfa7e8ddc08b80417c91a47f540fdf13f7a071c73bb7a654ce66508f181a38 SHA512 7f718275d5b4b722df52adb597f0344427500ca730c154cf6fd3de2f06d7081e6214cc954addc34594f17f10c70d081fecbfc1a22d16726b6ea820019dae6d83
-EBUILD libinput-gestures-2.40.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
+DIST libinput-gestures-2.45.tar.gz 18645 BLAKE2B 555556e683eac1944407e169d7ad9cac23fe3b91b781dbba9367b86bd73556d3e0aa550008563c4c7f6726a12dc6ac4a458f9dae5782db0d8a23dc2f12a897f8 SHA512 27eac34826c3f02a16bb5c6c892e2bcc12ed27a8a1cb64bde945e869161f30701240deebbd278318f418319f1c98be13dc90eb95f9354f624939af4b7471762f
+DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840
 EBUILD libinput-gestures-2.41.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
-EBUILD libinput-gestures-9999.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
+EBUILD libinput-gestures-2.45.ebuild 1293 BLAKE2B 61bdc8a6c7dbc604b3359f576bac1964bd260d54da3e7d255aba5d48ab191f4e753445fc58fb2230e77b2d9fdf3d7ffacac78b9cb8561f673f9f9e32435049ea SHA512 fc74cecde6abffe6929d140e6d307533e389b8841c02323785492fc6b22d976be786df3acbd7dd69ac8d6f1f7964debc562077f8ad6e1e7a8cb9da4d6c9eeaa2
+EBUILD libinput-gestures-2.48.ebuild 1293 BLAKE2B 0e10f5dcb9384c9365a1b37cd3d0bf3edd5f95f5468b40f965ac01fdfaa74d526f81752347563633b4c4a4d9d5c7be391b2c8cb0271594f6581dfdc6dfb1473f SHA512 0490fe3da3b88e2ea14462633fc1071759d174315cb276bc89f6468f07d6585a6089b8346f70e9b24fcc5067c1babcfa77c806da85bfd69668d059bad6a1cbd0
+EBUILD libinput-gestures-9999.ebuild 1293 BLAKE2B 0e10f5dcb9384c9365a1b37cd3d0bf3edd5f95f5468b40f965ac01fdfaa74d526f81752347563633b4c4a4d9d5c7be391b2c8cb0271594f6581dfdc6dfb1473f SHA512 0490fe3da3b88e2ea14462633fc1071759d174315cb276bc89f6468f07d6585a6089b8346f70e9b24fcc5067c1babcfa77c806da85bfd69668d059bad6a1cbd0
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild
index 73b3a4132933..213fbc54cfab 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5..7} )
 
-inherit gnome2-utils python-single-r1
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
 HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
@@ -39,7 +39,7 @@ src_prepare() {
 src_test() { :; }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	elog "You must be in the input group to read the touchpad device."
 
@@ -52,5 +52,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
new file mode 100644
index 000000000000..2f4a08da79af
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5..7} )
+
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Actions gestures on your touchpad using libinput"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libinput-1.8.0
+	x11-misc/wmctrl
+	x11-misc/xdotool"
+DEPEND=">=dev-libs/libinput-1.8.0
+	dev-util/desktop-file-utils"
+
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
+src_test() { :; }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 73b3a4132933..2f4a08da79af 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5..7} )
 
-inherit gnome2-utils python-single-r1
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
 HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
@@ -24,8 +24,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
+	x11-misc/wmctrl
+	x11-misc/xdotool"
 DEPEND=">=dev-libs/libinput-1.8.0
 	dev-util/desktop-file-utils"
 
@@ -39,7 +39,7 @@ src_prepare() {
 src_test() { :; }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	elog "You must be in the input group to read the touchpad device."
 
@@ -52,5 +52,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/set_opacity/Manifest b/x11-misc/set_opacity/Manifest
index 0c37bd9bb6e6..67398c2c847b 100644
--- a/x11-misc/set_opacity/Manifest
+++ b/x11-misc/set_opacity/Manifest
@@ -1,4 +1,4 @@
 DIST set_opacity-1.0.tar.gz 5115 BLAKE2B 2855de8d20a1431c6eb3d07690ec8ead5f00c80e0e25f588fe03ec0123885621053629223f82a2e689c480cd253a35abe4a3aad0629b25e69feb696eb44dcc1c SHA512 cfe702d5c48968fd283c63420d8cbbfb7a9783a339c962bd10818caaa3754bf5a044c81d4670421ceb13fe697ef461bceed0647be45a4682c8fe0a210bf98ddd
-EBUILD set_opacity-1.0.ebuild 661 BLAKE2B c26f43282774fb8f8e6bc0ced68de266b634d8511fb3c141ce835ac6d90e5fe3457bfa9dd8b67293eefb7c7414a7ad5a4e2e7933c6968d972757c793a5558388 SHA512 e04563645cb27100a125dc25acaa6726fa8965e5cc355111c3e49cf029a5d6f70139106e69aedde2873070cc1d2f45e14e8c8e91fe810518b41c3ba74ad3a4e5
-EBUILD set_opacity-9999.ebuild 605 BLAKE2B 4bec49fee39aa7e6e5d7ab4390920fceda3d6c9264c8bd93f1dac8c7356ced2a3dcb9271b83f39ccddd0efb128195aa054500d11edee9fee892760edbc60d9e3 SHA512 f475d939ef777a2db37cf4498ed853325d835363efe5cfbf1e0b3a4daef67e2e5defe68365f23ecbf7f7f8ea93ed24d8c02b71b6c7093d2eef58851278b273b8
+EBUILD set_opacity-1.0.ebuild 656 BLAKE2B 38763492d8821527bc4819160183395380825ffa8c66432ab8ca94116cf70f78ae1c10994baca80a727c42a1e5d074a8a7fc7a80f22eccf3b79edc124027d0ac SHA512 9ac413b117216a9b459748d80351090873103b58d53826d7ad0d23ddb1bfd4d471a62c38ba53b55cba40d03b9fe538f7ca75fa2d83593f0abc9385737a247a17
+EBUILD set_opacity-9999.ebuild 600 BLAKE2B c0e6d4ed8fbe35c68a050f6ea354e3b1455886b162f95489fe0cddb4b51ecf036c54777cb17f213fb23eabcd0b962b9ee6d08a80951850f21df22b8d24cabec9 SHA512 38994179db4e0282860864797c2929f64a06f5f78c8c644e19876542d5e8ca19179a3b26f471b7dd993d47c4967d461f8587e22d6401340ebcf28b4a0ccec669
 MISC metadata.xml 433 BLAKE2B e59ced912cb1cd56a0a1df00b607d7ff1a48b6ef01957b09911e4c241fe9606c4d36989d340f25b451a682cfd278bfde29c74eadb0ef05ac26a4a4a6daf03d06 SHA512 4b7e482d143aa59e044ae37007de7b08aa44f0628ee8b854e75c522eee240e54cfdd21eb6e6a02dbe0ace43baa0159403344320c6698edee878d721204ca6941
diff --git a/x11-misc/set_opacity/set_opacity-1.0.ebuild b/x11-misc/set_opacity/set_opacity-1.0.ebuild
index 6f014ba2556d..c2462bb21a72 100644
--- a/x11-misc/set_opacity/set_opacity-1.0.ebuild
+++ b/x11-misc/set_opacity/set_opacity-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 
diff --git a/x11-misc/set_opacity/set_opacity-9999.ebuild b/x11-misc/set_opacity/set_opacity-9999.ebuild
index 5d3a926a7b19..d08b2ad84659 100644
--- a/x11-misc/set_opacity/set_opacity-9999.ebuild
+++ b/x11-misc/set_opacity/set_opacity-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-EGIT_REPO_URI="https://github.com/XVilka/set_opacity.git"
+EAPI=7
 
 inherit git-r3 toolchain-funcs
 
+EGIT_REPO_URI="https://github.com/XVilka/set_opacity.git"
+
 DESCRIPTION="Tool for set real compositing for windows through window's id, process' pid etc."
 HOMEPAGE="https://github.com/XVilka/set_opacity"
 SRC_URI=""
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 2f538870322b..7adc6d3505a8 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,7 +1,3 @@
-DIST sxhkd-0.5.9.tar.gz 34649 BLAKE2B e07d9a7a99cd3ab1436ece589a57023de87c6a1e74ef509e9bfc9db3bcda9680f826dc2edad1474004775cf307b9280dc60e18060a803deb801022c004bf0e8c SHA512 32ee7261b4fa10d5a62a7fa61e689977d12afd654e81123711bda1f006e4b6baa7524352086037594e6ef1989dd8fcb6eddc1114085ee91546a69f6d1146924e
-DIST sxhkd-0.6.0.tar.gz 34756 BLAKE2B e0bf9cc50893baa345ea0dcfae096b5f76408bf1c5e8b5405a2175f33c6201c14c3683da2202cc2a9eaa07327df484f921863178b464164cdf931ca3a0c21848 SHA512 0ccafa2b29b87dcf6bdcb45b67b8aeb5f70c2855fe99c0cd2b271052cd7b6bbf5186b3ae2da3ae9b411f0766a8ab85a35b3a325442a80527a7c959280d36b46b
 DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
-EBUILD sxhkd-0.5.9.ebuild 621 BLAKE2B 05eeeed1ed437e4cec5a2ec97a33661ce59bd0a593d2903076d8e7622b3436bdf677d7c03be69af69274e97affa9f3de8d6cfbc7cd4d92633fc4e95fb636df0c SHA512 102ae432d7907d96bf658ec6f7585f6fa2f130751265bad4969193420160ab458ca26c3bf0180ecffa99d6dc8087737cd1c535d8d6dae4d4ccefd2e033a37325
-EBUILD sxhkd-0.6.0.ebuild 618 BLAKE2B 5251bee57da1c1b07e00c7b2936cb72dfab1566ae1515c71014e0626c567ce1ce4d4bcfd1c685b000e73a44722cb77d1ff968467d1c88c7abbe016b8ebbe6bfd SHA512 fbf6e5f5e8f72e7653e314670576ff1b650af3d8a604b959a5175c1ffcb723d0ae9019860db05459d74dee48c6129757b3e596a0ce566b01addaffb503ad1d2f
 EBUILD sxhkd-0.6.1.ebuild 618 BLAKE2B 5251bee57da1c1b07e00c7b2936cb72dfab1566ae1515c71014e0626c567ce1ce4d4bcfd1c685b000e73a44722cb77d1ff968467d1c88c7abbe016b8ebbe6bfd SHA512 fbf6e5f5e8f72e7653e314670576ff1b650af3d8a604b959a5175c1ffcb723d0ae9019860db05459d74dee48c6129757b3e596a0ce566b01addaffb503ad1d2f
-MISC metadata.xml 328 BLAKE2B 503f3c67609b0e822426a2d2512ac98a3d4eb384780d92e7a951ed3e04a8e5f21319315c9d23bcb1705baa617cef3a77380d3fcbb9ef136eab95c12a8999a387 SHA512 406fcd58fede7d97f38c9eaa79143aedb9b5a8a8d83670b71df62a1e7bc65f4a5e7070bd077feb31410a8b2a4bf3fc21433e25f0e51bf80bd8ec8cf57920feab
+MISC metadata.xml 249 BLAKE2B 0b2bc12f7ae01111ebb5607fbb98288f43bb8034d466adb84de626c4d98018c737afcd1a3704731096b356d47c20d28d2ba137c693ddd667e3e819a6f2904ee2 SHA512 904ccd204edf617d6951cf8d7afc075b71730802b11debb45b85f7c8892fcbf27fee1811b4d3bafef1805b5fcff271e73a4c4616a9819b209d576a8ec47cc1ef
diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml
index f4ff5909f741..72883d191be2 100644
--- a/x11-misc/sxhkd/metadata.xml
+++ b/x11-misc/sxhkd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">baskerville/sxhkd</remote-id>
 	</upstream>
diff --git a/x11-misc/sxhkd/sxhkd-0.5.9.ebuild b/x11-misc/sxhkd/sxhkd-0.5.9.ebuild
deleted file mode 100644
index a185c8b35f77..000000000000
--- a/x11-misc/sxhkd/sxhkd-0.5.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Simple X hotkey daemon"
-HOMEPAGE="https://github.com/baskerville/sxhkd/"
-SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/libxcb
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}
-	x11-libs/xcb-util"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	systemd_dounit contrib/systemd/${PN}.service
-}
diff --git a/x11-misc/sxhkd/sxhkd-0.6.0.ebuild b/x11-misc/sxhkd/sxhkd-0.6.0.ebuild
deleted file mode 100644
index 72d597e89864..000000000000
--- a/x11-misc/sxhkd/sxhkd-0.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Simple X hotkey daemon"
-HOMEPAGE="https://github.com/baskerville/sxhkd/"
-SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/libxcb
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}
-	x11-libs/xcb-util"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	systemd_dounit contrib/systemd/${PN}.service
-}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 5bc8b273e9d5..ad9aa466f6de 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,9 +1,9 @@
 DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
 DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46
 DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
-DIST tint2-16.7.tar.gz 551525 BLAKE2B 890018f219cac86dcfdacb292799ef83a4f039a6c617bd719d57eed317eb5882889e5241283aeccccd3eb174f3d20a5d2468c138f613ad62503a9d365a54c59f SHA512 7f0a7bf8514d698df078fbc4103f82ba926aba3eeef709cace35de1a5f5dce0ac00eede7445e62ac19ef7b84da9fbe7dd61c65f3fc4436bf34997bdee511c5c3
+DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729f4be3e1fd7421c6fbdbbacde70f42f3052547dca8421b8343d4b41fbf2ea52b07aa4471974f9f0cc6eea7a7 SHA512 a9bb0b55536e09f70b1d14a5748635f5c5ec1b7b22517453a963b240ab593aae43c56e5cbc7b79d5f19103f0e13200faceb2d25afd66c3d941580424ae6d9d31
 EBUILD tint2-16.2.ebuild 1273 BLAKE2B ef37602f6f90f16fe0b6fef490bed60e55b326437d925cac0187df093c16b0038eb2e7460db16bb8f02881a797064510076ac7f8f99e26a43e6b85fbf4ea8f4c SHA512 329bf5a8f20b644e6fcc5e382cc72a8d1fa3766f66e302c3648d59c7f9495efb3babe31848772116320dc0df23f687d86233859fafd54f762a46aa26e2db132c
 EBUILD tint2-16.6.1.ebuild 1275 BLAKE2B f8cacb894d6955a00e3432a2ebc3de37faefd9e1c07a6da5da3cf288d7382a63252bf5b88ab87c085b3eb2616da7b133e15c04212407df5133b36ca33f92f472 SHA512 82db6f40551561c1ffa5fd315380f929f3747de63cedecf7e2ea66845db444aba2dc350b4dfd32f90172af750917e3a5a28044d5a7fceb08414e944218ac0893
 EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
-EBUILD tint2-16.7.ebuild 1304 BLAKE2B 5d5c14c66aee6484b50f0cf20b8a886f7daec06ae8ea5c7f59310f2a152e2efb138a1c911894042ba1e93cbac97c11fc53d06c853efc70c093c92f927970af8b SHA512 92c823c990d1129a66707559d935e14bcfea0c06e473af9cacf2781c3850aba8da6f19a0111f2a3bf4369c5342c761beb8b0519e62c8acde13c7b81aa9077043
+EBUILD tint2-16.7.ebuild 1302 BLAKE2B 6ee304f17a1cece110573b6b60eb6644ea90325f132f8c2fe7c2a94ae6197e0cc54fd227a8fc146893d7f7456dcaeabd11251d4b51adf53f37431f2f9edeb167 SHA512 f9b8f0f7cddc8abea6940c0810ff88e80af8173b27bf6351a70ca6582f37cb65c6cf48494935b2fd85b184bf32bd22aee3c42b9bfd742363901a2fb798c614f0
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-16.7.ebuild
index 40278f4826fa..1a088f5d1abb 100644
--- a/x11-misc/tint2/tint2-16.7.ebuild
+++ b/x11-misc/tint2/tint2-16.7.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit cmake-utils vcs-snapshot xdg
+inherit cmake-utils xdg
 
 DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
 HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S=${WORKDIR}/${PN}-v${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/urxvt-font-size/Manifest b/x11-misc/urxvt-font-size/Manifest
index 4762a92405a2..216b1480a0f0 100644
--- a/x11-misc/urxvt-font-size/Manifest
+++ b/x11-misc/urxvt-font-size/Manifest
@@ -1,6 +1,4 @@
-DIST urxvt-font-size-1.1.tar.gz 5490 BLAKE2B 5e9388c25a143a41d84511a03c8821058568d2032cfd4f3f9929d66d47273be0d091ec8787485cf2eb02a9a2f4a00160d745b72cf9c2c8c552c2308dd9cc8260 SHA512 923cf79dc11cdfd53bf7f0a5bc909cc80916f9e956f1aadc2cfa609d1c9c33211c0b023f5dca4c56a12acf7d3c70d7229e5a78783d20965964511b5f6ad01b1d
 DIST urxvt-font-size-1.3.tar.gz 6276 BLAKE2B 55d0585d8bd817bb39a0d4336f4627592ae7805c03484a273d4151bd81454fd740ac675649d6ed7643cb78de5d911f2aa3471426ffec8770673096a13999b810 SHA512 546c3cdc1290bac934b36acf74c6148c43385d2cfdd3141afe5a8fe369477cc219d1db5c9d98a53678de4d297fd541d49ebbd702f80f91dd41a11aeab02270e7
-EBUILD urxvt-font-size-1.1.ebuild 674 BLAKE2B b63126a49961d9e16c30ad8a3ce8925b20a1d23f8ebb92bda96961f7f9bb8552e6a68fdbf0294f99e98bd3ec4dc05f1c01be8ac4762a38c2a7d055ec494a64cb SHA512 469e221f2efa870c9fd40621cbbbdfc1195b7e73fbe7d31df123e4900d1ebb51c6a30eb1090765a04960adf9a2352cef46ab19332258544a5289d6bfe10f7af2
-EBUILD urxvt-font-size-1.3.ebuild 671 BLAKE2B 1d3f2b503caeb75d8299cdeb161b035208d82fba9370e6f610333adfc62fc9893c8051879c479c47f8d6b9972a76ca9305cc270829a44a5e5699f79768d57847 SHA512 4565c5e074f4b8e848b95facb9bd9b6a8fbdbc58ac925808a8ceb767b6132e97cf2f5506745c19712c049bc12c1653ac8f6df029da37c3179396ce305e34999b
-EBUILD urxvt-font-size-9999.ebuild 676 BLAKE2B 1af18bf3e152c753259cfe1c29463b155c230783d508f89e19ee9f68ce97d24322d90d9a0082f9bbede26b7e850d2ba6de312c62e44b752c995bad66d123164b SHA512 936d1d0cea2b7ed2ecfad24fde158353998f5d2c5792faf15634928dc8010b851330f31899b765d8d8f770becf0edbd018b79a328baff7df265c50e39952e629
-MISC metadata.xml 337 BLAKE2B e279a1905d82d8a310c26ea83cff2147cc909dac9650a51b48aa1863d7a10573d284d786dc2ae95ae9a95d1c1b4717323ef470341f8ff9dbe4b7a3f65f3b2b28 SHA512 4278134484822c6a8c9a1538301100c0196f3e32b4c172f21fb56af4db4a0d759a5813f7ecbfee23a25fd2b8e4c880a9e2a593135bb4e70c1b4101ea4277b218
+EBUILD urxvt-font-size-1.3.ebuild 654 BLAKE2B 097107c8e5f3bfaf3e8dd12bff913c35a64af0065b342ded4266bfc5b49b2caabe0dcdcfffec45b73dc355cb0142b2923c84c80c33408788501c3351110eecaf SHA512 1580821889087414f3b0a33aba73c62684ae8b019893d94dbccfe08f1e9a585ff821c3c5b8075a14e80b76812e433d19a9ee1b26d253c8831456eea696fadd4d
+EBUILD urxvt-font-size-9999.ebuild 656 BLAKE2B 8fb55dcc9c37c8d770da9a4c11c9c61e95319557d3e35510534bc0a2f05115dae242313ceea4e7f47ec9debccac87641c40d6252cab1f0e8461ac8600315118b SHA512 30260f23582693d14c28d3cba38f6e0a68afbc6f0d8907d5dc1c02dc355c0bfd2e263a58f53be53d619534f8360938bd4cee3678a619a040a7dfae2f178f348d
+MISC metadata.xml 258 BLAKE2B 4a469a788905e48365263727c1c2fc49fb72f92e52ef6eef8a28649572e32a8e4231956a49b53dc24faa0096f2ae1416143692dd98d9b5dbf54a8ef940b08483 SHA512 c5e1909f0e58704e382c14034a7990862edf9a4fc6ae1e4529a63c70fbc9864cc9a8c44a5fb9ff35625546c6beff4149c2644e1328fdba853fc98c09cbda29a0
diff --git a/x11-misc/urxvt-font-size/metadata.xml b/x11-misc/urxvt-font-size/metadata.xml
index 325ca78ce984..b987c98512a3 100644
--- a/x11-misc/urxvt-font-size/metadata.xml
+++ b/x11-misc/urxvt-font-size/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">majutsushi/urxvt-font-size</remote-id>
 	</upstream>
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
deleted file mode 100644
index 6e9c01b1a6e1..000000000000
--- a/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/majutsushi/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Perl extension for rxvt-unicode to change the font size on the fly"
-HOMEPAGE="https://github.com/majutsushi/urxvt-font-size/"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	x11-apps/xlsfonts
-	x11-terms/rxvt-unicode[perl]
-"
-
-src_install() {
-	insinto /usr/$(get_libdir)/urxvt/perl
-	doins font-size
-	dodoc README.markdown
-}
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
index 2820f18eea02..9f9b11e5ab50 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit multilib
+EAPI=7
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/majutsushi/${PN}.git"
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
index 1c2ed2ed18ec..7ed3f5eb0668 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit multilib
+EAPI=7
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/majutsushi/${PN}.git"
diff --git a/x11-misc/urxvt-perls/Manifest b/x11-misc/urxvt-perls/Manifest
index 884f814d4d18..32b426c68334 100644
--- a/x11-misc/urxvt-perls/Manifest
+++ b/x11-misc/urxvt-perls/Manifest
@@ -1,3 +1,5 @@
 DIST urxvt-perls-2.2.tar.gz 14300 BLAKE2B 9b7502b6e4078f4d789e3f3c36881123ea2472c4b86972985b87e7ba88b61bfad637fe6235a8791f31e422da1abe9d07d21b8cbeca8f42056fbb2ce1bfaab5b4 SHA512 3b6c9b71ee2bc6a64762c2c9255ce52c489282797fb2859c17bb83eacae44bbbdf7f22d47de1bb0492753e7cd685fe4bc44c71421a19e162185ad60331b84d89
+DIST urxvt-perls-2.3.tar.gz 14717 BLAKE2B 312f9bb46839b9bd1e702ca80a6ab02c64db3f74345c9dd7a8abf6b7e66126e6ddbc27e85a4046f745b084780e4c7fb0877729764f860471c9ba80104d3493ac SHA512 d941acb6353b0a7a34cefc94064466ee6b9e879a02cb76a10cd14c37e616d05d6e36a156aeb63191dbc0876c00ee927a3b48949d833a9d12b4676cfb0417bae6
 EBUILD urxvt-perls-2.2.ebuild 538 BLAKE2B 83beec57734cdbb0858e4ddf90a70cf8179be9c400e9f61d6ce78a44c6fa74109f47a0d4794ca8ee9dc538980571516c9c88d51c6573a839f544358a95724190 SHA512 9dafeeb6af3469b6e0e7b83875f20c752e255a8393dfce776817bcdbea7e8d9c1b1f745f6d8435d6ce220a37096cabbead2f70434d1a277cb26bce2f6ebcd713
-MISC metadata.xml 331 BLAKE2B e8071ef0d3d42d456a819382c83ba38c4ac5348893259559601b537d1baa828d90f2698455c9d34f2757002fea2615873f3392798dbd0095f15f0eb37fcefee8 SHA512 66cbc7e6ca69fa0001a628f61f0941ed882c2589d67f77edbec95a2c21fbbdf19ec79ddc74aff1adb1d039ff2646b714267093ce2ee46d28d6451ec616b55492
+EBUILD urxvt-perls-2.3.ebuild 498 BLAKE2B 1da9328fdd16f5f189d22d1f381686da40373ef439ed5819f324ca4c79e4c1adee503d65ae080e4d36a74b7167fba6625f7b363ab8fc2fd460e2b78d42694325 SHA512 016516f96ea623c91bb23bb8a1d318d63014d3dae4d8cab9950881d8369a81509afdea4b7a2445d9f6ca91dc40346b1e3c060dfa7cc40bf8adc28515570649ae
+MISC metadata.xml 343 BLAKE2B 47097c29ad26e39a51ba211011f592a6893edb60021ffc723615624e48fe1768decf5caa4ac362b2718ee26a8d214b028cf411be088221e8b3f49728de84fc90 SHA512 b95747387d85d46ebbdf0dbca69d091d01124b69c8a758223c247be91944d44c01343d4d46eb97cc138093fd2cbf9abf27ecda76d432b45fe4f3e6981049adad
diff --git a/x11-misc/urxvt-perls/metadata.xml b/x11-misc/urxvt-perls/metadata.xml
index de5f98c37a45..67c8b7560e0f 100644
--- a/x11-misc/urxvt-perls/metadata.xml
+++ b/x11-misc/urxvt-perls/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">muennich/urxvt-perls</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">muennich/urxvt-perls</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
new file mode 100644
index 000000000000..9374ceb4c882
--- /dev/null
+++ b/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Perl extensions for rxvt-unicode"
+HOMEPAGE="https://github.com/muennich/urxvt-perls"
+SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="x11-misc/xsel
+	x11-terms/rxvt-unicode[perl]"
+
+src_install() {
+	insinto /usr/$(get_libdir)/urxvt/perl
+	doins keyboard-select
+	dodoc README.md
+}
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index c57f15ad6dfa..9b5aa9ca1870 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -4,5 +4,5 @@ DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738
 DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
 EBUILD xautolock-2.2_p5_p1-r1.ebuild 1239 BLAKE2B b1121134e2e9e4da0397ec4a01e321664faf086410a96f0d5f73c04a3a924fab4ab9e037ecaf2cb0d27b5fa50667fc7a16369f2df17e4f146a71508d06c15339 SHA512 fa6f130ffc11cd59ff0b81d1de4835fa5f37c9a5fd33fe9d6697da23dd14c66f6641b227ac346b4f494f410c8f1d0e5a19510fa3da975b320dff235d0e28248b
 EBUILD xautolock-2.2_p5_p1.ebuild 1377 BLAKE2B 57065aa8645601ef4047d84633226029a324fbfe057ca231db535169c8726c74ad47dacdf894bfba558d374c209b55c5eea51eddd0448cedead839a280ec8099 SHA512 4f2acd15acfb25139ae95d12e5755909364a0b6c60e83d1c7266ba46406f64ad19d03db775b9890dd5b786545db9c0871c98ac05c4f678c1bac06dd7817eb11e
-EBUILD xautolock-2.2_p5_p2.ebuild 989 BLAKE2B 64899b781cb5771b5545b06de677c208b6938329cefc8f263668c9100240ac3012a705654a822eb38a3d5af263943d6021938f76f21d110e935938b3923b3056 SHA512 60425c76f8c41d9765d5b49f09bb97e1ee57b61d425586b96e268a84ab43f15ff514bd20518f75a0d8a0d4d70e4b399d8afcf00a6290a850d4e4d032f8c4f7f8
+EBUILD xautolock-2.2_p5_p2.ebuild 1001 BLAKE2B 36c80761ab99443c1a29ecc3e3bf80018c2228982284008c6d3fedf214f843ec11d005c99112df379ebf7ecbb5d7d329ad8fc46e01b14813a16646cda91e8d51 SHA512 28c65f06bafcf5afa3e817299ce7f3dcf107d2d0ad196a0aa671b9eac48de8734b46b74063dd6ba5c07218f2281004f48b51becffc3fe0418b0135ac40a21f67
 MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
index 4a586f59b320..b83b2f63ac43 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	x11-libs/libXScrnSaver
diff --git a/x11-misc/xdo/Manifest b/x11-misc/xdo/Manifest
index f77684812f3f..2860484e1af2 100644
--- a/x11-misc/xdo/Manifest
+++ b/x11-misc/xdo/Manifest
@@ -1,7 +1,3 @@
-DIST xdo-0.5.6.tar.gz 7191 BLAKE2B 78bfeea3b2661dc06446e3205e64c609864992399dffc2ae5e99e9487a5e2b6d2cdd09ae5cc815b578ffb635abf649f6a892d80199196220afadf2a0c7693ad8 SHA512 0366f1eb473db32909619b9d7059e6528b071d920a3148c6f31b8911fc0cc5e0c9f8de56d95a0dfce29d554c76cdf967438d99c267826416bb03487efb78346d
 DIST xdo-0.5.7.tar.gz 7453 BLAKE2B 04710f0a52dba22ef6e5556884ccd6a584e68167511f596aabcd19553d14a3b8d441b1a3d94cb927f5af3c9231690a9954ff8126d35f71a17d85d6aa3a31063f SHA512 0978a8571a35899c916495c9d38458adb6c766db4d498dfacf2f0a46e373f7caa3c3e227096b3e60e03c67b972777cf7519e5b6eee7ebb91f82d4450ac0ff98d
-DIST xdo-0.5.tar.gz 6853 BLAKE2B dd7937ce36270803bf0dc08c2633bc75564b86535ac441b7a11fa6b41568925e4f4139f03ea5929d852a0b6b35cd5f61775e37880a43a37301cafa01382e9e0d SHA512 a33a1480d45b641e471a65b93ac6d5b8c1922559370590a49dd27f5ff139ad59484e4c82266f1a0c2e2c8d6d237a56fc7122424d1270f34f7b9ba616fd04e486
-EBUILD xdo-0.5.6.ebuild 591 BLAKE2B 9c6a989b1f3131932cbcb9a0f128966f82db575c82a1b1d054694bcc68ed0647e3cf7614db755606600c9bdc2c235bd3bfac15fa60963727b749faaa92fbc02c SHA512 2c869d592d97bc9eb2ed24d989ac3ae82fd8342febe64f5a964051ddcd7138b051e1935894d6701afb83d9c4973bb52980a24e108b4544fc1045af39253e3758
-EBUILD xdo-0.5.7.ebuild 591 BLAKE2B 9c6a989b1f3131932cbcb9a0f128966f82db575c82a1b1d054694bcc68ed0647e3cf7614db755606600c9bdc2c235bd3bfac15fa60963727b749faaa92fbc02c SHA512 2c869d592d97bc9eb2ed24d989ac3ae82fd8342febe64f5a964051ddcd7138b051e1935894d6701afb83d9c4973bb52980a24e108b4544fc1045af39253e3758
-EBUILD xdo-0.5.ebuild 572 BLAKE2B a8c73ca90f9b959e9058aa39d5d9a7086f551a2d6d8de136cbe06a6e880c9df82d480eea22c37f4d25f5c9ef36fc8214c8c1518acefd0b3dc7f8c827ca50c47a SHA512 c3a81e361926988c38801fbf021ea02a7e610a0b7affeac5ddfbd85ddccf7608b5d801f7518c876f9c7af9f6978e3ee442eddafa5df6fa16a650f9c9ec166069
-MISC metadata.xml 326 BLAKE2B 6b7c44015e5028e8da89dec9c031b64f6cd2cb008d6e189bf04bd9d4eab50361484a3d15582ab16a268ccee023c216805eb2beea340586039cba63d8dca7ec6c SHA512 bae24931944dfc68919a1776cd4563aefc0e772e7cfd2838a93a1cc8b1f15383ded32fda000944e5100bbd40a5d993e2a55d6c7ffe74515442cbb4bd1795fc0f
+EBUILD xdo-0.5.7.ebuild 588 BLAKE2B 4b7db2710a663659edb20c4ed137df7b1c6233f14cf47c6214d122743f366867aeb4f09fbb5710ee596903970be1992218439ab7fd954a78afc90cb491b47f29 SHA512 6f57675e007bda0c1a443660fed4b1e6d554e58f14a68f7731b22b10a8ba4a4d69a097822c097105a0773bf49316128e5991d3f927ebb0bbaa3b313863d89cee
+MISC metadata.xml 247 BLAKE2B 4d6350acf678da5cfb6cd71da6fdde8bcef1404298761e9a1556070df233673d9449d34aa3014928febb328a55a8a490442b968856fc1b6d1241d078b8be7086 SHA512 340ac9632fe27bc90417cc5f4e5c267a7ce660be1e80bacdc62b7016bd1af14d7b1d955129e8b63fb348a7c9ab4572ef55297cb53cf6e0d423178749c4ce5c17
diff --git a/x11-misc/xdo/metadata.xml b/x11-misc/xdo/metadata.xml
index 68c50fd1490e..34306975350b 100644
--- a/x11-misc/xdo/metadata.xml
+++ b/x11-misc/xdo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">baskerville/xdo</remote-id>
 	</upstream>
diff --git a/x11-misc/xdo/xdo-0.5.6.ebuild b/x11-misc/xdo/xdo-0.5.6.ebuild
deleted file mode 100644
index 785b54546acb..000000000000
--- a/x11-misc/xdo/xdo-0.5.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Small X utility to perform elementary actions on windows"
-HOMEPAGE="https://github.com/baskerville/xdo/"
-SRC_URI="https://github.com/baskerville/xdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-}
diff --git a/x11-misc/xdo/xdo-0.5.7.ebuild b/x11-misc/xdo/xdo-0.5.7.ebuild
index 785b54546acb..ae6c203a1266 100644
--- a/x11-misc/xdo/xdo-0.5.7.ebuild
+++ b/x11-misc/xdo/xdo-0.5.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Small X utility to perform elementary actions on windows"
diff --git a/x11-misc/xdo/xdo-0.5.ebuild b/x11-misc/xdo/xdo-0.5.ebuild
deleted file mode 100644
index a3b6c5acf16b..000000000000
--- a/x11-misc/xdo/xdo-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Small X utility to perform elementary actions on windows"
-HOMEPAGE="https://github.com/baskerville/xdo/"
-SRC_URI="https://github.com/baskerville/xdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/libxcb
-	x11-libs/xcb-util-wm"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-}
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index 47ee6a9bd7a9..e26d44a1db88 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,3 +1,3 @@
 DIST xiccd-0.3.0.tar.gz 31676 BLAKE2B a6ef614a5f34827011196474fdf73c0cebfdd6af25f0ee8925edadf4e3338dbb17a43c2da3cb1fee3531f4bbb3cbd760fe350e3860451e7188452cdfd595674e SHA512 d507d91ba1a6d702c0ca63d1583e0ba330210e8c143ec72b866fd042ed9b8987820fb793fa8100077d59f4c01bc068eff68b8377ed4156956ad44c07f448a45f
-EBUILD xiccd-0.3.0.ebuild 503 BLAKE2B a066dd0112e9d6affabcd8d57913115adc1bec2dea1246673b046427e8e126e4e1889f33cd38153cd9e894ca0be35b0620efb61fecb63485a7db4b93071f21ad SHA512 58129d49c22a3f9f92974e38a67f31bb77457471c1112e416cfe3492c5a602fc4bc3869f76fece4f9149286f8675a54260aa49eafb624245f321340e0b177990
+EBUILD xiccd-0.3.0.ebuild 502 BLAKE2B 18a00b11c96bf19dcf8f7c06f23d48de2f66a285ab9c3eac023028b3be4b345a5bfb12ad1583c2f84fe462d2aa8dcc4b89c76a44c3f7928931062b0ab5a21c93 SHA512 b6691aee673744b53ba59f93e0f88fd526b6e895e70a0a3202051b116099a123d01ed1af04bd291c82a58fa89ebca7c6cd8bf3cc227d9009533d88be3da3789d
 MISC metadata.xml 764 BLAKE2B 386c639b7452560295dc0b25e0dfafe126c868d4749711125faf5aa57c027d45ac69ce658d09f775504eea2a8ee9d1ef89cb821ccf695d17506fe14639d847f8 SHA512 91b048281b6c4ca83e6ba61e870e5f04b90bae2668727edf18946c1ee703284b48a4caf4a1f259c80106fcdcaba91c10048c9f4569a2a5b45110a8acd2e1b2db
diff --git a/x11-misc/xiccd/xiccd-0.3.0.ebuild b/x11-misc/xiccd/xiccd-0.3.0.ebuild
index 2a0748e9c409..680cb69d1d70 100644
--- a/x11-misc/xiccd/xiccd-0.3.0.ebuild
+++ b/x11-misc/xiccd/xiccd-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/glib:2
 	x11-apps/xrandr
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 32853305d749..900aba1c5ce8 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -5,7 +5,9 @@ DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
 DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
+DIST xlockmore-5.60ALPHA0.tar.xz 1937452 BLAKE2B 2d28455064e7648a89ed9cee981215a1c13b21dab5b11f08aeb6bcc0618b9a4d06dad3bf340dd0895a766d23bbd7f9a32bb1dc00526b9501b3c45c0b38289a83 SHA512 d91f5a14ba2da47d52244a44f58c47c5f8553c439d48051e2221bd8a94d05a402b249b87cd6d5d18aa10e3370e6b8128de0066171869628939ce2de76ffd4b90
 EBUILD xlockmore-5.50.ebuild 2163 BLAKE2B 52abfa6475f3fb306d1e12b67635e528adda29e090ae49f937183928210bd4e68ccdb06098de572f19e6c1e10215190ec8ec247fdd5dfb955e4cb8ab349d8435 SHA512 dfe920659978ed6e48f975e46433841c677375b01893be7b1495687869b863908c37b6316091fd08fdf9b7908e532a02999792fcf9ce27f38a8809df5a5d41a6
 EBUILD xlockmore-5.58.ebuild 2375 BLAKE2B 8a83968aa78a3a3055f5450f4c582ca2235efad89053c06af74e0f44e51e362e699665e8e6f47b33124a58e79fc053e11a909b4842fcf82b155db5e43998768b SHA512 a541a9e95dca77248761fb3b00277a42240da352ce2c9e2cce589f521f60648213d83ca6c2f6772a89907397a86581abad0e7bb1f165c6db38891bad9232b3d2
 EBUILD xlockmore-5.59.ebuild 2378 BLAKE2B e76f0fff986d24fc94a770104dfd46591afea04c0e0b3534bc031c3f5e8cc0123a10b8cd26731bfb428cc885f925476cc3b33b3627a0cb715f1767b01a003392 SHA512 52c181b813bfc1c8f0660c27c0319539ac12b7e5680e364febaed17ccaac139d062ff81b079135af06d6e06f48222c5851f6a78460a11170551b01be21ce33aa
+EBUILD xlockmore-5.60_alpha0.ebuild 2378 BLAKE2B e76f0fff986d24fc94a770104dfd46591afea04c0e0b3534bc031c3f5e8cc0123a10b8cd26731bfb428cc885f925476cc3b33b3627a0cb715f1767b01a003392 SHA512 52c181b813bfc1c8f0660c27c0319539ac12b7e5680e364febaed17ccaac139d062ff81b079135af06d6e06f48222c5851f6a78460a11170551b01be21ce33aa
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.60_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.60_alpha0.ebuild
new file mode 100644
index 000000000000..b6375c41cc74
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.60_alpha0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 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="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://dev.gentoo.org/~jer/ax_pthread.m4.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_unpack() {
+	unpack ${P/_alpha/ALPHA}.tar.xz
+	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
+}
+
+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 d020e7fcf9de..a07f9cad3c97 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 2879 BLAKE2B f8190f009a90e65399b18737c0cae75e1ea078166df656119021860d3844d6a0e90b19de5a98666961203c7d9ac82336b64b719befa80cfe18c5946fa766a6bc SHA512 0acad8ab127e2b401f6e8a1b901b196f7361ac3a3d68c890917d84dd395803e8bb4dae03f8583c7029b13fd2dc241d108044ae581bd8b56803dc8e95c9b4344f
-EBUILD xmobar-0.24.2.ebuild 3021 BLAKE2B e2c16299ccda5ea212c6de84c5fc71561c9ef3cc0b4a9b2848054be7df9c8c759dc2b7e8ed7a99c2673b1c48f8f41c107c2763a2950adafd7602fac426408163 SHA512 6b8d275fa0fd6869c7f0fce9d42ef3ce2207f993e9a32e2d58bdbed8409273b74b8e4cacbb90c4d6578e08b5cd2c79220081737f75ad20fff6c0cbf046ccd042
-EBUILD xmobar-0.24.3.ebuild 3040 BLAKE2B 82cb03e63b26cebd5d2c46b2cb2d412dd0d2f459910bbdd2717fedbcd64dad3968434ee1ddc4dc6f73538a93d6cd829936d039e2c7a1b9be6cdd6f694b6fb5ac SHA512 c8316e8d92a8b16b62fdd5712667dde7a89b399db347942ba140a971d4c5e58b3cc16981ffa8dca7eb00a29c29688a90c2589fc16a866c399855839be11538fb
+EBUILD xmobar-0.23.1.ebuild 2871 BLAKE2B 0c8464231ca7c52255d52881d236d9aae2c0c2de293b8376e148c276cba17dfaf03ed63abc56f587c26f70cc3a6ae790a4777a2fc61fb00c704270487e1e9f51 SHA512 37d8e2a7afbd9342cefc50b0427bbafbe076935be02aeab1f5f3239854de808b2d95b47765866804c42c452be3d114d562e9ecb434c3a80cdafd6017b381625a
+EBUILD xmobar-0.24.2.ebuild 3016 BLAKE2B 771e81a53ddd58930424201798309e89490226df2b03fce58c9741554459329dc12fddefac1642e06727b2a997185f7231c01dd28366334834ecccd58640c453 SHA512 9fe36557429842fdbff4d5de4af26792a08662d816d8e34b308b6663e57e1965570b77e94edebdf082370fa80c72866708c70a1c833f47f3c12619790433f48f
+EBUILD xmobar-0.24.3.ebuild 3035 BLAKE2B 0ef34d81a4b6a6a5c78a21693f03bab0ea6c2d12d70c8a11208542abeb80a8548545769a4c63496fd151ba167187add94d565068cfd14ed5241a23324a8eee44 SHA512 d5897c0ce8f6582e56f759bd61f61ecb06c65b2dbc4c9b3b12dd925626793a9ff4671e27ea88470b161e9e87a0cb8fb2fc093e57751510d195ace6fe3b9e5b7f
 MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
diff --git a/x11-misc/xmobar/xmobar-0.23.1.ebuild b/x11-misc/xmobar/xmobar-0.23.1.ebuild
index 042e167767a6..9bafcd89fb83 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-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
 HOMEPAGE="http://xmobar.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
index e6856fed386e..a2af6c18c6a3 100644
--- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.2.ebuild
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
 HOMEPAGE="http://xmobar.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index fbc0b390b6e6..6b9108e73b3e 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
 HOMEPAGE="http://xmobar.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"