gentoo resync : 01.12.2017

17 files changed, 138 insertions, 52 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c48400759397..8e3fe499b13b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index b11e6277aa41..35dc902501a6 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -4,4 +4,4 @@ AUX blackbox-0.70.1-no-LDFLAGS-pc.patch 615 BLAKE2B a0b40fc2b0ad66731387224a6534
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.70.1.tar.bz2 492399 SHA256 92c2be347253f29b10063d579b4267a21516cb322a41b5e83d770fa6d44afd21 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb WHIRLPOOL 8cab9c8ff749e4aea11bce5aca53127013cb5e36d791b426dded53dcf3db96590f6c43572df8ccd0f89e33b9ddfaa1f69cc1bda89cb7b85ec21298eba6730606
 EBUILD blackbox-0.70.1-r1.ebuild 1341 BLAKE2B 4b24b6f95bf133c951e50322e4045459097e6c477dcb7e486f46f6a097e969ea2ad9464330df2791d4b499807167d3e470a0d12cd3023652c6ce3e283f4348c2 SHA512 7755948d3a51f9d618996fbcfcd4843d6fdb56751e57232486852ca4f81a6eee979922ec1186984ca17123c497d38b0925f2dc7b5c2f70acfe1ee9eb8b4e8312
-MISC metadata.xml 493 BLAKE2B 757da2d4c24a731196ddace29f0c1a5b2dbc18531770df41cbd04ba6416cb4952e9b04e71a22cda341b162403415e1aac2989840f9191ceae14a0f65b654c521 SHA512 df0ba91550bc426a0acba235808b3d9df5bc19c21e900d640f3eb14a3be9f89262916afcc17681a44e64bc91f4360cf2ea39473c9e2f0fd8e45082bdaa98bf92
+MISC metadata.xml 490 BLAKE2B 0ca863be035220ffd4a469ec8acfabca05ccc05f45e0fac9972e9a329704270699128d11eb83c3605863cc2d4e53a7fcf3b91104d0efb1fafc76e72f88fedb96 SHA512 e750812e501f74eb1b6f04eeda051bc651a474e0cb667648e68ea46207a1bdcc6d596bf38362dd02fa0c1d48225ee382b00ef276e886c7c525eb0bdc775d76c2
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
index eb1e7094d54f..5d2ee1af2e01 100644
--- a/x11-wm/blackbox/metadata.xml
+++ b/x11-wm/blackbox/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-	 Blackbox is that fast, light window manager you have been looking for 
-	 without all those annoying library dependencies. If you have a C++ 
-	 compiler and the X Window System you can compile and use it.
-	 </longdescription>
+		Blackbox is that fast, light window manager you have been looking for
+		without all those annoying library dependencies. If you have a C++
+		compiler and the X Window System you can compile and use it.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">blackboxwm</remote-id>
 	</upstream>
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index f748fb289e94..a479f3cac69d 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -4,4 +4,4 @@ AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 DIST fvwm-2.6.5.tar.bz2 2582655 SHA256 21549995c53906be5533746a1cf61b1ecf8dd8ef6816a0b20615d45ff78b48cf SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698 WHIRLPOOL 65ff02fb9f0c9ac5803a77be5b61621393ebb0a772acd32370c7796340726cbe3bfc125a56852272ec4fe619031bf12cb7fb8bc7ed1852b3addffaa355221e68
 EBUILD fvwm-2.6.5-r1.ebuild 4840 BLAKE2B 44e4c8e28121b004c2a43c3e75816a4256881afab01eead66f0dc3fba05ca285d9fe536e9b94cd86c9d02485abf38cfd5f539a056665b95c2f3856e68297c99f SHA512 6330e511bac5e014fc3170a74d001cf9c1afea7b8c17fe0981ee2f42e59dd99fd8758c54d096b5655e1b3b698f5daf315e1853bd083b5fcaeb12a4e458eb3181
-MISC metadata.xml 779 BLAKE2B 7a56695d14ae4fb8fe8611bac3fa52c4c70e405811fca20587880f121103a22319e20c71a8ca1d93e2c51b8b7a15f3ce88d31d7bf5bf862ba8b1eebf693629b8 SHA512 bfe326504d814b71059aef279136b602a7ff99a49ac8f70073a5d29fcebde258eb369e9c00316df076ea90005e2158e29b10b6af2c638b4a124d4b6286fc4cf4
+MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 434919c67111..63c21e06e5f1 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
 		fvwm is an ICCCM-compliant X window manager providing a 3D look for
 		window decorations, multiple discontiguous virtual desktops, a high
 		degree of configurability, and an external module interface for
 		implementing functional extensions.
 	</longdescription>
-  <use>
-    <flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
-    <flag name="lock">Enable screen locking</flag>
-    <flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
-    <flag name="rplay">Enable rplay support</flag>
-    <flag name="stroke">Mouse Gesture support</flag>
-  </use>
+	<use>
+		<flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
+		<flag name="lock">Enable screen locking</flag>
+		<flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
+		<flag name="rplay">Enable rplay support</flag>
+		<flag name="stroke">Mouse Gesture support</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 877a4b8c0ada..89de42d93d82 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,10 +1,10 @@
 AUX i3-4.13-remove-git-polling.patch 580 BLAKE2B d1597903a553231a953e87381ca3462d9e4f4f0ced231308861e6cd8e3740008fdebe8f78cc40f9b615354f06e4a66d3be3ae5c8c5e294154cb6a42674a57f42 SHA512 169eafa91f9499944f65c3b016d6760780d7ada21d718bb96e3bd822741f0d5b30e13dd7493233338e193f1f565872cf896e3e4344a1228fed596c33ed68db8b
 AUX i3-musl-GLOB_TILDE.patch 2828 BLAKE2B 6ab0b8e92aacfe648891da99ad6ae7058b7abcd9bb0d54d062ccfe45d6b1b56039b38272afb725605df77eaefc0e82167588637dd60204abc1b22a59ced9e8e7 SHA512 8ccf5c558327f099ac6881bc3a5b2006aac491f21fea429a4b7184594974815836f3eea517a33b8e852ba30b913bcd3637b08ea92c0bc1f5d3d9f778c2ce087a
-DIST i3-4.13.tar.bz2 1121298 SHA256 94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c WHIRLPOOL c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
-DIST i3-4.14.1.tar.bz2 1173560 SHA256 d0063ac561f3aa8d7e31e137356815bad781bd6ad774030362c89abe96ab5fb1 SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472 WHIRLPOOL 95bfc65c2ff172121ed4091efc5d6d770eafe1e53189018335b048363e669c02a5221dfecece70d2c357de41cb8a42f19bca8b46a45e1a423a1e20741c8b855d
-DIST i3-4.14.tar.gz 3936748 SHA256 6807a578275be936289986a77f77320e1581dad9e752f2fc7c443b6aeaa0d14c SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe WHIRLPOOL 57aa268c52a4271a6170042c31b8e4cba82486ffce96981c96a305e2d7c613f2abc6e5f395c598fc93acfffdf34d45c8f131b79deedc2d2fc7cb5d1dd5ae2499
+DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64 SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
+DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
+DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 EBUILD i3-4.13-r1.ebuild 1898 BLAKE2B ee0a771f9735272a28285c38b30d9693d6eea70c4238142a271c2a31f3a54f874fb88b22acde07895577aeccf98f0ab124ae14cbc81249316c4a2f00cc88c1a1 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d
-EBUILD i3-4.14.1.ebuild 2344 BLAKE2B 0ee877d3312c8e0696f0fade1002351525113848f6469db05f0c916bf57487f8e01a2fe385acd9a5c7dfd1cfc4f48859699f9e6fae5b6d4633eb7dcd81d45130 SHA512 4fe133519221ba31e13019042f80e2b0ca1ff02c825ee6fdf4a1fbf985c4cb7fb6213abf505be88ec247098e017a8a29c1154375f576b39a37190e61ddcd715b
+EBUILD i3-4.14.1.ebuild 2371 BLAKE2B 2ec6cdfba2d21e551d1a99a6ed7f75702fb6f50f54a23665f34da4d8af38cd9386dd7218454fa29026b2a88aab4f2d0985e8d71d9125a6e36524899f591e68c9 SHA512 d0cb4bc9ccaaa72d3cd090acb0ac4f3eef694c78a01d9d2ddaa07d50e100eea9811b7a5593f60eb62c77f609c0a44b0cf18a27815824a2e2c3e4be3117c2b420
 EBUILD i3-4.14.ebuild 2018 BLAKE2B 1623ddaf5351872074ec15137bbe61ee855d65ea31915c8090346164e574af4b9d9180f0f8665d931a0cf6464c9ee40b2702f38919559a0851a5f560d1c94fac SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d
-EBUILD i3-9999.ebuild 1689 BLAKE2B 44a71f8c9a1aae39b6ec3ffac9522d7ee4129978ee53396ec21c0b3b0ba6622f9a24934e2b57afdd5bab0cf32ba175e42d49e8a033d4c3af7aa496e3937e41a8 SHA512 2b74003b82295124fbab9f86f312d6d56ac75d5191e04fb914758ef81e4a974fb78a68bffc3b18372aeb50401c8ddae90d3dc85c7c77ebfbc12db7472b5d665c
+EBUILD i3-9999.ebuild 1716 BLAKE2B 46975a8704867cb17347dc1a2abc133e1d12a1ad2db0f6e27d2e6cbd68fbcf1e52b6c7dc9da4a5da1f99958fedbe1eb6fe5329bf46778b868b656fe9f19a8558 SHA512 da9b92fdc17543284b129956fbb517f49d670121f2e3d0cd5fcec2239612810030a4d45f6d2178c22d6c939d3528bc97ca38c35c2073d45f8b208b56c6dcd505
 MISC metadata.xml 578 BLAKE2B f7f67f561bb427395103450b3e3c40d80001b4bc820b9c33fada9017e7c030d14940b4ca74669ded3f474ab1f4ae72b89ea640304752888212d86ba17c5b5405 SHA512 b0585d5a5d421e8176d1f47e250e049e41cbd375a19f4769d291108e81847dff71c1ded0cd22b25df50af69896941cb439c4c39317414784df57cfeb33dc946e
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 41be551dcce1..a79166c8080f 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -26,6 +26,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 	>=x11-libs/cairo-1.14.4[X,xcb]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 1775d348c34c..cd758177621b 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -27,6 +27,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 	>=x11-libs/cairo-1.14.4[X,xcb]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 9ff6d1eeeade..fb85c18255c5 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -2,8 +2,8 @@ AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882
 AUX 1.3.0-OS-detect.patch 408 BLAKE2B d12dff0ac02af8542367ead135f9205e4e310acc3f4afcf222bb4fb0ba1eb395f2acc3fa7c7ae53ed5962da125458e0447996a96af600fa283ff4fa9485f1037 SHA512 ecfe35648ee83635dfe1a18cd27071ef5b707a5246e0978f31e2cd5ac71e1a55ac7598988a435f8f26cbc39f5b47c20335bb956b2cc2993239ea5e76f09a039b
 AUX 1.4.0-poppler.patch 511 BLAKE2B a81c3086043dadfa62cc493a37ca22044a74d2e4966ea880f0dad96f3d0940445e9cfb575a6cc8525aa22f6c313fdea11d3c39ee00905a50f349bc69fc472d5e SHA512 fe765f11ecb7dc99d421d8e4b6fb3fc18279755fbc7ef41517d315e2ca3fa703ab7826f6ce2de62198354379c66d02e1dd4240f33d9f621fa1e9837fc2222b60
 DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
-DIST lumina-1.4.0.tar.gz 22489118 BLAKE2B 547d062826a6b253cb361db3fb030c182485d335dea3baff7e30f1331c67fbffca619dbee4688f79ac04ff04e5ef2ceeae0c1146d18730a25b7d01125bc62fd3 SHA512 7243fc366a851832d9431df8ae8cac0f70a7bc92bed1282e78e5775c6593d799a07e2cac7042d770c8d6c4758bb142523027d67227a2282b47ed945b0e617cb0
+DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba5987113a12f72285e5dabfe25ca763683a23cb76889673ac3c2817feb2233e8b7da9fefed41040f91b0bb01d8ce03ae SHA512 340079832f4f6c9c9c70f11d7743b7c7db6772897f6411a966bf2bd77124bab1fbac8f5751164fb8a08a12c4443f515aaee76b117b4f959263eeaa98dbcbe41e
 EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
-EBUILD lumina-1.4.0-r2.ebuild 2596 BLAKE2B 32cf312812abffcf373f0c55873f295b02bd366838e82677ad3bc5b24238d08d356ff59c45958f6dfc2dd3b8168b30223e642df68c314bde04f6d6f3841d6a95 SHA512 1834805af41c1fd7a49c5c7489674149e41340e4f5b413e6d67c54242650402503a9beff342ed9b0ddf124bea5250cac16ab8bb733f9e027f763f7d5bb414db2
+EBUILD lumina-1.4.0_p1.ebuild 2596 BLAKE2B 32cf312812abffcf373f0c55873f295b02bd366838e82677ad3bc5b24238d08d356ff59c45958f6dfc2dd3b8168b30223e642df68c314bde04f6d6f3841d6a95 SHA512 1834805af41c1fd7a49c5c7489674149e41340e4f5b413e6d67c54242650402503a9beff342ed9b0ddf124bea5250cac16ab8bb733f9e027f763f7d5bb414db2
 EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.4.0-r2.ebuild b/x11-wm/lumina/lumina-1.4.0_p1.ebuild
index 4bab7adf10bf..4bab7adf10bf 100644
--- a/x11-wm/lumina/lumina-1.4.0-r2.ebuild
+++ b/x11-wm/lumina/lumina-1.4.0_p1.ebuild
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 54bc930bb593..584394f59abc 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -2,11 +2,13 @@ DIST muffin-2.8.5.tar.gz 2715965 SHA256 0ae19de74111f222b44f7bf8d159437a83c6ae2e
 DIST muffin-3.0.5.tar.gz 2717820 SHA256 11c27abedad6952aaa446d37ad23e910c3c51dc0dd8d29298cfae2c3ad917e64 SHA512 2d4d37099e33ee5b0817970f5f7e264d679752ef5a256916e54a7072419e8c75a67d8609c541238bd76c462a85c9841167e051b3ced968a557aa4a90f41b2d5c WHIRLPOOL e57f4ab9970cabae7039bdedeb3f02abfb1b4311824af39eb8022cff694f3c34d19183b133f81cc0663e195ea66b32602462e145f1ecb77c63d17d4ce2b065e7
 DIST muffin-3.2.0.tar.gz 2718913 SHA256 061966c2c8520804e1338de0dd499672a7f054aa7ae32b2fd98e49e656ad9a21 SHA512 f1c17fdaf4d8f32ae9e62a60811a24c120413ad2a1e824ee412527a2c3336c2523596cb06fcad01a2f1fbf1a09a78cc30a5769b1cb860ce26d96690a8c3c4043 WHIRLPOOL 14ca0f448f22cabde6aebde70438bba783c26f5b488b7691bf54c26cabd97eabdaf083cb5988f76f0a8bb13dd190d6ffd32214bc425e0234ec34eae40723e47e
 DIST muffin-3.4.0.tar.gz 2719701 SHA256 bbfd8997ad0f03d029f804c4927f464e89276ce384aef5aa6787dddc04e6ef85 SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d WHIRLPOOL 18c0e77aa3766528ea93c2eb88812f4bdb9d4360015799edff12c8a1b6951f61ff31767e61ab7dabcd3b20ec3f8097cfb84726f70bd77600a96beae0c8af7992
-DIST muffin-3.4.1.tar.gz 2720297 SHA256 f051c9bb1291381c9e32bf06ef829cb2ee894e8d6293a4d2738c8655d3643c26 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c WHIRLPOOL 9e9e4e646d64d416f88baf5bd245c22768ce71267fb2e8fe7709d8377a495beb6ab3fcf59f9a282800c6251211bbde9844474ddb6e847e1b71df7e7205f736bc
+DIST muffin-3.4.1.tar.gz 2720297 BLAKE2B 94b628bccd6542aa46d950fe6b2818baa8c429f7f116378267b38f302b99b9ff589eb7d95e303ca30f37d5d4a5c3af8d4a50d819a06db3584366892b819e81a3 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c
+DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 EBUILD muffin-2.8.5.ebuild 2113 BLAKE2B 73cf05267d58cc0568cde5da90913dcfcbd88e0b0aaa6029f19e5fa0609755ccf2ac7467b624b0c7e95471f368ceac03261e9a618bc017d538c9ce0d781ad374 SHA512 572c9c02850d30fe088ff832a1a92df2ad422d250a6739e94d0240668e1669ad8f677ac55409b4d136bca6f8d6f5591b232096dab2bf09378e56c3ccd5c30f2c
 EBUILD muffin-3.0.5.ebuild 2070 BLAKE2B be1df268e344dc8ae35e29c18bcce44fbdae2be99382525467be1dd708ba76ca0b1651079519b3bc2163c1195f4741cede47d57773b1c939042dc9cac2ed17d0 SHA512 f3596e96d56b7b7577bc5c368c792322260221951fd5fb2eac71689d1d4cc54dc8ddc0b2990a41d5d7a5aafd6ff293c01fcc36f026853a2d2161fb4ee172ccd7
 EBUILD muffin-3.2.0-r1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
 EBUILD muffin-3.2.0.ebuild 2072 BLAKE2B f297b24912e563e831e94406f4afda05751273dd3b422d309682f7b935a63c1fd3bb430dc349fdfdfc54d95b85ca39fc16f42df00db8d9f2398399afb7418365 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac
 EBUILD muffin-3.4.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
 EBUILD muffin-3.4.1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-MISC metadata.xml 345 BLAKE2B 19867f3eea8f8950876b93234198d6d1e7c632d04422500527d7d4a5cfbd7d45f440355c657b094956b054009b4e94673cc581241ad74139441314104d956d3a SHA512 e58170ad4dfd2f521bb2a10519dcc46772b00e14b6bd3fa107532d1b825565d82fad2e814ae9ffa2150ed9435965095428ccc4131c946a7d63e10575940ac470
+EBUILD muffin-3.6.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
+MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 658465f83128..7b5976166a10 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
new file mode 100644
index 000000000000..54cfd8ecf95d
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 8c108d2ca105..1b03206b0f3f 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -7,4 +7,4 @@ EBUILD openbox-3.5.2-r1.ebuild 2716 BLAKE2B 459307d03272e0d95b3f21cd49df2430ca29
 EBUILD openbox-3.6.1.ebuild 2750 BLAKE2B 8de71996996a737ccc294003904e4c355f726f5573618815ba7bd0e99df27206e76439f1e97109315308ce7c9772227fd0ec58bf0f01981623bfd26af7e5c66a SHA512 e0a5e23ab9323d4575ec93ee5fbf1491e6331676528c665859f97f170b69084d9f96b02febb58a240a436027462c8cc3e3f5e5681fc272a37466b589002aaa28
 EBUILD openbox-3.6.ebuild 2724 BLAKE2B 23ad664cdd28539e02804f4ce853ab32ec50fb6aeab35be3290f7d5259d22c3b9fb5809600a7553264bb56bb152151e10b82b8cc8a4f55e96fa2d287de275843 SHA512 7bb1da8b01675655a6d35585b8c4ab5b3c9e27923dc5a4ed58c1f5a47564318f4e97a3718b4332e1e7e8de1a8f43123030b134ce00c038f3093245aa518496e0
 EBUILD openbox-9999.ebuild 2677 BLAKE2B febf4ab47eaf92d02e30139bf53256b743ad754dbc818de3e10fde13d69894d18285d2ff084f87f43bb42f4b79e7427cce5d2c4d56c0b774710a193bbe4b4932 SHA512 8c5df980c5514f99497334841de5c3b382715990c34151ac6e48558f196603ebcfd3c78d46c20eeb1bb2e4c31783e9f3638e7096717a4170ea660bc21162dc4c
-MISC metadata.xml 859 BLAKE2B c4a4b3d1fb0f7338923520efaaf4084938ad4dc31ca67174953043570220efd9b1d8a82adb8f9172148485156e4b2408b22885f78b139ae6993c85a78b4cdb46 SHA512 aef0f2f81315e0d07c4157d9503b9418aa8e1090913a63367e4230b681fb203caedf18bedcac9fa1cefda2bae9f05699ff5b251448fa75ce9c7f7f96510ed39e
+MISC metadata.xml 830 BLAKE2B 229d742b61c0557d742a2157121b941ea5e177764d870a6516af17c30802ed891a833e0982a8e82b15f281c33213575d0fcabe265873f78829a2a639dd9ace24 SHA512 879cbe0783337b93847faf36b5475fcc71bcaa80834fd9910bd6a16ce932ed28943f5e027815ee17d2a33806fef8b5445475133dba962d81b90dd823cf352aaf
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 03e0a0449e0d..4c8dd2cb3bd2 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>lxde@gentoo.org</email>
-    <name>Gentoo LXDE Project</name>
-  </maintainer>
-  <use>
- 	 <flag name="session">Enables support for session managers</flag>
-	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
-  </use>
-  <upstream>
-    <maintainer status="active">
-      <email>danakj@orodu.net</email>
-      <name>Dana Jansens</name>
-    </maintainer>
-    <changelog>http://openbox.org/wiki/Openbox:News</changelog>
-    <doc>http://openbox.org/wiki/Help:Contents</doc>
-    <bugs-to>http://openbox.org/wiki/Openbox:Contribute</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="session">Enables support for session managers</flag>
+		<flag name="xdg">Install the python xdg files for xdg autostart</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>danakj@orodu.net</email>
+			<name>Dana Jansens</name>
+		</maintainer>
+		<changelog>http://openbox.org/wiki/Openbox:News</changelog>
+		<doc>http://openbox.org/wiki/Help:Contents</doc>
+		<bugs-to>http://openbox.org/wiki/Openbox:Contribute</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
index 44a83b026a3e..2f7d0570b31f 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -1,4 +1,4 @@
 AUX plwm-2.7_rc1-pep0263.patch 653 BLAKE2B ee6122379b19aadd9227f7e502d60edd2b88bf8edad238c0793bdcbb5662cb54b38d00f3c8c651aeab1c4cbefab004a963cfd22765dadc2a4a1a8e30555f994d SHA512 82b596bf7d82cbbfbd8aee08f8e80a958f1d2c73526f60ad959082ca294dd58f663bbfde00a6d0fdbbe09059a811994b9edb268725b1aa0bd9e64e29b4dde1fe
 DIST PLWM-2.7rc1.tar.gz 343570 SHA256 789fbd6229ad63ee9b2d939e27d049282dca45315d8e22debad56636a3b0a305 SHA512 4716677c86cf6b31ba8ea6c4e8fad729d9cf7d9c09b7d56ba6686173793c5b248865f0af281561a2df161433ea0fb2f2ca050dfb3b6c9fedbe41ff0ad0c07f7e WHIRLPOOL c1e678b4f15701c644e3f609c9b53100fe376a09f96454094fddba83c7a1f5c167c4746962e4996586568d110dfb3c4232e0bcaf33d09492946454b2e400d5eb
 EBUILD plwm-2.7_rc1-r1.ebuild 899 BLAKE2B a1fb4b16e8a86d13a126655245f8d43343942199b8e5b104ee1b5b39d5f4f0c56da8e00803991ba6a671064645207405d151af97a94157bf649e6f53099bf0be SHA512 1f48aa82a02bb61e0f83995ff03b20060d29784c2f3bd5aa37a7ab7485e35a52a441d8705d2c9cbd6eac3d6bf6d8e9bbf5fb3367dcb62b2e786c16256b1cc2f4
-MISC metadata.xml 482 BLAKE2B 4f8fb69288fa5048b5316fdb4216cd3127793e6432368c1e61ae64d920f5c520b2e24bac6ded398d2862068618c9b14ba1ab8fa29fe5f152486e562e4d98368c SHA512 e109bff59bd5750fabe5d62325bc8d88d2d9d365375232730c2a86126ac276f0b2df238d9705f1f0dfd94cbd43850ed92c92fdbcdce5ee42664fa162d85cd558
+MISC metadata.xml 477 BLAKE2B ab66f624a7bb5f8aa9792068431a37e9e148f752cfd48963fed7ebe90d9877d5b73e294b65744fe8cbee7150abe43d59da9f3a4d686af5065defa3909dffbd0d SHA512 51aecc6428095675351a58b4059c8060a591e21a43b793a8d7aabed3613c9d72ee09f01ff9296e941febfeedc83987956097af7d420d61feba203e60d5a07033
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
index 956d8e2ed88f..d646a8a2cb4a 100644
--- a/x11-wm/plwm/metadata.xml
+++ b/x11-wm/plwm/metadata.xml
@@ -5,9 +5,9 @@
 		<email>axs@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-		 PLWM is a Python package, containing classes suitable for 
-		 implementing a window manager. PLWM is also a window manager, 
-		 using the PLWM package.
+		PLWM is a Python package, containing classes suitable for
+		implementing a window manager. PLWM is also a window manager,
+		using the PLWM package.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">plwm</remote-id>