gentoo resync : 03.03.2019

24 files changed, 367 insertions, 186 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7c45b5a16632..43c8b82ab734 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 89f932785888..990542d34fe7 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -3,6 +3,9 @@ DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b
 DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
 DIST albert-0.15.0-plugins.tar.gz 534292 BLAKE2B 1eef450bb575ffe3439248f49659e4e6535ae595c7a69dab7517e8bd1c4ce9a2a88ce370807fb1f0948a8da76758b6773b91e982fe8bbafe572b1071d1126265 SHA512 94b64e247dabcca11e54ac06ce57578709d9634768648ce8023c5f6065124077bba58c5913a191c27cdf189e9a40eb5b0abbd071a3080d3c950a753256445650
 DIST albert-0.15.0.tar.gz 86557 BLAKE2B 58fb745fcb2dce6f78d66c655e7051031f8578c12ff7cf680d6b5ae63bbc03b60d43605523f3d31dbc4972c92b8fae16880ab660427ec30c0048cf6273924248 SHA512 9ca5e419fe6314a81c03f8440219d9dc1b248504b8a0adcc42006c53e300e7f480081dfb90800c64b47a928ab669a6fbc8594d32a923443c0d9843133b2a5715
+DIST albert-0.16.1-plugins.tar.gz 534401 BLAKE2B e0713ee446b0c98a44489d8a45d60a1124cd45dd06af207ca8b8aeae4b6872a8705c3fa58e1636a4e0f95b4885253be4fd6f8376c12dc6b5110cbf2923af4d09 SHA512 3501efae9feeaf1090c1a1a3de9ed9e5788c8029dca76e06891683b43b69e5711f3c62187c273b11c418f824e9e0c0530bc5d248b37b96553fc5846c93c21224
+DIST albert-0.16.1.tar.gz 68739 BLAKE2B 4794c8aa4d2997ccf4c2d88a36c1e578ac3daa84fdd7dfebfa08941f692815a085ea2140aec9b3944c6ff8e71a4628510f9b28857137e39396be278606812640 SHA512 49dae5722982ba3fd4a25fcf5f398d8fe8d4bf66d15e2783a699174ff7196538c11ec9dde4201174c7fc7ac0852f2491b5b68abc196077305c89e22d8e1387ab
 EBUILD albert-0.14.22.ebuild 1407 BLAKE2B ee85919ed2a532f8498530daa20e748d2aa2327bade782b97d126e221c2211913584f787ebb653e136f70daf1a1911220daa987f73106a8fb3c1835fda543817 SHA512 fc71f4c8e139e1e0dc86fcd60dbba8f911a54eb989ab60957fb1fc9fba7314d5319cff2515c8b0ad246a8cda917a14b9a798e2493161db49f531c78c0892138f
 EBUILD albert-0.15.0.ebuild 1381 BLAKE2B 8f1f44142573fe82fd46fd9e2ec8b1982d9cd30bbcfadb5866614a4b6c1e3c9f720b3a298b89025e4df9ab4aa591f3705e3ed108ea7c5b985939ead85391e719 SHA512 3ba2e4252328a26371496de81b4d79785b33ed9bb5b94a15205289281ff355d00e2cc060bc410fd4ddfd8e60a5ee4521f73efe7f9001bb0d1151c4dea28aa001
+EBUILD albert-0.16.1.ebuild 1372 BLAKE2B 9283b51acf6d42fa4f19514edaf8b430f8ba157e8652551457fdc036563bcdc11c59a28e865bee8bef56ae73d28e1e211b16f564b5d0cfa23b31e26711d72c36 SHA512 ec4c97675af1e9e9668e91c60f32dbd705640228177f010acb5245a80da321074eb52a5755b4bad8a281feaeafaff275ad9cb511a444f989cec5815021f35392
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.16.1.ebuild b/x11-misc/albert/albert-0.16.1.ebuild
new file mode 100644
index 000000000000..c04869d05ca7
--- /dev/null
+++ b/x11-misc/albert/albert-0.16.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLUGINS_HASH="029bd8ccb58c4452bd82ab42be8739f1639e42d4"
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtcharts:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 5740bfbd64aa..0388b6947904 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,4 +1,6 @@
 AUX j4-dmenu-desktop-2.16_system_catch.patch 5533 BLAKE2B 69745ebc955550ab3c02d31b455e8d36210aa845c09e3c1a5f61a829c0dfc779e093d818c977f98b1c5089f0a43662bd0b75d99bebeb83f9ada85175987134ad SHA512 dedb23a4b946a31778fdc1451ad2841d78bb6bfa00661e6e496fbd329f1c7fa6a3a3fcf52b35e1c02b049c1b2e614c9eeae6717851f56b6e89719cf017807c83
+DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
 DIST j4-dmenu-desktop-r2.16.tar.gz 32553 BLAKE2B c1c7f0f2a59421b2e244a8f65251b296ad44ae37c10cbffb62bdefb168b6104e3d89c0a43b74feaf0afcc52ac78c8d46204ed397f131e526c447379b066b9b88 SHA512 d5bb0902d4bdc474fa20bc9d8f79de90a92bb4941f0d325dfcfaa1347ea3ad355b87da8194bc3f654970e9ab8848e6ecb5093f3c75fbaa8dbc40199fe6ea2837
 EBUILD j4-dmenu-desktop-2.16.ebuild 904 BLAKE2B eaa5872c1fdde74a767910a477271343d01f7426248c9178f0d14d6b4cededc765d117d4870e683533fdb7aaf3c487a013da42f394872558c5d733ec9e7f0e56 SHA512 08b252636cd5a7186c1a739abb44b331302e0ea87566ad26c6baba152969838ea82d93d5df43c71cd2f71f49381ae94003f7ff94b51192d44b238145cee43eee
-MISC metadata.xml 777 BLAKE2B 180659005f20d3b3d011d5459cf3e34bb11f4942167b5219d570254255173f79a7ab90e9446a4b6ec8108e2bc3fc48373a8b10fa7dfb8f4aaad898e995d97acb SHA512 0b3f5d514237b845e609f5b99384fb27aa111f0e04b44fde1e2601d2a7089dac1401918afd3e8c1cc670d96273cb8797a2450ee2df9b6489e01b6426da0af617
+EBUILD j4-dmenu-desktop-2.17.ebuild 808 BLAKE2B 7a5664e935bc33dcb765ecc9db16d3e05e8dacc2a605259cc76ad444d8f4e569fbc15a9021d2af4e11858ab94c68589c45a42ed53cbe432ef06fd0d7122565d2 SHA512 6334119b64677c378ed8b1ed1ec20a4a597faca4987fc3fbbb8df17ecddbfd16323181e29564160eebc743babf83d33005dbde9ea18dc04a5bf832b7e26fdaf2
+MISC metadata.xml 818 BLAKE2B b7c476e13a8de66b8f828895f478988d2f7381ff2ca823d7e0a74bb931f1b5288dd4d574cc8e4e5d2f5d4c7b1cb24c9d4fd9bb8cd1a9710d43ba2e6db90430cb SHA512 4444201bda84c9fc9eaffca6904df20fd06bcdf772a09a16d20d08015fea6672edb9e17435b35933b9ce71552831560b361732147c510ab1d79cea43073de8e1
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
new file mode 100644
index 000000000000..8017519a1386
--- /dev/null
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PV="r${PV}"
+
+DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop"
+HOMEPAGE="https://github.com/enkore/${PN}"
+SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-cpp/catch:1 )"
+RDEPEND="x11-misc/dmenu"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Respect users CFLAGS
+	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GIT_CATCH="no"
+		-DWITH_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	doman j4-dmenu-desktop.1
+}
diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml
index 581cc21d7364..146361db405a 100644
--- a/x11-misc/j4-dmenu-desktop/metadata.xml
+++ b/x11-misc/j4-dmenu-desktop/metadata.xml
@@ -5,17 +5,21 @@
 		<email>sir.suriv@gmail.com</email>
 		<name>Diogo Pereira</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		j4-dmenu-desktop is a replacement for i3-dmenu-desktop. Its purpose is
-		to find .desktop files and offer you a menu to start an application
-		using dmenu. You can also execute shell commands using it.
+	<longdescription>
+		j4-dmenu-desktop is a replacement for i3-dmenu-desktop.
+		The purpose is to find .desktop files,
+		but shell commands can also be executed.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">enkore/j4-dmenu-desktop</remote-id>
 		<bugs-to>https://github.com/enkore/j4-dmenu-desktop/issues</bugs-to>
+		<remote-id type="github">enkore/j4-dmenu-desktop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
index b35bd2687a9a..590f6944ac3b 100644
--- a/x11-misc/mixer_app/Manifest
+++ b/x11-misc/mixer_app/Manifest
@@ -1,5 +1,5 @@
 AUX mixer_app-1.8.0-build.patch 1022 BLAKE2B bab0aace19b3952fae352ead05748166dd792edf05114d815049db2e4bd1b2f5e8d3b336292f81737762d279690841e09b1757a69f84370ae486e46463b667c1 SHA512 46c6e10f1e8dabede4dab55dc5293e24061ac45ea4c1d4dc114913d4cb2b8d2ca2a4ffe7b555de4001416ed56a67e74925da2a9f33d89a2e8a0037a58a59cad5
 DIST Mixer.app-1.8.0.tar.gz 37884 BLAKE2B 53c44947e59fa2b4f975a70a33cae76c1f721f3408021ffdbaa37750f26b67e2dc71457b5b08e7b29ea60dbafe34ed3a6ba0c22d7414c8f3bd0c5186207f62f0 SHA512 2b965cefda7ae93d8588b717becf25430f3dc5d1d6c3e38d24eac711999ced9c671cfdc76a0601022cf1fc7298d179b5780ce7a3bcf33291ac4d8ea215cd53f1
-EBUILD mixer_app-1.8.0-r1.ebuild 687 BLAKE2B 0f5cadf4c674942d74300d799ab8cb161baedda10a0035db2c4b55a793f7dfae19be4985c60d52f63a4cd3bb819652d6632985b8715b8dad600ec6584cdf16c7 SHA512 973691b34b9b469c1a384e216fa53cc89f88baf1e1e4b4bc8ca59c0ddc9a97d148bffbe6cdba6a64a629c66c0b4d083961af60b7a6857d6589e1ce1a83c97f62
+EBUILD mixer_app-1.8.0-r1.ebuild 686 BLAKE2B f79541a15c6620f926ca68db50170e90c255a8f197688ecf548cd2e6b417bce0c1f9fccc69df812383c3aa196b7b43ae6a1c4f9642c72240f6143791060e5c36 SHA512 39bb85062bef7f566192c8994a868c17b26b7f5850d96cbb0176edcb42b121afdee23441594c91cf0ab4b55357018e5041a5e424d6681c47087bebec259a7f4d
 EBUILD mixer_app-1.8.0.ebuild 706 BLAKE2B 84630771fd74ad20e4ff028ba8c59c2fee8f8e33bb09ea2051ff1d424a17a3daf88e0f27f8bb0a35202648ec35875e5aeae71b21dad6adc298a49a0d27a9d70f SHA512 34521e19c17ceb74270e767ddd56d87653e061383ff87e181de7605f22bfed5269f8c50b2b82f21a767655dc9a7caef00d7f1725347024e16f893bd1e720a34c
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
index f22687e50163..6d904f31f35f 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.fukt.bsnet.se/~per/mixer/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 3583c65a09c6..861e9ddc2be7 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,8 +1,5 @@
 AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
-AUX spacefm-include-sysmacros.patch 449 BLAKE2B 29258b6d1a23291e51a5c4be6e579bca5d965b222a32caa7ffe52509d1ede342772db9b4defbd639f992ecef0bfed33d6818e59a4c0e992126898e60aa073318 SHA512 276ff68ed7c08d02224d73089a895e044510accfc160e06abcd7c55b8dae4b9443f67ad5ba36c07d51db37afd64b5a2da8085e7ebad6e46dfb60459b10f3a99f
-DIST spacefm-1.0.5.tar.gz 3491483 BLAKE2B c00ff3d92e01095b854ee4948ee8827ab32f454d4fd19e496f3d4a70dad2d8a98b67f6cca53d2026d15eddca23b1b6ac5f0394a66097a4efdd0f42beeabd4ffb SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
-EBUILD spacefm-1.0.5-r2.ebuild 2467 BLAKE2B 4da4b06f00fd300d98589abe6ae1314cf32aeedb8240a7bf0bc50b75fe2a92125f8c6ead158bc1a680db52154363ecab4e696da619c17248b6572f96568f997e SHA512 a3201aad465c716325eb234fee9f9fb295c9e145456ef2fdab51bd72508b9b6fc1ef147cdf62de181cfccb0c42b4d4d143aec7e53bb371a62b33fd170ac32e2e
-EBUILD spacefm-1.0.6.ebuild 2606 BLAKE2B e2a4dbcf40894a08f06beb51bfa8be7d0b89d67159211b68b22741911d6d4b5b7f1a950e802c666e506ea144ae68db89ed16240fb28f3b4c3a376affbd96574f SHA512 5f4f40a98d9e94b4cc4bcecb0469319e9d92d987cf5458268ed0059411b9a7bebfd94d4ba0e79960f45516e61bb53ebd98782bc971de36ebacac0f0c857ac11b
+EBUILD spacefm-1.0.6.ebuild 2605 BLAKE2B 3986a822474dc9f36f3bbbdb895c80467f2328fe64c668fa7c505da81bbcb480ecb227f2cf9b447d9112b943a8b20d19a3566b1ed7a816f70ba68a6728725f26 SHA512 95422ca6b63da1722895164e329c3903f1357a90f3193f213a4ac6d4e7ab4166e30d5b405af20bd77bb65bd8255561699511b75b4cf72fa409133fb4cd6f1667
 EBUILD spacefm-9999.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
 MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d
diff --git a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
deleted file mode 100644
index 28bbfc7c4057..000000000000
--- a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/vfs/vfs-volume-nohal.c
-+++ b/src/vfs/vfs-volume-nohal.c
-@@ -36,6 +36,7 @@
- 
- #include <signal.h>  // kill
- #include <linux/kdev_t.h>  // MAJOR MINOR
-+#include <sys/sysmacros.h> // needed for dev_t
-  
- #ifdef HAVE_STATVFS
- #include <sys/statvfs.h>
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,6 +30,8 @@
- 
- #include <locale.h>
- 
-+#include <sys/sysmacros.h> /* for major/minor, dev_t */
-+
- #include "main-window.h"
- 
- #include "vfs-file-info.h"
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
deleted file mode 100644
index bcf8d506218b..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	>=virtual/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}"/${PN}-include-sysmacros.patch )
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
index 0c53c8c37fd2..b550eec82054 100644
--- a/x11-misc/spacefm/spacefm-1.0.6.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="next"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index c6fa500b88e6..b36b538a183b 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,4 +1,6 @@
 AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82d3fe2db57ece7a4e564d99990de901e6a01e7b8013a840717a67ef798d34a08c9ebea03d4 SHA512 5e9685e8e2d8933e9b3bb2f3dc92ad677f38b63766bdb407cef7373590ed8d0e73aebd1ed6e489b39c8b1477c50657df499a7b5e50c09df1e675448dcad7f62c
 DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
+DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3
 EBUILD sunflower-0.2_alpha59.ebuild 2181 BLAKE2B 227baca89b619f4a135b4512c89870fd6f8da2f3a283ca92da0cc6ecbb1e2302e1a08406bc9cdc07a4d1cbeb78b91cecf9b8f7dd1c425053bb7b32807337d3b2 SHA512 3797f36f11bcfc52ca8609302535ef9630005a9ba3ef44be50e2cc9aeea70ba226c1f6d61af3b1a9929c7c168b35c0b23dc038cf5c20151c07f55bbb16cf347f
-MISC metadata.xml 246 BLAKE2B 7099b03dbdc83bb431d016b138aaaca822d446228011fa4250a0e25dc6ee04c19cbe8751a37c46344f9f7e4be3009d07c4a32b56a624d29ff139c33077b204d3 SHA512 01388829c888be4f666cb2b98b60d02645f4546bb87d5bf0064f3af8845c324f91b658a4f003cf472d1da25811f5006bd88bae25e01377330e2f8949dd9fa75d
+EBUILD sunflower-0.3.61.ebuild 2169 BLAKE2B e7fe17e6403de0ad66816d7491aab3450d8c32865cb03278ec78ea700e9810b120a55256c75d95ad31d89c01d127f4c1695ff795673d9af06a4e513a89dfa0ec SHA512 30909c488a254eae2f569543927c705d0865138f708a51fe570aa3c682759489cad5bbfe3db7ddfcbd9231f534bb3176bafd04de78b449d0637de49d8ece42e9
+MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index 1ba4c2fe874e..a92806229f30 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->	
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 <upstream>
 	<remote-id type="github">MeanEYE/Sunflower</remote-id>
 </upstream>
diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild
new file mode 100644
index 000000000000..70998acf88ee
--- /dev/null
+++ b/x11-misc/sunflower/sunflower-0.3.61.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1 xdg-utils desktop
+
+MY_PN="${PN^}"
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
+HOMEPAGE="https://github.com/MeanEYE/Sunflower
+	http://sunflower-fm.org/"
+SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2.15.0:2[${PYTHON_USEDEP}]
+	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2"
+
+S=${WORKDIR}/${MY_PN}-$MY_PV
+
+src_prepare() {
+	default
+	find "${S}"/translations -name "*.po" -delete || die
+	rm "${S}"/translations/${PN}.pot || die
+
+	sed -i \
+		-e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \
+		${MY_PN}.py || die
+}
+
+src_install() {
+	touch __init__.py || die
+	installme() {
+		# install modules
+		python_moduleinto ${PN}
+		python_domodule images application ${MY_PN}.py \
+			AUTHORS CHANGES COPYING DEPENDS TODO __init__.py
+
+		# generate and install startup scripts
+		sed \
+			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
+			"${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die
+		python_doscript "${WORKDIR}"/${PN}
+	}
+
+	# install for all enabled implementations
+	python_foreach_impl installme
+
+	insinto /usr/share/locale
+	# correct gettext behavior
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd "${S}"/translations ; echo *) ; do
+			if has ${i} ${LINGUAS} ; then
+				doins -r "${S}"/translations/${i}
+			fi
+		done
+	else
+		doins -r "${S}"/translations/*
+	fi
+
+	newicon -s 64 images/${PN}_64.png ${PN}.png
+	doicon -s scalable images/${PN}.svg
+	newmenu ${MY_PN}.desktop ${PN}.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	# TODO: better description
+	elog "optional dependencies:"
+	elog "  dev-python/libgnome-python"
+	elog "  media-libs/mutagen"
+	elog "  x11-libs/vte:0[python] (terminal support)"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index fa3bd8339acb..f4883d21a3c4 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,5 +1,3 @@
-DIST trayer-srg-1.1.6.tar.gz 27576 BLAKE2B 4daf93beffe3194a6cd9620826dea940d16670544bf8b382358b21414ab7d2a8a79bb165156cb556fc6ac2008931fc1010ed84bb67741954fe90ef10cc0c9806 SHA512 456af94277dc237c516fff1589060b0b656040811ae48bba3c021be6310d104881c0eee7391d228d197db78e9bfb04773d4282ab2fe31717a4779b38bdb6739d
 DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad
-EBUILD trayer-srg-1.1.6-r1.ebuild 651 BLAKE2B ac903fee64af29c0089755972c799c05d828b7e56222b2df6a271873a25aa4cfa459d54eb664dd9db097e10744281097c2eb56387eee9892fcc14dffe4e79e29 SHA512 4611a742780e1c10ae142dc8799a88471f9063539142c67b168690a5e4fc12fc62c41cc7091649b1560c0519c66e12c3d29ac2e844ceb8e219358bc4dbcb12a1
-EBUILD trayer-srg-1.1.7.ebuild 752 BLAKE2B b67198b29f126d064e4855e70e687a615ac2554f07e62235b5f83d8ab235f0ca2b0cef0a3e83707f7fb023b89e28fdc045260eb96cf91bef8ef4ae66d004034e SHA512 1bb1ee2f65746cbbcff4d3ff081f7adc3bb003e77696b1247a4904829d95afa36fd738216e9132dac062ced02ce04407793cc737797971fae2a758913a9fcd22
+EBUILD trayer-srg-1.1.7.ebuild 751 BLAKE2B ca5874b16f3a731b57227673e02877d726c0ab61a71c52877bbb03201c4fc3bb81103a433dc0efebe2c65721e05552f193befacedc98864a4214a921df76bc89 SHA512 99772b9da40ea7b900826842aed0423cc0196f1e7eb6b7c033cadc896e5751d29eb327384a923179f9e624ce57a03f1500c9164f13800c6e98ad09ec9a9838d7
 MISC metadata.xml 249 BLAKE2B b308f3f4e67b02a37d7df053cda2ce801a2e355f212a680126aa3338811fc6127838aaceaafe156f9afb871de57a301056dd9af8d0cccd32fdc79e2abce4b56f SHA512 a354c9b99e5ee4dbc44e534e5764479ab0f2cac37ce7d9699f0bd668653352c25c630be27239a3a1c3e3ae391891df7c3855e08dac224b510f0feff0c060ea4f
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild
deleted file mode 100644
index 37883d4bce6a..000000000000
--- a/x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
-HOMEPAGE="https://github.com/sargon/trayer-srg"
-SRC_URI="https://github.com/sargon/${PN}/tarball/${P/-srg/} -> ${P}.tar.gz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
index 75138fe906a1..45e6091acf64 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 345552ce210f..2b1b70d1ad55 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,7 +1,9 @@
+AUX x11vnc-0.9.16-crypto.patch 645 BLAKE2B a821861e4e4807e5e019c787d07791912083a3ae2d1e4c77eb3264adee65a68ea51c35fdfcd0d71b996f4af42ff8481c877f5f324180139857e5cfc7d0ac3db3 SHA512 6e9ec1eb5aba65999dda9048fb01e13c55cbbf6f3e226c23e20ee906891487a5c94efd09f54ac765ca1ed99290357403a0b2caa3a7226fc967b0e8ecf19360a6
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6
+EBUILD x11vnc-0.9.16-r1.ebuild 1897 BLAKE2B adc6b8bae11bc8158f8dc78939aad6f40a22142768c2aab3b714b21f1af7bda11266a0b27e3bbe88fe47eed29afebac9ce066c1694945a7417589a9704390193 SHA512 2a511b4eaf02b03d11c6cb47428bd69c12edcf11a3d1f3fd19a18310aef4fc4d21724e85037cc2f460a994c842350c517692b02bb28bf1c279c6f164df36eccb
 EBUILD x11vnc-0.9.16.ebuild 1362 BLAKE2B a56115a2d7738e3a7410f73ee7c256bf3785bb4698905a74976b3efef96b8678517c4197e632f5b2097520ed069310ace7e21f7726dea7fb2391f7e7ee92b2d2 SHA512 b1af8a7a18b44355d8e6ab956ce4a3bec428bed7afc575ac877f1e05782e35b4630511ec96ed6c14d4dc17c0686e905a39bb1154aa0d85801720d53df9ad80e0
-MISC metadata.xml 503 BLAKE2B 2abaa727781a7a18a68993b4bb95d475138ca1b3d2a30080da7f619d35f2d323bbd8273c9983887bf884a026f9750ef68e0a53f75603f1329f28257066787967 SHA512 5d8635e9f87aaee274f263bff2fb05be5bf8e348d4e9a899924049a210dea6210be4df0c9b9c8db4af04798cf49f16e10a47018482d9aaaa38b5613d2348b1b1
+MISC metadata.xml 790 BLAKE2B 90e23b3c192f477495a8189840b49f980b16c6dbd388dd51a43106034c0a74d77867d8a64f4fa60b4dc94368a03276fd6e0ada7d761bd8abd7e8b446caa1395b SHA512 9663dd9893db04ac99cb62de85803531fa350c112e7c5335ed1b7b9195c73811f8ed8ce418a13f119e0b3c50093aec48d363b1bf81e6f4c269dd362059742d74
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch
new file mode 100644
index 000000000000..21872e73cb7c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-crypto.patch
@@ -0,0 +1,23 @@
+From 3024af3685be9eb618352bd17ba37953d8076946 Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Thu, 17 Jan 2019 14:05:53 +0100
+Subject: [PATCH] unixpw: don't try to use crypt() when it isn't available
+
+Closes #86
+---
+ src/unixpw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixpw.c b/src/unixpw.c
+index 9a43cec..e2cb016 100644
+--- a/src/unixpw.c
++++ b/src/unixpw.c
+@@ -757,7 +757,7 @@ int unixpw_list_match(char *user) {
+ }
+ 
+ int crypt_verify(char *user, char *pass) {
+-#ifndef UNIXPW_CRYPT
++#if !defined UNIXPW_CRYPT || !defined HAVE_LIBCRYPT
+ 	return 0;
+ #else
+ 	struct passwd *pwd;
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index f25d54c19120..4ad5dbb6d54e 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -7,6 +7,12 @@
 		simple command-line server utility that allows a VNC viewer
 		to connect to an actual X display.
 	</longdescription>
+	<use>
+		<flag name="xdamage">Enable support for the Xdamage library</flag>
+		<flag name="xfixes">Enable support for the Xfixes library</flag>
+		<flag name="xrandr">Enable support for the X xrandr extension</flag>
+		<flag name="xtrap">Enable support for the XTrap library</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">libvncserver</remote-id>
 		<remote-id type="github">LibVNC/x11vnc</remote-id>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
new file mode 100644
index 000000000000..b34c657ccd34
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools vcs-snapshot
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr xtrap zeroconf"
+
+COMMON_DEPEND="
+	>=net-libs/libvncserver-0.9.8[ssl?]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	>=x11-libs/libXtst-1.1.0
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	xcomposite? ( x11-libs/libXcomposite )
+	xdamage? ( x11-libs/libXdamage )
+	xfixes? ( x11-libs/libXfixes )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )
+	xtrap? ( x11-libs/libXTrap )
+	zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="dev-lang/tk:0"
+
+PATCHES=(
+	# https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-crypto.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		--without-v4l \
+		--without-xkeyboard \
+		--without-fbpm \
+		--without-dpms \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		$(use_with xcomposite) \
+		$(use_with xdamage) \
+		$(use_with xfixes) \
+		$(use_with xinerama) \
+		$(use_with xrandr) \
+		$(use_with xtrap) \
+		$(use_with zeroconf avahi)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 41866378c7bf..510127e2762c 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,10 +1,10 @@
 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.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
 DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
 DIST zim-0.70_rc1.tar.gz 2889546 BLAKE2B ca0c2274472f7e3f50e2b51ba59a75ae1422e7bad86a8fdc55474c150b1ac227ad785c3484d1255079a8aa169bc437e6016254ed8d4691d8e8d78a5112d71038 SHA512 fca61ea5c249ba33187d48a6794c11f30afd664e07462c738ca2b64f7d970e95628ecbcdb9c19a23b70c1609993d4111a9976cdddbf2fd5ad3029014a8a01339
+DIST zim-0.70_rc3.tar.gz 2877315 BLAKE2B 1467bbd6bbd11e53120193a5f77dc7ab52eb8f1478c3dbc98e229d784f4432e862ab578277b79058eae43943bfbe8812b45153130779f7c84f14b342d3ba7357 SHA512 32fcad48c2deb9739cb7d3214138cdac7c6499008f884ba61aeb51ec387d600b87c7848abf7982fa165c4130446c307e57ee1762f7107894b70d96ded528bc0e
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
 EBUILD zim-0.70_rc1.ebuild 1975 BLAKE2B 353454f5ea9e44f5ad8a191fa795eeaf80f14ce709c7bc71688f65d438dc3861276dd717b1141d684393a90aeb90182133519695a78a37b12d9e9624d9312cb7 SHA512 40693d96c405ba43e3ad1f2d112fd2312303ecc133316e485ad680c78c49cd9d36c3b84608b8fbd0dbcfffae54aa3f85f196afb394bb0a0eecc0169d62bcc9ab
+EBUILD zim-0.70_rc3.ebuild 1999 BLAKE2B 60396c782d89816504beb13a5b40f53f62588947384394f54a7abbcceaeb2bc6b000b5c31e7b8702ea8e59c54b3adc9ccf9190c40677b4e2c67daa094af5da7d SHA512 ffcfa8797f19fc0b0f63ff14b40f289abda49c4a3863f5ef9b5bce24cedfdf5bbeafc54cdaeefa033092177d0344e9af7f8fc98dd58494b87d1c7327c493d87b
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.68.ebuild b/x11-misc/zim/zim-0.70_rc3.ebuild
index 44110e717f31..78b40b796324 100644
--- a/x11-misc/zim/zim-0.68.ebuild
+++ b/x11-misc/zim/zim-0.70_rc3.ebuild
@@ -1,34 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
 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"
+HOMEPAGE="
+	http://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${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}
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-vcs/bzr
 		dev-vcs/git
-		dev-vcs/mercurial )"
-
-DOCS=( CHANGELOG.txt README.txt HACKING )
+		dev-vcs/mercurial
+	)
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
 PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
 
 python_prepare_all() {
 	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
@@ -47,33 +54,33 @@ python_prepare_all() {
 }
 
 python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+	virtx ${PYTHON} test.py
 }
 
 python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
+	distutils-r1_python_install
 }
 
 pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge 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"
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
 	fi
 }
 
 pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }