gentoo resync : 28.04.2018

5 files changed, 7 insertions, 37 deletions

diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index ae3592f0ca9d..d2dde6c01130 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,6 +1,5 @@
 AUX awesome-3.5.5-cflag-cleanup.patch 660 BLAKE2B 0c4311d7d125161c44ed668da6ce1e2bc0e2c5a1850c2341e4caec764a2673f99570f06856c815454f6cc6204bb7b71bbd416e862156cc40c47bf0343a6e1ae6 SHA512 5711e328839ce32789fe213c2c1d6b56e476d7ba09303d52dc5c307a97b35bbdc1c9c0d673a51b5859a2c0f035002152c762e3cd725c4231bc811dfac5dad79f
 AUX awesome-3.5.5-util.lua-xdg-icons-fix.patch 1756 BLAKE2B fe0ba6026faaa674f2b461d95cb6b829d31e74aad8b9e5559c598dec46c62a3218beb4cfa075ca7028d74f902ae5b16949fac7cbf4bac06f436d1460dcd457c0 SHA512 8348b51a90ac9f0423de1e5ae81aeee6dc8da8e249bcee09a0ddf89c582b34f1f420ef579d58c717078bbf7eedb6cbe36782bf9cfddbe2bd27e96c726bd493d6
-AUX awesome-3.5.6-fix-multi-instances-focus.patch 944 BLAKE2B b81026a955b0611fc0d3600282bee3467ccf745f20e4c056cb88e7158610fe5e2a0f695dcedca905b2394354689989d08841473f496c907248744e7a76faf565 SHA512 8e4ae1841c2cb9c2083d09841f7381d81fd99070a31d6a2a1f83bba7f18180b276b81cc38e12d6c272e60351f05b63a07318d3fe3b5331ab0c8fe915b89b6092
 AUX awesome-3.5_rc1-convert-path.patch 539 BLAKE2B 4904c47c165384dadf6229c1d92cbc313df1e70566b894b9b325d24d457b99d53544e885f6c086073c903aca6f2b365eb2384145c85194f1ab91740dee5142b6 SHA512 b5b8f42ddd21bf851e13fe0a0d844b055795979ae701a418780a2e0282cedd1ae745f00c13e5a0f5b9ac48a70c2ffbf7d9b7dd2856783a4b0434b09683947150
 AUX awesome-4.0-cflag-cleanup.patch 395 BLAKE2B 02865c0e99fc81e00e501758d95eb47ebb3960575258c42550f1530d97aff14256911b8107eac606261ee427399934d877d9f116a624216dfee143fd9eb4a8f4 SHA512 e9ffe2b66046e0ebbc0bb3c0b8f9bd67bd7d8d351792e299730abfbd8f284dd0631e87b27a8ba22587e9059b13d13381902efb4b9423348b735021eaee779e9c
 AUX awesome-4.0-convert-path.patch 257 BLAKE2B 7f4504273e155c6ae70fc8aefa067513af32fa6fc38efeab1a642e8594910bbbb559dbfad33c703420b0fa64e3aef9289750f92a41aa5d76e29161f32a1cb6a3 SHA512 3eadbc1d14a18e3d669bb8ecf3769ff888d4b30328f0167166c8632498ad50bf21f004098960507a1b96c5bd5f76a4fcdc74022d820d2d809175ec2829a26f5d
@@ -12,7 +11,7 @@ AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
-EBUILD awesome-3.5.9-r2.ebuild 3128 BLAKE2B 6bfeadc33b1361d5a3b41d9a82a4dea3200bfea3aa32443d021bf2587b2efe06d8fdfbf59a0b436a52e20cab280152e82ad95f2a29c3cf85e9b548be9bbc26d2 SHA512 46f130bd63eeb8170a8e4bfa2eaf6284b95c75aed09e42986472515fdb39c96d896abf1ce6683f4a9c0ee46237bb33553fed60f9f34acfebe499e57fb91c9115
-EBUILD awesome-4.2-r2.ebuild 4042 BLAKE2B 45ab6d3a4465c43be6da4a93a3270d45684b2ecb072bc4685b2be06a9dda20790ecc9f970199e40108cef4f4d3ec55c33143d2bef3e11f5f7a41b3b2879f3687 SHA512 7f95ff7b39824c8e2e22e9c49eefde5d87f9ad9ee7013e217d0b94cc610d2e15a0506f3caa7ccfef4328ede7c964963f74d412dfdeee3195c250ea7db32b6fa8
-EBUILD awesome-9999.ebuild 3622 BLAKE2B 1b2626313a2153c79d14405fd3df8af3e8272c764114551fd5361d8612382e38318aeb32e80e2d2d01b698748ba560d0125dda30a0f05452610c77062946ba26 SHA512 e280c8d6acd0fa817ab0fdf951f5c6f041e1f1a52a5a1f04a7618ec63fccb649aad032cf749f3c03536ebc79f2fc7e16935e0d7da4a77dacec4c89554484cdaa
+EBUILD awesome-3.5.9-r2.ebuild 3127 BLAKE2B 4166794a00826b0ee6f60a09da0e4741509ca0320b7e8db8bf382405a6c2b8292bc98cb2c7c8114581e2d6cf7d732ee7c4378d6e78e6c0ad24df512357ce81f4 SHA512 0d889d9d15de5faa6dc0dd910d22ea7ed40f81818bc021d48c11a67736ecfdb2c9927a5cca6042ed2a730f8d77cf97d05d0e07f8134f979e78f632628b814ef0
+EBUILD awesome-4.2-r2.ebuild 4042 BLAKE2B 9e6873ca0ac2d9f61fb1a6068657a4e8f40e85c263318a20656f838bfd46a337050b32553a455156f00d333173fa4d9c770d54744c2cae06ca72a28e0e1c88bd SHA512 37e782168c0192d5d2da87193029c709c331a79ad050491f6b0d56cadf94894713915b87b2a02184d4076066b51f99d3825cdeb183fb8610477f4014cefab164
+EBUILD awesome-9999.ebuild 3621 BLAKE2B 9026ba9b17972701ed22cad718cab87b13b54a5aa050d46624cc909e71d184075eba9cca443040f5f270e9474d458759967fc522687e6088fd733ea7f6d21c29 SHA512 6a23d4ef60be5a746a037d5ada66ef018f3b5f0e83714ab972489a0434430562a7f78b9eb85c1cb8e7c279485bc59d5efb94963809a93af0321590c0fcc65918
 MISC metadata.xml 568 BLAKE2B 2a3b777ad5eca2e372536b4ad13b3861b67f88d1cd7746c9a5c0d5b42ff2aec908d53ffd338a5eed7f146f74602017ec67a3d1e1cedcd61d57741af9c599d754 SHA512 6f46bf6d3ba0d5d7917e6d54fa4b98309a7cca66da2299b3206544b90ff1322a2705fb11cdee31808d91a3a59149811c9c25436cf204787278c03f620ef3b105
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 0f94c1127f5c..19db570fd479 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	virtual/pkgconfig
 	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
+	>=x11-base/xcb-proto-1.5
 	>=x11-proto/xproto-7.0.15
 	doc? (
 		app-doc/doxygen
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 6b1db77c3879..2ed75628ce4a 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils versionator
+inherit cmake-utils desktop pax-utils versionator
 
 DESCRIPTION="A dynamic floating and tiling window manager"
 HOMEPAGE="https://awesomewm.org/"
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	virtual/pkgconfig
 	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
+	>=x11-base/xcb-proto-1.5
 	>=x11-proto/xproto-7.0.15
 	doc? ( dev-lua/ldoc )
 	test? (
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index ec01a3cc9a5d..72cb2ec82622 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	virtual/pkgconfig
 	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
+	>=x11-base/xcb-proto-1.5
 	>=x11-proto/xproto-7.0.15
 	doc? ( dev-lua/ldoc )
 	test? (
diff --git a/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch
deleted file mode 100644
index da306d1fe493..000000000000
--- a/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 1c27a69131428e9e733374c2a3676ca4ecee45d2
-Author: Kimball Thurston <kdt3rd@gmail.com>
-Date:   Tue Dec 22 21:46:17 2015 -0800
-
-    Fix focus handling with multiple awesome instances
-    
-    When there are multiple X11 screens (i.e. :0.0 and :0.1) for zaphod mode
-    style X setups, this triggers a refresh of focus when the instance
-    running on a particular root receives the mouse
-    
-    Fixes https://github.com/awesomeWM/awesome/issues/599.
-
-diff --git a/event.c b/event.c
-index db70e2c..80d6bd6 100644
---- a/event.c
-+++ b/event.c
-@@ -554,6 +554,12 @@ event_handle_enternotify(xcb_enter_notify_event_t *ev)
-         }
-         lua_pop(globalconf.L, 1);
-     }
-+    else if (ev->event == globalconf.screen->root) {
-+        /* When there are multiple X screens with awesome running separate
-+         * instances, reset focus.
-+         */
-+        globalconf.focus.need_update = true;
-+    }
- }
-
- /** The focus in event handler.