gentoo resync : 06.08.2019

20 files changed, 116 insertions, 484 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0de8df69ff81..4ae860184660 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 371d168b8291..51bf75a65de3 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,5 +1,3 @@
-DIST kronometer-2.2.2.tar.xz 123980 BLAKE2B 2652c2a48de5571de22a95aa0b42f4b6620fb538033c0ec7d2c63c8ae8729b6feeecd8b7acc9c7542fe6eb2be0fb145a9dab53e5e9f97ff0511e2a12f5017dbb SHA512 2c808d7b3fafdc2cf507b0bb64be1b36be166a43543b18569e430d86f75cc64505de9dafd9a06e5b8b9e7fde0c0e624f598da7539026885b12585e3628067f93
 DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
-EBUILD kronometer-2.2.2.ebuild 722 BLAKE2B cd9fc9acb635b73be2d07eac01d27d63e6e1eea6e2bfdc2c5e3835eb8b6e5e419561d14d9b67e22b42cefa062dcdb94022be07741be5205174add487034bfc34 SHA512 87c7afbb47a6d16cdb60caa7a440a063b2c25102fe2d4894e32ec60b29321153a57fca00cd76f8effbf08eae8bfbae16097d0f534bc38c0d44da391cf408cc3f
-EBUILD kronometer-2.2.3.ebuild 781 BLAKE2B 246e430c726c59acbd0e030f9b405d5e8b8a8a6898bc5b92acc152e1c6d9abd22f114f776ea7320b94a64d6af89ee0ac10284cc6e3ddd922f4353518daaed8c1 SHA512 93342c3a41209a2ef5a5001e4a92f1889820e78e6a32564930bbc3727b97f1b6740958f83e8d5bbdc13044f7082a2ea64a4ad8c617fb09a581e181e79f4a9f29
+EBUILD kronometer-2.2.3.ebuild 780 BLAKE2B d36bcba9f9214a0b621587ef5849bb8c1479589ca6bb782814c3ef99a703938cb1cc46ddc3a67e3c8a647bdb78a3b0802867da2010ac526086a343e88fb1d2ae SHA512 2dbbcb04fe9d530cb9c5f05d47ee3943ec727c61f4c805d3f3341444c4d3e0d8a20a4124f18a3878e76f3b85f83fad38eff5215761d806423395fa5f775d34d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-misc/kronometer/kronometer-2.2.2.ebuild b/x11-misc/kronometer/kronometer-2.2.2.ebuild
deleted file mode 100644
index dff9d003d23c..000000000000
--- a/x11-misc/kronometer/kronometer-2.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Stopwatch application"
-HOMEPAGE="https://userbase.kde.org/Kronometer"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild
index f7b40cd35ae5..906074ce0a76 100644
--- a/x11-misc/kronometer/kronometer-2.2.3.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/utilities/org.kde.kronometer https://user
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 3876855ac51d..2f538870322b 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,7 @@
 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
diff --git a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
new file mode 100644
index 000000000000..72d597e89864
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
@@ -0,0 +1,27 @@
+# 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/vym/Manifest b/x11-misc/vym/Manifest
index 641e88dbffb9..abe8fd341f70 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,8 +1,4 @@
-DIST vym-2.6.11.tar.bz2 6769869 BLAKE2B a528bb84275800f2aefc8a67b03d7b5dcdfab7e8f0f64f42bba46cda8c9dfad6e16aaeecf778b8bbbd99aac5d28bcbe2ff1c3546806395bbaf40f659e42cd31f SHA512 d6ae8346152ab10e12a68f25b4c13c4d40e1a8471df348ba0df9c05bdbe60f86a97912fcca268ec510246fe655a7dcc2d2e9a9332daee09a2a7dda7d6f880aa1
-DIST vym-2.7.0.tar.bz2 6776315 BLAKE2B 1b25f1fc6b08f9582c2df716db9f9361d89cbe1d96862595eda59708bebc08db1d28755516e4096b63427cd069c59c3542d58c6572ac723a97081033b5e97eaf SHA512 4da1ce7f62e29dca798646a114544b5b4b2d42b0b030113eb231c5cb0d8c990c78fcfb78bd47ce1f3efb43647fa8033d1d8eb87907f6c7f486b4dea552e345e8
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
-EBUILD vym-2.6.11.ebuild 1409 BLAKE2B 0603472bb4ae494911dd38511e59e41104abd92b99efaffddff178e5a5b6d7ab5d1d0f31f5d2ade4535221227b2807e411b05e630b8983b8d3284a2ccece6af2 SHA512 de7db950fdde7195193a1be7808caa1d3dd0ca33d66e66c3a388af5096d0527472db5b745c8069b42969f53a3677c451f3eba0579d1306221539b276633967b7
-EBUILD vym-2.7.0.ebuild 1404 BLAKE2B 7a59a7574a500296fdc3ced293d086aa673c0d6640f23242d6fade6d3bbc24ceb0a57b29617dd5a3260af9023c6b695e90932b70d278bffa05c88c584a473944 SHA512 7949993038fd707ce724e5a63e4f4405f20e4ef5b6fa8a4906da67a1ee163ecfaaee1ccdf654e2820739c367ca251b45dd6d4a5fa3828f2beb241198882ce54d
-EBUILD vym-2.7.1.ebuild 1411 BLAKE2B c21f2b833eb6eae27cbb154246189d14f32c4aac7a8996d01e5c0039c76d44b53701c40111e676b1f467644fcd00f27dd394b0ae49aa1a1efaf663d21de78dae SHA512 d8bd941230f65f6cba40baec9c1b68dffe58367a5f060657ffcd6e3fa3ec2dd723db9ba7f1cda8ba25192f9fc1e15e71022e6cee6ba0b323ad86a4b01e46fa5f
+EBUILD vym-2.7.1.ebuild 1430 BLAKE2B d1a9b288dcd069e383da292d4b14ca824e55e71211f379672ee48924818e96fcf668971458b7846e73d231b463443929ecadfb075bfb6e06a0c797652aca25d4 SHA512 cb114cd235eb1670fb35e229cc6b68adc1c6448c48b8414eff33cca06b768d359cd6fd15c52923bc31cdd67f7ab0fafd544645b3f6ffe94221399e6d392b40c1
 EBUILD vym-9999.ebuild 1389 BLAKE2B acc59d6a479129646d31b4e9693ca90a2317ddef792c5a76af2399090e30a69fcb6c09788b3d53b2b6b599192996ca8738433aba0488df32edf6ef7507660181 SHA512 421995c8d0379b65330a6d1e52c57322632bf883e8d628b9ddc60767385e158619f187ba9860a2bb405e297b7cbf67f8330bbfd2dc4f9a88a3494e67f44e6c60
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.6.11.ebuild b/x11-misc/vym/vym-2.6.11.ebuild
deleted file mode 100644
index 5a6721089991..000000000000
--- a/x11-misc/vym/vym-2.6.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( README.md doc/vym.pdf )
-
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
-
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
-
-	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
-}
-
-src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	doman doc/vym.1
-
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.7.0.ebuild b/x11-misc/vym/vym-2.7.0.ebuild
deleted file mode 100644
index 8420300310dc..000000000000
--- a/x11-misc/vym/vym-2.7.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-inherit desktop l10n qmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-DOCS=( README.md doc/vym.pdf )
-
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
-
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
-
-	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
-}
-
-src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	doman doc/vym.1
-
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 7dd60221c778..55b9262e9329 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
 	dbus? ( dev-qt/qtdbus:5 )
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 8af14285b015..a3b0fb287531 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,11 +9,9 @@ AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf
 AUX xscreensaver-5.41-comments.patch 462 BLAKE2B 6df2d5573bd3a1c44582116f3653c7c0f2ea3738e94695dd3a680a5e0333c490c9a308554ae370e6565d766768e87a49a28d0c7cefbf7e69c8e32a4a1f4dba82 SHA512 672ee1c9d455883215bbf09bc5ebb7c38efa132419a27352d0b6b570e94f193e374524e6a4e5a75f8bb178cccd1d72442b7adf5866a0c2dc389704f123f8f931
 AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebbab5bd6444aea4f1379c199efbcbe5924106890578a5210bae5c55249ea1883af437e7edebb32fbccd35022acc3d7c29de SHA512 53ec2d02e20139389f832750ecee92e634ec8ecea5bfd5ef27a58ab0e6f3cbde299263bd92006581a4076f4b0721c036c1ac28cac50b1a2bf47c24df08347d04
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
-DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
-DIST xscreensaver-5.43.tar.gz 26968319 BLAKE2B 799f37f7851dc717e1bf09d63c83a07aca3c51be138d854c0d904c1d6878ef015e1750c55f7b083b6aa020c6be86e9e5a08c1aa8f47f5d063407d8a151c30d6d SHA512 e745711c5760434652aa6bee99c1060717f15cad5946fba2fa3aadbcb300bec6620935c27d095b6e8a68c06e5bbe6fc1879474674b6d07f04b2af82d05cc383a
+DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
-EBUILD xscreensaver-5.40.ebuild 3351 BLAKE2B 8c649d16315f36741e47c58dfc42de728c3010dfefcc33a9572252f87a90359d66af3feb938215078ca88a6ffe9b0af7cf13d4bdeb099635af8b75aec1a41ac7 SHA512 7b61319958afb344ac5569d78e0db09f8287e9bf1ecbeccb2bdefa261fcd972fb31deadff0c8faec440fd000151dabb55a3ea6178bd2f7edd6c03b477c8079b7
 EBUILD xscreensaver-5.42.ebuild 3388 BLAKE2B d31c7b81e9bb04c7bd4f7d247bd59ecbdbb2e8e96564a7a156feab6a80c90bcc0b625d4a642b2a4235ddbce98fecff813e16c2b1f3cf1fd78246cfcb6987f4d2 SHA512 98b1a0900da9f16d7dd0120cfa426739f4236e11c46b33446e254fb5aa94a3221e164b25fbb7718e2f9404e042878fabb37b13625893500237e79ebad645dc2f
-EBUILD xscreensaver-5.43.ebuild 3350 BLAKE2B 345415f9154b41d4ce525e2e34062a09cc08b6ff2a250b172c3a34c8091b696dedcc8aecb29f578c4949ca155c5df03f9fb84adfc15e10daf41cf6908f7a051a SHA512 7bd7ccd067cfdedce8f7673a90f1279277f1be14c4005540ee6d6a585770aac4e8342ed045393b3e0a43b2542666356055569c31bffdc4ca5a8fe2fc68f4e137
+EBUILD xscreensaver-5.43-r1.ebuild 3363 BLAKE2B b555c2faac9d448c53f5b401e0e6c0005b101b9f5a1dedfa539489dc3ba9a1568c5b88b837cd30515ba3bdc4975f1347cacf861ffc5233fca9d07eb1b15000e5 SHA512 f09005d3c2e59fa4d95539b4c1789a756e155ca15610b7ec9a7bf69d2de092671266431440e80b37834527ad24311c63052214583d8b6d014b3f26c1ca8580a3
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
deleted file mode 100644
index ba1e3200fe98..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	eapply \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch \
-		"${FILESDIR}"/${PN}-5.35-gentoo.patch
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index 57235e1532a9..b28860a3b225 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -7,12 +7,12 @@ inherit autotools desktop flag-o-matic multilib pam
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
 SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
+	${HOMEPAGE}${P}.tar.gz -> ${PF}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index b8818f7576b6..3b7b4c8733d2 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,8 +1,9 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
+AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
-DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
 DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
+DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
 EBUILD xvkbd-3.7.ebuild 1039 BLAKE2B 0e1530b3eb6453dea3da454de2012414831c5108bccc208f69ee6514ff27e66f9d6c8b2a0d0c1cb4e2ad30ddba08921b1e1107643241701bfa1a24623e7e35fa SHA512 a33d41cf74553169337716e060398061397e4d399696234a214a1887efa3326761fe36b0c351d25dfa8e42d1bff6885ff287df91ac587964b5c6d84adea38e15
-EBUILD xvkbd-3.8.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
 EBUILD xvkbd-3.9.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
+EBUILD xvkbd-4.0.ebuild 706 BLAKE2B 1ce003b13e95fb0f3152e148e774ece79b7a76eb1a1c74e5f02f961ed48188249fc00449f4f407fbc5af610591b8a67fafa03b8b276720d285f68c832591e57f SHA512 dd41fb0962c6538163cbc34493806148a4c741947c86a5e01977f011399559c3ebecf1f4b01be175c673cb4d93eb3a824dde68e8f7a04980f93b25dfc1dde88b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
new file mode 100644
index 000000000000..83879dd9fd02
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
@@ -0,0 +1,25 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,4 @@
+-appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt)
+-datarootdir=$(shell pkg-config --variable=datarootdir xt)
++appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt)
+ 
+ SUBDIRS = .
+ bin_PROGRAMS = xvkbd
+@@ -17,11 +16,12 @@
+ 	[ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
+ 
+ install-data-hook:
++	[ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/
+ 	for file in *.ad; do \
+-		$(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \
+ 	done
+-	[ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/
+-	$(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english
++	[ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/
++	$(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english
+ 
+ EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english
+ 
diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
deleted file mode 100644
index 3033ea4d6dd8..000000000000
--- a/x11-misc/xvkbd/xvkbd-3.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
-)
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-
-	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
-
-	dodoc README
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
new file mode 100644
index 000000000000..52f200bc9b23
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-destdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/X11/app-defaults
+
+	default
+
+	dodoc ChangeLog README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 1c8205f8e4fd..2a8863e48207 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,10 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
-DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
-DIST zim-0.71.0.tar.gz 2882942 BLAKE2B f1701baf547d43d7a9687e6a1d72313649064f1d3927e14bffd5c8e348fa7a311e307f9b1704c19058bfad07d6715c79399acfdc5701efa9291db3e68065175a SHA512 7c82e19d547795f57c563383aca04a51da02463df71cfe18c4cab0307f46fb425ff0f348b43ae0ab26cb29037bc9d99aed63dbf721a542d071f9674f17f0a64a
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
+DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
-EBUILD zim-0.71.0.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
 EBUILD zim-0.71.1.ebuild 1914 BLAKE2B 200ce1f95158a46e7a1f3ccba21045b5af15b549af734dab620c42bf91c60e1c2b251bc15eacc3be962eeb110961d0dc0fa6f75e6ed91956e10176360be6810a SHA512 7fa5f84d0c42b02f9d1df0cee355b5f5e4938bd96a3e96db3b0336c8ca1bc4de3816845c39fdbdf0559ba057cb73eaa39e3c23c6236221792db29a12d8fb7a94
+EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.69.ebuild b/x11-misc/zim/zim-0.69.ebuild
deleted file mode 100644
index ba87523f013c..000000000000
--- a/x11-misc/zim/zim-0.69.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-DOCS=( CHANGELOG.txt README.txt HACKING )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please install these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.71.0.ebuild b/x11-misc/zim/zim-0.72.0.ebuild
index e9579e77339b..1dbe5acb22de 100644
--- a/x11-misc/zim/zim-0.71.0.ebuild
+++ b/x11-misc/zim/zim-0.72.0.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
+inherit xdg-utils distutils-r1 virtualx
 
 DESCRIPTION="A desktop wiki"
 HOMEPAGE="
-	http://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
 "
 SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 
@@ -53,8 +53,8 @@ python_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	if ! has_version ${CATEGORY}/${PN}; then
 		elog "Please install these packages for additional functionality"
@@ -71,7 +71,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }