gentoo resync : 29.10.2017

29 files changed, 382 insertions, 213 deletions

diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 921023fa0eb9..afb02f16b31d 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,7 +1,13 @@
 DIST albert-0.12.0.tar.gz 404748 SHA256 e1ec7783b6cc22e5ed28d2f1ac6148528cb3eb734f139945b49d44e07770d9c8 SHA512 56d141a2c6b98744c0b34a7adbbca8b6af93545a7b067263acf59fc63d99ec7d9f19f2f3c73f477e5f35448ae8a563c9f132bed87be135467f8f0c1462f9b031 WHIRLPOOL 328fe6efdcce988e37bf30448ea147d0aac5a69aaee267e3453c4b0abd621a58f8b29f11727ecaf199129d9d11bc03b2fea71651c17aaf22f06e51ba582beaaa
 DIST albert-0.14.2-plugins.tar.gz 537751 SHA256 400613894457d8514e1a492726db9966384da26ebc6190467d71c3275b1b3bf5 SHA512 5e16f64ccf474546b1f9c6d665c29aa45b7238fc2fdbd1399c17171af0db95bb205501925621a8189186bece073377bc7e127961bf051941ec388fdfb00f289c WHIRLPOOL 2a5251cd382b44e12df8cfcca615ff8d4f55f3ca7e6efd977eabc98bf5f61487e19fc718bf8f6c817298553822727e59eccd6018b99879b242803cc3369d6055
 DIST albert-0.14.2.tar.gz 83202 SHA256 80cd27259c74687d5d10c94593cca99075cf05d9e396ff4b58d8a9f583ef7c77 SHA512 81f2b7e618d9d1b11e6e765b6508e2976985e56ebac6232e2e17c58ca6a38c111020b23ee9963c71d2b80be0aa138ce7403e7f9b807e10131b06ad95eab19b43 WHIRLPOOL b1f42870b0050daf901aef02ee752154ff7cb76ef633844886f7fc3cfa0fb23663c1bd5feeda646d304138d4f56b1b491770aed126693c6ee1ace8f9e17228b2
+DIST albert-0.14.3-plugins.tar.gz 537751 SHA256 400613894457d8514e1a492726db9966384da26ebc6190467d71c3275b1b3bf5 SHA512 5e16f64ccf474546b1f9c6d665c29aa45b7238fc2fdbd1399c17171af0db95bb205501925621a8189186bece073377bc7e127961bf051941ec388fdfb00f289c WHIRLPOOL 2a5251cd382b44e12df8cfcca615ff8d4f55f3ca7e6efd977eabc98bf5f61487e19fc718bf8f6c817298553822727e59eccd6018b99879b242803cc3369d6055
+DIST albert-0.14.3.tar.gz 83217 SHA256 39a121098db261d7fd2f48ec0f5b7b3bfc8a032430d796a6dedc92713aef5fa2 SHA512 f9d137477c830c92b457480acd095617b4281e4f26e4c547a0bf208459fa11964485328f3c04d92aeadb9c6ca134834b2b216935ad8fb72e6538e02ad230aeb2 WHIRLPOOL 4db02ee5cdbdc5c5bdbfdcd61b8cdd2451fce95f8dfe77693bb651a61e2dfa9022934584eda00044dcd0ec0f06fae9b5e456144dc3c8589c24eb6ef91b62acfd
+DIST albert-0.14.4-plugins.tar.gz 537929 SHA256 1b19f231738a84480abef1f80cecf910cd701eedac53c01c378c80cfa030068a SHA512 faa4d51ed18c3e68d255cedaccfe2f4c79bcfce844a2e9e289b197223f0b3898760bd217b76b5a0631899a76f870889726027fca5e80840c81f6d14264feed73 WHIRLPOOL 1e0f11befb6fedb95085d3abd0596087d8199f4861baed04d754d5e974ca96ac6027eb328b16cc84ee655eb5d5911708050f98257421379816699d8721280ca7
+DIST albert-0.14.4.tar.gz 83284 SHA256 fc89736a1ac34bb8a6e0db75dc9186fc266bdb63ce0cdbd699f94b373ea58d3e SHA512 c30430ac7255830781e27dbdf24a0aed90e509454feaff3ff1c95839cf05b3de641021a255087ac66bda051f34243e4a79eb6e08d8f6027ee1b8bc6564ee9d93 WHIRLPOOL 5934bcf0a87aa8232f8b10b2c74320fa0d11837d75b2472dc921924b7956c645d4a1bd8a0fa5c7b142c3e73f2944ccb74b8ec05c55564c3240f1a9c800798b77
 EBUILD albert-0.12.0.ebuild 1016 SHA256 1cab307f195331df200e3a0f556d432e87c990cbd3840e869f680a0248b67818 SHA512 7047299581650cf9f31a3c71259dcab00707b73e9ae22115c512c47b536bf3103cdb120691e80caaef98714d3f70b1467930600f5c911565f4e5658a7cc11796 WHIRLPOOL 36416b53116da5b65e45f81d9b8453c4621aa34edadee0e7ea340d8b862b4f5bff112b9debf01cad82feccb7283daede77bd8d2c6fa9c34d0bd2d8d3f76d3f54
 EBUILD albert-0.14.2.ebuild 1470 SHA256 4cd15bcb7da45e9116e1c4cbca2f7fa0e95e74c29a3a91fc161542936562c9cf SHA512 fecd07d6030d2530cae20f5802d8106a5068e78af31db7bd75b3ab2f905cd4e62207922e98a64d5a6e0433ec76d6f19efe4cc2b1fce051ea325567539fa6e82d WHIRLPOOL 67b8678c0c7bc8743a2f51e48afbcf5d77944ca6b7ac6ecd654efa74eae06c9186b20caaa7245ca899b584b29174da32d53603cdaa14ba6f7261e9a15ccd2b91
+EBUILD albert-0.14.3.ebuild 1470 SHA256 4cd15bcb7da45e9116e1c4cbca2f7fa0e95e74c29a3a91fc161542936562c9cf SHA512 fecd07d6030d2530cae20f5802d8106a5068e78af31db7bd75b3ab2f905cd4e62207922e98a64d5a6e0433ec76d6f19efe4cc2b1fce051ea325567539fa6e82d WHIRLPOOL 67b8678c0c7bc8743a2f51e48afbcf5d77944ca6b7ac6ecd654efa74eae06c9186b20caaa7245ca899b584b29174da32d53603cdaa14ba6f7261e9a15ccd2b91
+EBUILD albert-0.14.4.ebuild 1347 SHA256 64216c04f15f367183ad144d3b63d896620d5d2e9bf815d04e358ec8ee4e2818 SHA512 8a527eaa9eb5846a6b5b9b4f427c30d89b2f743f5d22cad7b084990e751f9c00c0969e230eac2ae1a4fcb25d7910bf57d453da06ecf733a5200d9434bec11a50 WHIRLPOOL fa1bb0d4f832921382d9df71515124cd29ab92816f970d15f8766a90c6393dc299cd4a687dd673d19b30c4b784dc8d5dba5743a2f2433afb84acbb0c55337a21
 MISC ChangeLog 3337 SHA256 77b2d91b88be117fb4af3e2f36d5cb3a6f84f0f7cd3316eb28fcf1bc3fc5aadd SHA512 de2e9d98bcbf76b463639af93de11bba73a9c864424c4b5b38a58064455538ba94c35ac26fd5d648ff109ffaa0ff7428158e1c78eb2a4e2fbdc5bac45a7ddf18 WHIRLPOOL a93474a14231b0d36622bcc5d4a77e94a8974dd730a8936a59f521ef353fd61bdd9579380e2b1b1eb8db5051b10a2a585f776662f65416e422c775c3b9986479
 MISC metadata.xml 307 SHA256 728a1470edc4c4c30294e89649427e1d28e7773532fffbf05a75b5ef27b426a2 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a WHIRLPOOL 76f3d0838d1d6511dde2a36abd7e36752b21660eaf17b17802d68136e7d8a861c6b2f487aca7d3f6d56b168fa1b2a49ec0d4cc0e8c37fb5260711dbf09e54fec
diff --git a/x11-misc/albert/albert-0.14.3.ebuild b/x11-misc/albert/albert-0.14.3.ebuild
new file mode 100644
index 000000000000..065d85200cb1
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="16b4f9c39b91ef0435dc8a0eeb714800b7b99d4b"
+inherit cmake-utils gnome2-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/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
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	sed -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+		-i plugins/*/CMakeLists.txt \
+		-i lib/*/CMakeLists.txt || 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() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/albert/albert-0.14.4.ebuild b/x11-misc/albert/albert-0.14.4.ebuild
new file mode 100644
index 000000000000..e0d3809823f6
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="1f0eb7495747793e8e2102012d7d387bc7ca356d"
+inherit cmake-utils gnome2-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/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
+"
+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() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index b920aa16634c..850364262486 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,6 +1,6 @@
 DIST compton-0.1_beta2.tar.gz 144239 SHA256 7b9cd52a57326116fb5db3f5f89b7d50e17715252d9fd79b70b45ace30a6b009 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535 WHIRLPOOL 39ca9718bc79d4542d73cce39bb51fc9b9c0497a30914ab044b920f72a3c2f8cbd315c5dc97c999c1f0ca798ae692ada4626f069914b6835f0c225638b486422
-EBUILD compton-0.1_beta2.ebuild 1609 SHA256 f02a6cbd29843b4f8b5e8090341f52a11ace72924b31760504cb3f780ec9b200 SHA512 1bfc3b719f79cf3a8aeef0082c0fd464c0bc64a93a5b0cd494f4d34b4786252e6ff5376506c07dd4bfbf19b200b8a31a975d320266c9b4c73d6d78d5deb45c18 WHIRLPOOL 35f4a35c270c1a612d4387ea588b0cdb87b59bb7d633d29c797981f0b22408acd78523aadc1945b79b66dd6686780040c508ded70a9656fe76c1bed47ff5f397
-EBUILD compton-9999.ebuild 1530 SHA256 96942937cc6b305c21d662aa4afea538954e53bc44162059d0e4a8f88aa04d84 SHA512 48108c0b88de3f6a4d310e359af0a46443721d65bae46d3f88ca466d2fec29d8ebe65495c028f43320c8d251b2458af6e6581fb3bf93f02e13b290f693783f51 WHIRLPOOL 8bf3e1e7feaa73b76b936b0321841368fcf4a66055b829ee370982d265cc73b13f016796435f337b170cc16c3756a568fc713040047cdf1a810e87e5fc3c957e
+EBUILD compton-0.1_beta2.ebuild 1611 SHA256 5db238fbf6d81536c184668561fd9598d6198f719386b665d263827471f5767b SHA512 67f079a1b78ba121380e811cabcfab8c735b7c59eb353cbb5233861ab44d354ecace4a8264c644710643fb50a8a081b17b69c86c45f1af52d3c0bfc033714183 WHIRLPOOL 635b57c35aaed396210ccd83ae25edbff69a4366d0ef57af557c011ebc5fc406aa5f9a88c0899f5bf8657f8510b5df4a5efc0e4e326274a3b0b8084af29936b4
+EBUILD compton-9999.ebuild 1532 SHA256 fb37da0e8e1f516dc3045c8cdba25aa7dd9ab3679c4a1a3767509219344096fb SHA512 22f8bb29736bb872d7538b53942ff823027f085ff516685c40bad77c93f3f9ba85f1245e870bdcec2f147ee8342151a3cd2c3732eaab09557541e362726857b3 WHIRLPOOL b70df757559cc376fed365e677b2387178bd35002edae82ea3674df4526885b20de9d3e8bd3dd2bb6b5ce72b94771f745542e5e12efa8c438da94b19633dfb04
 MISC ChangeLog 3171 SHA256 51041c62426725f7c049f748d63ca6dd98fa6cb56dbe4ad43ddcaf8c20404c4d SHA512 81e2159494a30d102ea039a2d9a10d1a490810cc5aaace10a6f4660f90be41deda744d5338f177ef11c9d677e7137a66de9f6430f817ca9a262c2b4d5d7a9c5f WHIRLPOOL 2afb2d8ba5bdfb318707ee9a0ec7fdbbd205c426bb51d5762c1f8d87383330afe99e3eb1e3955ee64f5cfccc3bac87ecf5211ca39e1d87528e4a493e5a2d0505
 MISC ChangeLog-2015 3291 SHA256 0fc119dd61feb070dd45ecc8f0bba86760c2c4d6157ac5a73f09fe6704381e83 SHA512 b9416c2fd23b34590a0fe25aaa7d012b5b2e531d94338930f3a840cb5ef00226ccc54fd6a719e2039f69a2f412eb0fa2881f387b643b7c2849159bad681f2da7 WHIRLPOOL 988eb0212fc28c8d42cbb8de8a5d7357f2638fa12e22adad26899a1ddfbd90293d88b6aa73d6550c27c81b4159cb1568f2f57d3aec9a1d6daa971c3114b1d578
 MISC metadata.xml 417 SHA256 9a91b5f6a413bbceff941308fc43ff5d812efe259d39c7338af58a3910309f26 SHA512 3220e8f0f2d71f507df50bdd8a7837042ba8ad98ae9c06b3834ba72be6e346d3af614016e657313a55b7c93351a36669c4bb5b35edadb0284a71076192ea53c2 WHIRLPOOL 9d73928cb31794fbe4208c371e07d257d2488a2ea9d365540a411951027e30431419dd80487ecb221842c098c2265c4501dea148e847b0e681a2de80f4aa0cb7
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index a880a690e6bc..3db6c5ff51cb 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit toolchain-funcs python-r1
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index 13e6bb5241e8..518b6a8a2250 100644
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit toolchain-funcs python-r1 git-r3
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 58130197a43d..b05f1bdf09b6 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -1,5 +1,4 @@
 AUX fbpanel-6.1-underlinking.patch 789 SHA256 9f2681ef55a323313ed3a96083429762255ef88c23c00c339f8942c6ede4c5b5 SHA512 9c19199bc4f24ffe967b14dbee5165f78dccd120bc73f22e4846f083b4be3b92b60855f5ad08bdcb6d3b55b33a070a54e904cfdcc36786211d7d252dc7faac04 WHIRLPOOL f190ddb3e4efa7cac4732ea24dbca24d8877c49b146d9190926231a2ae5344937b4b107496a4f9aeb1c81f8faebd8045cf4aee351c75ac096f0b7795de9d652e
-AUX fbpanel-6.1-xlogout.patch 369 SHA256 c1d1be75d6173e3fa684098eb39e17b0335392fdb138f6ce912b8d29d75af952 SHA512 cfd6b0b05f2c1e243888e7619a4a3f7f2e80f4cc48f13418854f23b0fd0f8a152d9757f6babd4fa873c0bdd297beaab246de55a1c08fae105d9906464048d702 WHIRLPOOL b1df6fe4e971a09689d086b0c95fd94e08c0f41d15b4f8440cafca9f48f175970ad7d391dd632d3ff48437f98d29897823ebe535171d9845500b5498b3acf0f4
 AUX fbpanel-7.0-clang.patch 2596 SHA256 9da628126ef805b5d1009acf1abe01311ceef84e1e55c8d2708769405262be41 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f WHIRLPOOL 5b77e3e5a9daf8389b6820bd6ded9be970a8363ef225e2146f7bf2df3a5fb707784303a4354ff6ec6289688ca5b2660d4c9631ed512e4bf4e9404cb505ebd8b5
 AUX fbpanel-7.0-shebangs.patch 2348 SHA256 fd26d8ccef2c9123fd22a9fdddac0d9fa3097ecdce5907d142519abf005ac9da SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7 WHIRLPOOL d0dff44d397404b3069196b9d20caa8b963efd68e42ae50fb58928802e0b98e42902d0988df511dc7a93c54cf6d6310146bf3f70e7c1ed4a06222223ac4d42ff
 DIST fbpanel-7.0.tar.gz 3746477 SHA256 711570954f8f99235d6afb7ec3226dede20b832eb712a5bd00e4f793b75ac5bb SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874 WHIRLPOOL 37fc5f86b80474026b660491b83ee26c4e9e260cadafff9673d161feb79efe2b2d6c89f1c83c76ebfe41eeee61e83cf3dc271667d4a2aeefe37c5e93c30f8e31
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
deleted file mode 100644
index 8adf4bf4cf72..000000000000
--- a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804
-Upstream: https://sourceforge.net/p/fbpanel/code/474/
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
---- a/exec/xlogout
-+++ b/exec/xlogout
-@@ -45,5 +45,5 @@
- [ -z "$SPID" ] && exit 1
- echo "Session start up script"
- ps -o uid,pid,ppid,sess,cmd --pid $SPID
--kill -SIGTERM -$SPID
-+kill -SIGTERM -$SPID $SPID
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index e0c5bcd19ffb..2dfb6862b173 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 SHA256 b65cfcde99f394773587152218603eee35e9247d08bd8daa23cd907e1cb4e7a2 SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554 WHIRLPOOL 0f5fe5f970b12b86997cdd3269d6fd3204b95d0b20e31c5130dceb82a00b688b20c35a3aeebbd564b9e4b1725c14562a4fa1d120e4fc10a84ad2187feea95482
 DIST i3blocks-1.4.tar.gz 35943 SHA256 c9bd2854b7902aa6821fdf8c83b5123c10b90a52f9bcc67225ff57f25d28b4b0 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578 WHIRLPOOL d6367d0b2335a79f6a49f069b31af6b5c24a33bab3e48be8b615305009aad196c5bdd7e1d71860b7db123f21bcb91a0614f705c073d78ff94c81612d4e840328
-EBUILD i3blocks-1.4-r1.ebuild 758 SHA256 f2737a2d567c5437bafe58dd402f9dc882e8afae05d60953b87c875a2339f7c6 SHA512 f35fa64761e45e83e1e7b6da378a272fa3733c2dd4ff72eae4b1fefea977798723df44d95c6b1b518a153c1bbdd39ef48ca6e8c30cb501bbc7d65b113b7414fc WHIRLPOOL c1ad2459ee73e76d961d56519fcfd228fb1355ee165484c454daf1f947a88f204057fed786a32afec560a199accb1e8fc9bb6f0e880f6b18b6e412c0ea194c50
+EBUILD i3blocks-1.4-r1.ebuild 760 SHA256 054af0c4d2c781d5480e3de30897c8b91d6479e86291a172b062cfb1388cb1b9 SHA512 a1b9957c2188722c109bee483e125689a75ffb231ce4d62c686eab16a2231db23aec230e891fd65928f8a9c5fd9deecc7239aeab91b3c3611497e09b9e562308 WHIRLPOOL 7ad5f13f461f98707c1badf6b1e89f742f4c1ceaf6c59137e1712c6661f6fd78f5db526008a8238591645ec9a0269ffc514eb78a5a301b02d6d31dfd7e416e92
 MISC metadata.xml 331 SHA256 008cbf46e9a9e2aecd50da04aa3f1f4de2b14f12e4bb7cc10bbb541d3ac59f16 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af WHIRLPOOL beab3df97eb266d2e6ab3079018a4b37fe8c27c1532822abc5a43397104fa0a14e5339eb324eb1508c1d325e196e95809c1b8e8c013a86246e43dd150a8f58b4
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index a081fd8909a9..9e05439fc998 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -11,10 +11,10 @@ DESCRIPTION="highly flexible status line for the i3 window manager"
 HOMEPAGE="https://github.com/vivien/i3blocks"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 SLOT="0"
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index 6bf55d8f84b0..751138b02fbf 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,7 +1,7 @@
 DIST kapow-1.5.2-src.tar.bz2 718144 SHA256 29d7a83f9351bd83dfc9e2c933187e6fa3274be1530976e05d201bb65bce23cf SHA512 a5f7edd6880ba01c7f0be60045a3ff05f8a09e39f8315acf68b258bdc4a7484954fc6d1dc3acd184b9ebcfe6830a053777a9e0399bb8241fcef0519dbfc53c0d WHIRLPOOL 050ec50bd30fea815783b7ce84d86ec5c765356a01553ade9357221c970c6a6edeb2799ef711846a66b894db5c6ceabed37bdc2661a30d0f7ba69de42ebf9877
 DIST kapow-1.5.3-src.tar.bz2 720315 SHA256 73953d980e248ccf74c8b94c62ee1dbeaa9843481ca87a8e6af7fe1c2eb8c712 SHA512 1f8dcd570f6ed3b9fc1605a25628a06720839a5558b1564341bb775ebc99796b1124e498dced279aef30ba6fe3bb9d4f3b956685d07b481e79d66c7f197ae201 WHIRLPOOL 7bb0b41bc001ec101efcc1e93598e68ff4f55c10ae634b8208693062d66fbb3ab528ebba9e6c088a7c1d97d9d494bc26d384fa6bd7d7f4a13d3c7902e9373624
-EBUILD kapow-1.5.2.ebuild 650 SHA256 2389cfc2e8d21dfb3abbef8f093ed319b5d3745e2e8f95838e71eac754e50f65 SHA512 3f6192c2068e9b536c91e1a7a9666a6296938cccdbda60dece2ddffb6e2be5b6b8fe9c13e4fda24d24874692d8dac13bd34e80996cc5fa12b9207a3d51973f14 WHIRLPOOL d58510f7c251c18eb63f14011d44db1e3a91f4666932e8812be7eb837ecf222cd89fce1ddc922554f5d2bc2b135a6bf7c440679d88ce9a241f10c0dc0e72d4c3
-EBUILD kapow-1.5.3.ebuild 650 SHA256 2389cfc2e8d21dfb3abbef8f093ed319b5d3745e2e8f95838e71eac754e50f65 SHA512 3f6192c2068e9b536c91e1a7a9666a6296938cccdbda60dece2ddffb6e2be5b6b8fe9c13e4fda24d24874692d8dac13bd34e80996cc5fa12b9207a3d51973f14 WHIRLPOOL d58510f7c251c18eb63f14011d44db1e3a91f4666932e8812be7eb837ecf222cd89fce1ddc922554f5d2bc2b135a6bf7c440679d88ce9a241f10c0dc0e72d4c3
+EBUILD kapow-1.5.2.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
+EBUILD kapow-1.5.3.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
 MISC ChangeLog 3153 SHA256 d9cce20b995027403165224073d9094260a5b1e8b540ed479b9a2e27ca0a43f8 SHA512 f8d27db931bf475c97c8773ad934bbd519e0377311c620e7cb18c521ddd0033bc7386b12fad3863537aa6dcf9929c57059fc8370ac579750ead525677ea46b7b WHIRLPOOL b00f1dd27a0ff11b12734940b6ceacca02b2b4fc72120031e8b206f28adc2d09dafd038448a482d2a92f3f432e8da171438b09cb7b83050eaa1169c0568bc696
 MISC ChangeLog-2015 1198 SHA256 ae4b942cf7875e101c42d38b5518482304cd1c2655a6277f17ec2ada44320501 SHA512 dc019408a35a667723846a5074b9a50319bd9e4f61a9e0fb6d2930c78ad873075d540a027ffa1614a3cef9afc2ee129254716b9dd498b73eca295b1306e18f9c WHIRLPOOL 4ce4f80e9b273580553c306be463092ee060ace4058418684f42c3c1384c8a507ebf85ce31f30ecd35cc0b6a4e209415d004e4a63d679625b525c539de875f55
 MISC metadata.xml 282 SHA256 ac9236162462e1562a26e596e7dd457a448f9367ff1a5a27ec3513ecade3026b SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4 WHIRLPOOL 615c807081b4bef1734f1dbf9a182cb27b7de0e9bcdebd880c6b9c1ab01b95721076ddc4b4e75e93b8f777020bfd52459e9e4b1a9deb41baacc44f6cde05fd36
diff --git a/x11-misc/kapow/kapow-1.5.2.ebuild b/x11-misc/kapow/kapow-1.5.2.ebuild
index 9787e17eadaf..4d8914e38d21 100644
--- a/x11-misc/kapow/kapow-1.5.2.ebuild
+++ b/x11-misc/kapow/kapow-1.5.2.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="http://gottcode.org/kapow/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-misc/kapow/kapow-1.5.3.ebuild b/x11-misc/kapow/kapow-1.5.3.ebuild
index 9787e17eadaf..4d8914e38d21 100644
--- a/x11-misc/kapow/kapow-1.5.3.ebuild
+++ b/x11-misc/kapow/kapow-1.5.3.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="http://gottcode.org/kapow/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 659e98630c01..4d68e37c905f 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -2,16 +2,15 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 SHA256 3737a2de5c5cf765702af739445f
 AUX sddm-0.13.0-pam_kwallet.patch 391 SHA256 dc46a0132cf0ea722a69cff45ed1ded3c93ade008e22fc90d1b797ca85ed535a SHA512 55375d2c91dad5478be14988e7889344eb8f0694300aefc7803d0f193f7160b5900647e4e35a604aa76119556304d055ff323c4892023664224dc36070c62b02 WHIRLPOOL 90bbfe187e4a327129c9a426c3c00de8d5ef15b3ec30bc4d3dfc6c8603514114f104762cb3053e25ab0b3274874351c94d1dc289cd129939dc46e345b1394070
 AUX sddm-0.14.0-avatars.patch 1470 SHA256 b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b SHA512 09a2b487767c4d84e9bb1225d27e21a6716c7c299b5f3aff5fb4934d1ddc3659658eaffcf30dd60f2c83389a461b4fe91c23cab4646c740ef5eec658e14a1eac WHIRLPOOL e84ffc8ad6c6d40df7dad24ae60d5a7c0a387c5ad0dfa93d29cc307cedd541180398d7caf1925177e43fbff093dbc1fc36f872e40c57dcd80bf12ca2910355eb
 AUX sddm-0.14.0-consolekit.patch 322 SHA256 a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a WHIRLPOOL f438b0ceb638a4d6fc0d2999771a1c6dad280f4dbb263d73d458e32c09bb6884b32efac24e92001b4abc324e4e347a3360b533beab82c06022cebeb6edc7d6c1
-AUX sddm-0.14.0-nsswitch_conf.patch 1158 SHA256 8b31740cdfcc540c81dba5e190482b1ccdb29dbf2c7d14225ddfda701c3730c8 SHA512 9449c0ddb984e685c6440a9b8537cc57410df8092d549851a8285546ee0541fd3ac2eae7a62fe57a670006e930fa2cc54bb9671ba373fef914f34a9b219d4529 WHIRLPOOL 2341cd5f142fcb76b4319fc05992da0e4055e273a433d47b7b040cd7f9a99584927b2ad07636e5b390e401a09262f147eca0dc3595ed1013f86af7f63c6fc30e
+AUX sddm-0.16.0-Xsession.patch 606 SHA256 c64003cc29d3741f6ac36e7d5f5546053ba2d5880d1d2db3909acbee1d152fb3 SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1 WHIRLPOOL c9f8e2e425c009793f32b6b2cb33f4c0099fd2b26c422c691ba63857a834d49bbd9120f01e452728fb251f294e56ddaccea4acf538465244a01e79ca80a40914
 AUX sddm-0.16.0-ck2-revert.patch 918 SHA256 450679a1ca87e6694c1ae0c626660b35d831f16f6ccb1a1fe491271a0b7cfb3a SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60 WHIRLPOOL e6c700e24562387c58237bcdb384928f385d68462b5948bae2bfd6bc189190ec1a671de7d0e6eb7bb33522fcb2c773b95ff4d970bb4bf349be24229065cd8e12
-AUX sddm-enable-elogind.patch 1754 SHA256 b216976029dc425bc05486ebe276ce65b8d188ebd142856f13f44904ed733a4c SHA512 457a49650b07df2edd836201f00858245b1567476e7e1f6cb4e74e80deea404588504d1895d050cab4278ed3273e71131d70226867e5cf8846a7472f98f23ffe WHIRLPOOL 6d88e1c7eb4bcff23805fffe5b164462f43727059b0058a22140a953dbdf3c153e526513c2ce656f9894cc58eab22c1914e2a30b209dfa75388c05e09373420e
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 WHIRLPOOL 48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
 DIST sddm-0.16.0.tar.gz 3523735 SHA256 f7f73c6dd6d544ec2c5e4657e181f60467ec31d84bf1b775c544dfe8748badbe SHA512 1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c WHIRLPOOL 1a51b2d53fa5427a6785070107152bf9c907a8ebf77dd0532820d9fbcca33d68d7dbc5bcacd863d1881c54d26617bf6986c276ae6d99806e1a2bce6920240733
 EBUILD sddm-0.14.0-r2.ebuild 2332 SHA256 1a0083b134f33feb4b1014a2c3a5227a569ac6a2904feeabf3a09e41564c223c SHA512 b67ed7c8582b205972ebe2847d87a08cd24c3c9c2d6f77bd81bc89503e49cc380c6fa7af6722639cf92df1414d96a21bafd4978b0b08127c37e2419651e6bd71 WHIRLPOOL 1dc114783af75071c4e174897eb1deaa0c0e0db45aaae378d4ccce83f61707e1885a0a8e915e1b40f30ebc28d15877ab810b530028a4f9d749eb66aa11e1ba60
-EBUILD sddm-0.14.0-r4.ebuild 2542 SHA256 58114e9adf0f20ccb18e573a02164c4c3a9745c83dad1f3b83655ffc440769f3 SHA512 2cc87d0c84fda296121afd7c8fefc8c237f8c4ce682e6f552d861f3dc6a318c105e0cfc6066c87fe9be1142cef9ad83125e9b393f0c17f0a51a81e31d82e39f9 WHIRLPOOL 5393d4e0510c45a8de9bbd5a39b287af11ae06697003664e7060e0e40b06a2e269aa20aa0bb84517bbea2da950b0e5fb7095658e95bd27eafdad520cef5d9489
-EBUILD sddm-0.15.0.ebuild 1577 SHA256 e7d69dd3cde642f72e7b59aeaf863b8446b7adf3d92fe2f52cbecc68b74d89fa SHA512 da3ae5055abe9a9c66ce6db715acc1bca99852d8a9a3c78276875326aa515e3b475814875145a5c9c557e2018ee71ee07fec51880a61dccbbb20a37d62b4c9f9 WHIRLPOOL 4c9a45bfa8d1c9d609202d9cd15037bd13e88162ace1a297594d812024556c0fb05bca55ab84d03d5f02e4326c62028ee1e2f390c3046ceb22bc3d87eed90737
+EBUILD sddm-0.15.0.ebuild 1576 SHA256 c29f9d1a75face9de46899dba6684c1f269b5e6aea2e9ebf20ea59f9b7d2a4e5 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45 WHIRLPOOL 47caec5f73b8aa5669e866b0f76d06a6577e9c1fb5ba250507906cc73478af3c19f7ec372de649a938396497fac1e7f51104c38b420fbadf4237a29e8a667f85
 EBUILD sddm-0.16.0-r1.ebuild 1628 SHA256 e976e4e79e0f9448b0fa645b78fd82cee9a469510500d7b75aedb3f16a989f1e SHA512 fa13f0f94e8eec28d8851ef6963acbaf188d96e8f365b940e2efc2110ac0376903f14b7a311ba30ee0598222f93083235cdb299db617ac620bc6a6a7666573db WHIRLPOOL a93d7a20fd1971c30fcb1c29af1149ccd7d41bcc9d02e0a206fad16fcdf492fdaa1cbb2cbc65d07825ba57e7fa4f146744d3f5dfd46ff36320d5cfeadb9b7ca4
+EBUILD sddm-0.16.0-r2.ebuild 1563 SHA256 92c2c4a262da26632c979dd6fb798604112f6e1b3d11f51d4f10fbde9ffcec00 SHA512 bd5cab0a672662b03dfa63cb01a22520fbe921332d6b045f8a8729c70e0069598769a76b86cee28c58c321964b3f537f2067ccd6392d85a64628e652d786c187 WHIRLPOOL 3c9d61d29215fd0ede670de5a548534de619fe8e8df00b27fb7d0cf4abb626ebcbc8d0195a72a5bec60153a94bb964b4e1b531b54b0be1bc29e6e83ccb6f42ea
 EBUILD sddm-0.16.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
 MISC ChangeLog 9132 SHA256 b3c4811eab359e67c259d59550832dcb14fb4ab3ddeb71d23edc2207bda83c15 SHA512 32fc4d222b2316a4247cee25798050094983b69873e3358611d908ec030ab7c5b43c64c92a59e88aa37ba2c3ce97556ff1e03d33c6f0b90a0fdcec0a9825c2dc WHIRLPOOL c427eb05f0f819c4d6cff7d007e8d9ab7816e1fe9462af81f688bac0f649028b2137798ef40553b69d2be032a3eff971ac7875065eaf2d73759bd23e29bcb390
 MISC ChangeLog-2015 3391 SHA256 3512268a5a75b764800ce67e516270f4482390a1f9ab958ec0627dc4403889e8 SHA512 3ec070987205570ba6efa11b7feca3fa42a96d2ae4997dab21c713eab043c883d9f6b7073c8572314fc6793374a6061dfa9c0eba812de21de7869c284e5b3a6d WHIRLPOOL 440c4354b7e61f5022f1f728d3a1346b8cea88eeeade570f9b3ba83a67faf26987e532e5566f272df49d3af30c7fc745983273b1cb8733625690e5fa1a6776a1
diff --git a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch b/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
deleted file mode 100644
index 371df93e2b8d..000000000000
--- a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f39c7a91ea4bc9527628adb01cb49173f1e68be Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Fri, 9 Jun 2017 10:13:01 +0200
-Subject: [PATCH] UserModel: Check for duplicates from getpwent()
-
----
- src/greeter/UserModel.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
-index 94c492d0..33114d08 100644
---- a/src/greeter/UserModel.cpp
-+++ b/src/greeter/UserModel.cpp
-@@ -72,6 +72,13 @@ namespace SDDM {
-             if (mainConfig.Users.HideShells.get().contains(QString::fromLocal8Bit(current_pw->pw_shell)))
-                 continue;
- 
-+            // skip duplicates
-+            // Note: getpwent() makes no attempt to suppress duplicate information
-+            // if multiple sources are specified in nsswitch.conf(5).
-+            if (d->users.cend()
-+                != std::find_if(d->users.cbegin(), d->users.cend(), [current_pw](const UserPtr & u) { return u->uid == current_pw->pw_uid; }))
-+                continue;
-+
-             // create user
-             UserPtr user { new User() };
-             user->name = QString::fromLocal8Bit(current_pw->pw_name);
diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
new file mode 100644
index 000000000000..f341e1863f76
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
++++ b/data/scripts/Xsession	2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+     ;;
+ esac
+ 
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$@" ]; then
++if [ -z "$command" ]; then
+     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+ else
+-    exec $@
++    exec $command
+ fi
diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch
deleted file mode 100644
index d1277e9554f3..000000000000
--- a/x11-misc/sddm/files/sddm-enable-elogind.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt	2016-11-10 09:27:03.866358608 +0100
-+++ b/CMakeLists.txt	2016-11-10 10:28:25.384374766 +0100
-@@ -93,7 +93,7 @@
- endif()
- 
- # systemd
--if(NOT NO_SYSTEMD)
-+if(NOT NO_SYSTEMD AND NOT USE_ELOGIND)
-     pkg_check_modules(SYSTEMD "systemd")
- endif()
- 
-@@ -127,12 +127,34 @@
-     set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
- else()
-     set(SYSTEMD_FOUND 0)
-+endif()
-+add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
-+add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
-+# elogind
-+if(NO_SYSTEMD AND USE_ELOGIND)
-+    pkg_check_modules(ELOGIND "libelogind")
-+endif()
-+
-+if(ELOGIND_FOUND)
-+    add_definitions(-DHAVE_ELOGIND)
-+    set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND)
-+
-+    set(MINIMUM_VT 7)
-+    set(HALT_COMMAND "/usr/bin/loginctl poweroff")
-+    set(REBOOT_COMMAND "/usr/bin/loginctl reboot")
-+else()
-+    set(ELOGIND_FOUND 0)
-+endif()
-+add_feature_info("elogind" ELOGIND_FOUND "elogind support")
-+
-+# Default behaviour if neither systemd nor elogind is used
-+if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND)
-     set(MINIMUM_VT 7)
-     set(HALT_COMMAND "/sbin/shutdown -h -P now")
-     set(REBOOT_COMMAND "/sbin/shutdown -r now")
- endif()
--add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
--add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
- 
- # Set constants
- set(DATA_INSTALL_DIR            "${CMAKE_INSTALL_FULL_DATADIR}/sddm"                CACHE PATH      "System application data install directory")
---- a/services/sddm-greeter.pam	2016-06-19 12:24:42.000000000 +0200
-+++ b/services/sddm-greeter.pam	2016-11-02 09:48:18.990032363 +0100
-@@ -14,4 +14,5 @@
- 
- # Setup session
- session		required pam_unix.so
- session		optional pam_systemd.so
-+session		optional pam_elogind.so
diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
deleted file mode 100644
index f67abdc0bdcf..000000000000
--- a/x11-misc/sddm/sddm-0.14.0-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND=">=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.6:5
-	>=dev-qt/qttest-5.6:5
-	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch"
-	# fix for flags handling and bug 563108
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-	"${FILESDIR}/${P}-avatars.patch"
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-	"${FILESDIR}/${P}-nsswitch_conf.patch" #627902
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-		fi
-	fi
-}
-
-src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-
-	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
-		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
-		if [[ -z ${line} ]]; then
-			ewarn
-			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
-			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
-			ewarn
-			ewarn "session      optional      pam_ck_connector.so nox11"
-			ewarn
-			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
-			ewarn
-		fi
-	fi
-}
diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index cc14c6f74114..9dde4b79612d 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
diff --git a/x11-misc/sddm/sddm-0.16.0-r2.ebuild b/x11-misc/sddm/sddm-0.16.0-r2.ebuild
new file mode 100644
index 000000000000..26770167920d
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	>=dev-qt/qttest-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
+	"${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index c55a22b2febd..b26414be2b49 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -3,7 +3,7 @@ DIST spacefm-1.0.4.tar.gz 3487476 SHA256 b08df31894f48c43e38ce3f3d32acf0bec67c38
 DIST spacefm-1.0.5.tar.gz 3491483 SHA256 d3f14fd1b1cfb51df98ebc341ab78ce741ba443ae2ce9e1662de39d01a95e0f3 SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498 WHIRLPOOL 2e6f9a742032d04e863a7801b8707ada523be009d3c7abe8d54390af822653bab923783926082af28ad6a546f86035f50ec44a490e170186f395d6e5395b48bb
 EBUILD spacefm-1.0.4-r1.ebuild 2553 SHA256 0bc1307446f382c742ff60ab01eaf409a14818ac0300045b3b3b3e1dbb8108ee SHA512 385140f2087c8b559d4588779e19c83b78f13f6962dfeeffefacf7a4983fdf5325c89f9ece641b3de29903e2a23246ed34b405dd58afb20416935f4bcf61f80e WHIRLPOOL fe6e9c8ff40bc11dbfde875e504402353a6ebf1c91775bdbd947a43af02c09ab92265bf98dd075a8527e74b9a224e1b970ca45f5ebe85c6247c41f10bc301b7c
 EBUILD spacefm-1.0.4.ebuild 2456 SHA256 9d19fe72923f37c0380209e9fd4038f434df00546ae2ae140f8c520f92c0b907 SHA512 b6466744c58725327cfb47e317d809851bb5fa34e82eb9fe7ec472a7f9a9084f68f612f85e5a0dab2e60c3f7837692416c4728d36234cb7976ece256286fd27a WHIRLPOOL 414a428e5fddc13eae345db293c9c0f41b49c2803ec999e7e90f749fed149166772fc1d2a8d1e4f4635498ea215b3dfe3b77f835520755cbf836fe3653a63f97
-EBUILD spacefm-1.0.5-r2.ebuild 2522 SHA256 0b0f2158f21721902f54964944def1fd1d703ee8ec7a2f705aa8653265d70e76 SHA512 d4cc71c6161a36654e8a9b050a9e76ef76bcd36f0b50f65d1d46f5de28db791dd326d24d406eb2b3f3b4a371d681e3d74e1c5663d57791c93c47cd5ee591a592 WHIRLPOOL aee7ae9da6a6ea0f1c8bbd2faac51fd1292bddfb5e32ff02df7f283c4ff826495508c5b658b7cd01eedd313a21ece1df565046ac872e5d81d1291175cffc44c4
+EBUILD spacefm-1.0.5-r2.ebuild 2521 SHA256 b8d192d148c35ef21969b1c00307faef1eb23eb84d815fdd676fb5979e3aebac SHA512 8f8a9605b90b82fab3e250cddb9f974eac48061b6819d778984a9fba79db4191dc8b32810545d64df86621bbdb6f1bef093aeec316b9a80f1301877d8feb309e WHIRLPOOL 7055c0a91e6d4c0f57445997a31f31cbb6098e311d3372ae0c1ab503c5e1b87f685aafbb77ea1ffb67931f1f8b531d6a3be7b1da2e5181955763bc4b54dc866e
 EBUILD spacefm-9999.ebuild 2454 SHA256 d8707fda6eb5abca7a8d1ff199031ab02b5b4de3765c5d39e8f1ec997ad58b17 SHA512 5da5de98185ba9fc9e6eb74ae37c56c6442b5a25483de205563b285dd36c2c6b3dd6407b891a95d6b4d348883522f4936880c5bed7327845a887e864c25f58ae WHIRLPOOL f0976183c353597cb7382bc14cb27d0643b0df2d40f089ce36e4fa160e8db8bda4d4ba748a98e57fda91c83413e9fc71544936b1adeef57df1539df7b8217098
 MISC ChangeLog 6045 SHA256 8e382b4c37adbf64c5236976eb8b2125d7d05967234c260a53edfaf6c15b9d34 SHA512 d0fc381c23e24a75c4ba2716076ab5e4ce14e2b08234f6f03f4a22201853a9ff4506aff76ce9b1c8d445a188242f4beeb01e020535699014aae4f8f829051ddb WHIRLPOOL 7afe2d30750ce3bb24b575bcaef62263d5b7686caedce148eff1dba6cf75a104aeaee2ab4fcc55ce07e945c9f1467d0805ad6cd84a530f3321b55c51d374db15
 MISC ChangeLog-2015 9726 SHA256 9f05182b7c81401f85517ca6597d30c6395f802b0b84b5b0a0cd3d15926409f8 SHA512 09ab3ca86008fd9c949f78292ab5b9e0f32ed90a4c0bde9b4288b31dd2a148d6c8a4f176e132bd8ea6b285f2428e0278245abd17679c8571060a4558ef9fcca6 WHIRLPOOL 4fcf8d5b8119821ffc9ef265d35ee6fa474e3a07ad66bd08777b0137468ac0ea4aff223709423e4f6a1dc22afa8a8b7646734986d5dad98e397d17cfd2764563
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 0c56ab420c40..9ccc93d3f580 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
 
 RDEPEND="dev-libs/glib:2
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index b8aa7f013ac5..fabaab8d48b1 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,6 +1,6 @@
 AUX spnavcfg-0.3-custom-flags.patch 1568 SHA256 8972b8761589fa87366a9c5c32591964d5e621b60294bea6cfc09fe05a9e899b SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632 WHIRLPOOL 4ddcea782b6d75f2121effcb6338fe2b8f0e7cf093a8745d63d1633186a89d0314ec333890640f14bcab99e50cacafc4871f900ce4db4451d16812e6b3ba508d
 DIST spnavcfg-0.3.tar.gz 214774 SHA256 4c950b8d4ebd4243c0bf08b6c5922f81b8cf73ec6bb7b20acb390610cdea4bd7 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 WHIRLPOOL 13f677743dd2eed35f57ca178d8b1a9d3382ab1eb586d99b6ff33be0f080e88d80eabd91065db7c48d0ba7bff40eaf8c7d2d0fdc52f85256adb84cc6b4ef6b83
-EBUILD spnavcfg-0.3.ebuild 627 SHA256 032a42235fe1bc6eb0dead16c955772da9ec7d735e0d774174d55aee5370e87f SHA512 93b0d494262e59bf5d4c22e973ebfb3e74860f928a8aba0eaa46961323be5bf7f1278af8e6ef9262039b03581e198ea6a037af4c5bc11ec382d02c1d83112630 WHIRLPOOL 8725a6f5e1998a2a17a8fcb0c53119e3ee8d4f3e4d34a84bfa2584489fa5c0998f620ef709cc8a33f2423ee3aa74592de3d630b44924699397ef48187a1122e0
+EBUILD spnavcfg-0.3.ebuild 626 SHA256 f52b8b845a244401e25058137b657e21772d52a9132bb7f8273402bad51f4f51 SHA512 c515f7c20d654e75a1a1b18369acbe4cadf0698568ceffb1ec3448c52b16637a188473ed3d753b7b5a6b8a3e524a9066c6f8f53d181a39d20a031b0a2984aa9e WHIRLPOOL 88777396f52b06fcecacdb190add625d1a8871ac2f72479ab5b09a11626fc71345ce0c9df3f0dc6a8226d1784a2d9089a7071fdf9ff2bd76989c251b94e0aa0e
 MISC ChangeLog 2689 SHA256 fba58ae5e397e4be981947ed993763f7e793b25827efe28ff4e4a3154617fcab SHA512 0b45aae551ae877171e02cc1db5b1d4c2c8347fa30d24a92bd8e81f87c235f20cdf2af50f574e51c8550337740659d6e7678f987099092da5f30488981d80a57 WHIRLPOOL 934c594003d6b5590b22b8a4af39a8929515ab9c8f16745db1bfb584bbaf1d8f81d861a148726da08f34679d484e0496e30e008562771d1694d639c57ec421f8
 MISC ChangeLog-2015 835 SHA256 46cbdff09f848412a3256345be5838997a94076e669f51dee3650aea9bf7d224 SHA512 41bf40bf1e76f075506bf0d577eb7ab30ef2c2ad0218413ef5a3cc9135ae87c7f813a1499659ad2e8f82689120145441ea04f4934bc6459752018141481462bc WHIRLPOOL 44576821d4edf750373dc25f9397cfae140f011d0832291f138ef61ffb3186292e990810842f5fc4224d0d817294d40eeead5a5d928a17e990d49e50922250d0
 MISC metadata.xml 693 SHA256 13d29c469a8ef587a731eecc0120dea37d32b49bd9355984bf33800eb01dcb84 SHA512 fe3071295032bceaf2df17c955b234063246f37a59a25b5e630c21f1443d16d3bf4fe7979fdf4d01df88ff7194bd6258fae78b5e4ba582f396ff3d8007ccf7f5 WHIRLPOOL 0ab4f871b78d64ec7ed8af06e7f006c276fa8e4718738a7422446f7acaa51d9c5c465e07bfeb394b89bc6f9986dd834cef3ad9ff4d8ad9922401cd3fcdf84dec
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
index b6cb667f0d7d..c8c438c0150d 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="x11-libs/gtk+:2"
diff --git a/x11-misc/xsr/Manifest b/x11-misc/xsr/Manifest
new file mode 100644
index 000000000000..1ed2533916d0
--- /dev/null
+++ b/x11-misc/xsr/Manifest
@@ -0,0 +1,3 @@
+DIST xsr-1.0.0.tar.gz 8028 SHA256 46cb94d45c90762fa08edcbe2ff03165424978f855c33969062a742b835b2e59 SHA512 0fd7326452a50d0493d30cd956ded07fc3eed551af31c042c0a8f0a9c3af69319719868cfc43fff8b542191b5b9c959894d3db13b15c4127e8ff6020a04f7f15 WHIRLPOOL 6d98693369ac60023cb6ca941a3bd88ebe38f64aa3b96c41ba15f4ea8b20f88d75c215d485472c4d6e9cd6c85ee76d2e145a70d029678b548f9115e9ed285db6
+EBUILD xsr-1.0.0.ebuild 522 SHA256 01df0fbcba4bcdc43beb3f91b35a94e3c8c9b3404140face80f01f39b9297954 SHA512 06ddd1a4ffd54858323b798ecbb38ab2f49a28d2846311b2bbf3c419183368c2398e0171cd9d1db2d28f31f2e10f5fc3cca932f1cd022e46d3150439b4e9ac95 WHIRLPOOL be92adb06398803c93b67d2500b49059cde730fbe606c3b2aca00921e14b0ee8dc803daf74988de96d92caf357cd117d5bdc3cb013e12ed50e4286c53821d19d
+MISC metadata.xml 1228 SHA256 4421477dd5e3c44e11915c3001a55ef55b2e3e365495ffd3bf588fe75143ae9b SHA512 39a98820d8d8202b5996733b970a0107d4cda3ed3911942196e9ec3454c0457bee8539fc1de1e25c5a41ed7175e13d4744732f1c9aa1ebce8e816a5c0cd8461a WHIRLPOOL faa2dc044d8363256afca61249eb61431e7a63c549643f421cf5ecccca1584b26e7f0ce755c709647a4f27f94bb1203b5e25ed05b942b5d628615ce3d27fa85e
diff --git a/x11-misc/xsr/metadata.xml b/x11-misc/xsr/metadata.xml
new file mode 100644
index 000000000000..c2e7935c2eab
--- /dev/null
+++ b/x11-misc/xsr/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lezsakdomi1@gmail.com</email>
+		<name>Domonkos Lezsák</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	
+	<longdescription lang="en">
+		X Steps Recorder is a clone of PSR for Windows, a program that allows users
+		to make a recording of all of the steps they took. (It's like a screen
+		recorder except it doesn't record a video.)
+
+		The main differences are that this only runs on Linux, that it records
+		your keystrokes too (!), and that it saves the output as standard html
+		(base64-uri-encoded images) rather than mhtml. This allows for easy
+		editing of the resultant file, such as to remove passwords you typed
+		(which is why psr doesn't record keystrokes in the first place).
+	</longdescription>
+	
+	<use>
+		<flag name="cursor">Capture mouse cursor using <pkg>x11-misc/xdotool</pkg>, and place them on the screenshots using <pkg>media-gfx/imagemagick</pkg></flag>
+	</use>
+
+	<upstream>
+		<remote-id type="github">nonnymoose/xsr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xsr/xsr-1.0.0.ebuild b/x11-misc/xsr/xsr-1.0.0.ebuild
new file mode 100644
index 000000000000..f933fb6d9645
--- /dev/null
+++ b/x11-misc/xsr/xsr-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="X Steps Recorder"
+HOMEPAGE="https://github.com/nonnymoose/xsr"
+SRC_URI="https://github.com/nonnymoose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cursor"
+
+RDEPEND="
+	dev-lang/perl
+	media-gfx/scrot
+	cursor? (
+		media-gfx/imagemagick
+		x11-misc/xdotool
+	)"
+
+src_install() {
+	dobin "${PN}"
+	insinto /usr/share/xsr
+	doins Cursor.png
+	einstalldocs
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 1156f5be361a..75d369467992 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,8 +1,10 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 SHA256 dde1ba982a802bc124d82af92c5475cf7259e504599c1ccf302895ba03117b87 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a WHIRLPOOL 115d3468af4eaeab1fbf1be997e6fdcd7390a77e75372616676df787b768c9f66e4969fbaafccac01edb75d9889b8ff34bd0b83b8d5802c459d01c07602b6a2d
 DIST zim-0.65.tar.gz 1899614 SHA256 5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb WHIRLPOOL 22bfeaee53214029538ba76d309f3413fa327aec125e49270f168a5d985e37672f3a8cc8043e4a35d1141ffb54f958c0a466c6edac4192028893d017401ce2a2
 DIST zim-0.66.tar.gz 2020216 SHA256 e8b53948097f211972713252f3a89b2957e3a63f55eb53587e2474dfc4cbf6c4 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9 WHIRLPOOL eca653cff7581e3f8b4e43d33860e49cd0fb36dfabbdb2aefb86cb9aa804c269a32ea41823f8292969f9431725221032c91881e1a328f780e1390a3c2587ef2c
+DIST zim-0.67.tar.gz 2034747 SHA256 b37cef3d4906aa263abccb1493929a7ea6b9e8d11a50ed92cd437e8f93ffabbd SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94 WHIRLPOOL de74a1a0aee364007d76c2fe60cb9cee4d76fa60cb8388d3b8078144dd0ceb9a28c9a860e3125017d27e9895a2eb933913573eae38a5c560e0bb7db816455241
 EBUILD zim-0.65.ebuild 1822 SHA256 e26e14ec95f6470503fc26dc91a8a3033c6a914a692d965b24ff368eb335f855 SHA512 bebb179fd5c993a91307ad3054feb8af96d54cae2fde754ce0fb844c68aa25227fb430417125490b55d4c1c5aa2ca34372bf2dee20ce6275e4eb1b288b65c77e WHIRLPOOL f23bf52f5296dd895310de4221b5b586e669cafa7618b5d6552022dd92f37f0b67b7544c97f83182fb54bfba1670de2ca60e0504a9ced289277a6aff454a894b
 EBUILD zim-0.66.ebuild 1824 SHA256 4d523e23f118d5a996ef17d63bdbff6836f41233a372bbf78b3e3ad08fe72924 SHA512 23cf416615bcc2cf4719474fb8a79b196916b3fd6fc2a3eaa018e3e00cf8a37a56d7446ad21adb866e727d942300443cec51eda4beaf2830bd7b1d4ec28b9677 WHIRLPOOL 8ac5d15f1b7385182deed9c4bac3333099ea0d61dfedcbc86a2c44de81a47ca59dfd111bab9addb93a64811f499254938107dd17d83475aba084fa9a3c3ee43f
+EBUILD zim-0.67.ebuild 1873 SHA256 72dcbe7219e5299b46bcd41e66348b74847687b598e2a20411ca6448a385a92a SHA512 8f57af64bb33b49b1ea66de20d571bdd63e0d063cebc8be7043eab944136c203f39bf6246d85dafe90c800191f8f98980ef6f090b934249edf4113f6310de027 WHIRLPOOL 864f342297e58e4850d15c54a2f6b5f358c6228ceea8228bcd524ef7b53603ca78a699eb9a0e00f88c676b2df0c65447f769c31123aa196230660abb68955dd7
 MISC ChangeLog 3259 SHA256 416b51a134e42c3c0674145c914c61f7edc6b0b44787f16d4dfb6082020692a2 SHA512 c73df957779e9dbd5bd0f1a227bfed4b55241f2b2a048988c33209368ffd0274d5fa6a7aa3a715b2c684d28c01e4b82ebd7d8ad4ee1ce5cad4f4ff364b7b93a6 WHIRLPOOL 7b78857004fbdb3eff68893827537af38abfd5bbda2c2b854f4d94ffcf25106cd7bf278805896776808e2c2c375f3d18e167f0951827b90297b2618cb083bf62
 MISC ChangeLog-2015 5183 SHA256 3049f6000cdb3bd5b276bbf410aaf429ae51feb9c018caf59ac924e464701f2f SHA512 1673779e884b4701053cb747a43aa6ae89db9bdec2548c448a025cad59be7f021119729eb5273a0279b3f8e549639e70cf4fc459b25ab9eb18fb1e6e293e4614 WHIRLPOOL e81790f2d988c9301076f16da59746fa4a53993b0308320716c273b3ddd2ced665cab41a5589e7b5dfe6ad952d4b5cced54fb701b285da10fb7f68d316745efc
 MISC metadata.xml 824 SHA256 2ebd26a8094b521473c3968474243647e51e3f65bb5023883df60fe1604d27d4 SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816 WHIRLPOOL 719b71c446de2662c1ecd614f5858deb32adc8628ca592f959a62dae67c081f142d5a5a23b4f3ad6cb4924a3f7e3c98b5ab54628e64e6a60b2e378000d300d9e
diff --git a/x11-misc/zim/zim-0.67.ebuild b/x11-misc/zim/zim-0.67.ebuild
new file mode 100644
index 000000000000..809a199ab638
--- /dev/null
+++ b/x11-misc/zim/zim-0.67.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 distutils-r1 gnome2-utils fdo-mime 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_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_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 "    gnome-extra/zeitgeist"
+		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() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}