gentoo resync : 31.12.2018

14 files changed, 95 insertions, 350 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 20e6656e779e..10c0f246e098 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index afefae5e9e6b..94bb8de5f111 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,4 +1,4 @@
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
-EBUILD aewm-1.3.12.ebuild 946 BLAKE2B 742e2865b7ac0b219b47c458d6260535f4814d9245d2ea8e09d6af87aa88ce5997d93abe97f32a4165b1fdfb8a90ac723d4b05c5293a1b46e6e61d45d586c521 SHA512 18f47281037e0cedeac11a5bf02045479b245b946847b2c6c2b2fe6507dd39bf14d64fe3b78d7dd9460076120a88231bf5ec485e2de2a9d1f3e917b5100a2ba0
+EBUILD aewm-1.3.12.ebuild 934 BLAKE2B 849dee900b8b885539807dcf0b460f78d293f81f916da596dea36bf995308e1d37178d8c50d761c3dd7fc089983f549fd6af6d0f9bd0f73762df00d638efa14a SHA512 d102bb3b05fd7a89fb36ef49367e3519eff99ce7116840ceb2a8ee2ac3fecf0321c2f595d0dc43c6f95e5407ad2dff0f6c22d152415cb6516508ade8a7e2faba
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
index 4bc663d65e6c..b2dd5c524da5 100644
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A minimalistic X11 window manager"
-HOMEPAGE="http://www.red-bean.com/~decklin/software/aewm/"
+HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
 SRC_URI="${HOMEPAGE}${P}.tar.bz2"
 
 LICENSE="MIT 9wm"
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 51948a97b7a9..bf57410d69a6 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -3,5 +3,5 @@ AUX blackbox-0.70.1-gcc-4.3.patch 3274 BLAKE2B 0c29f4a2e97e4339cdd436c4bc18ba9ba
 AUX blackbox-0.70.1-no-LDFLAGS-pc.patch 615 BLAKE2B a0b40fc2b0ad66731387224a653485c5b6bf7b7de204bd9e58dca0b09fb1856c6acaabb0bcfced71f4b934eae5eeb54fda4fec26c64a3b98feee2c96c73ce178 SHA512 5728aad146c8d32d55d72e696c21b5d4381859ecdf38fad064e41c25c9516d91ff965137bf1f9fea0028115b7f08b7d38d5e7760837c009b91e2942598f97c87
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.70.1.tar.bz2 492399 BLAKE2B d6faed388d2a1fbfbf10baf2b848f78fc5d99bc4e5fb2daf28df7ec9732d9ad5de9dfa87763cea9a954ed72b23207563dda65c92bb37ba2136e8f6e6049e0ab7 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
-EBUILD blackbox-0.70.1-r1.ebuild 1323 BLAKE2B 9e2b5549edf2296956694eceff701eda6f3784065317e8ec03c6bfe03a7d5e2ce48855a90d5ed093a61957f07a2b59256a6540bd691043634caaa8b6c163c708 SHA512 a0fcca04573cdc00d89cd4ea3b4af0086a4e5d8b61dc8669f281ce8df52e914610fc640f903a432fd2731c6efac98130a4b45259edb95698b1ed932238b3540c
+EBUILD blackbox-0.70.1-r1.ebuild 1325 BLAKE2B 665314a56d6356457909d99994b98398ebebb29baa2a42ba16225799327e0767634d44a190115277bcd9876ecb3d515275e28ffdfa879e2a3ef980ad40685c1b SHA512 ad572e61477e837ca950024354fd24fdd4d9b99a6e0399467568dfbe8be547c8e9746a1ac3625d3273ee08ea476abb3cfd4ae1ecc4920119bd0ab1cf10c5d1af
 MISC metadata.xml 490 BLAKE2B 0ca863be035220ffd4a469ec8acfabca05ccc05f45e0fac9972e9a329704270699128d11eb83c3605863cc2d4e53a7fcf3b91104d0efb1fafc76e72f88fedb96 SHA512 e750812e501f74eb1b6f04eeda051bc651a474e0cb667648e68ea46207a1bdcc6d596bf38362dd02fa0c1d48225ee382b00ef276e886c7c525eb0bdc775d76c2
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 773ef0d41a87..225deb800cf9 100644
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="A small, fast, full-featured window manager for X"
-HOMEPAGE="http://blackboxwm.sourceforge.net/"
+HOMEPAGE="https://github.com/bbidulock/blackboxwm"
 SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
 
 LICENSE="MIT"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index b9a0319c68f2..0bb3018a42f8 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,16 +1,9 @@
-AUX 3.22.4-clutter-missing-null-terminator.patch 1071 BLAKE2B 219e4522e1cba2d5b6ffb474c8fc7063bfa85db7c186c02f95d882a23a36f0695f951185f08e55db85b3710e0821567d43fbf5935b37e41fc1dc6478cb86a60b SHA512 743bf69779f4b7fe7eedd483682e7fc353bac42bffe2cdfa4ac079c29eef81e0be7fdd993752523d8ff3ac71f86dea78ad2041afeb68815cf4d564c68bbfe631
-AUX 3.22.4-wayland-clipboard-fix.patch 1283 BLAKE2B 294a69b435ead3f25f454ee1f94ade53b264b8b6050e1445e84eb4fc8a5adad4af237069015109779dc75a80c8eae3dcab623a4f1949f1397f4e7980aa6d05e3 SHA512 71436a5ea1cb325795ceedc536211dd3c28ef5bb0e8c9904b171354031c0d26e896ec0ab3ed85c3e4fabdba01f70ca9433a9111f7fd0b7bb04bf6ac365e9dce3
-AUX 3.22.4-wayland-crash-fix.patch 1149 BLAKE2B 5269eeb85bf39b176d41cf4c62d87c447a19ad08e12810c3697defaa5bea1a8d25916d488e6d378c5886e5de76f7623a7374505d086fe94d2e965da2460bd821 SHA512 68b629b25be5e019581aba2883f2409b65279758d814ce8f854b9052357adf44e3f2a649ef4aa8ef398afa8e4a58117fe1a8ccc6040c3578acfefbcb721cdf4a
-AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 BLAKE2B 7bfa1bc1b1111829af18e0ae991449c9e93b1a09fcd528492cc6d514827170346c911567256a2d6e5bbdcab155b6f00cf9e5760bca2ee535e6c1e00301daa2ee SHA512 e84319db9c0541b71dec03bd466b64f6e71637034bc91263d25fcf6546469435a4d77acaa32b24532e540fe62b079521f4d60c5cc2e1f0571b2f3cbc4917c964
-AUX 3.22.4-wayland-size-hints.patch 2281 BLAKE2B 022782665cfd36da1bb60ff7ee459041e10d41d59b99cf1a806bc76c207f6e168e96e0980e72b6bdf12307874343a9f27cd83961ce01ce88a331fd88671e0107 SHA512 cf2afdb822f67a729713df571db446e955b111ac5d56342ba318646a6b3302a8cac394d63166c4043b94678360d19e3d35ddf60102794c038fdfc9039729318a
 AUX 3.24.4-build-debug.patch 1159 BLAKE2B 1ceb783c5c1c8117c7b4e9809a370d2b46ebd4fa59b401a99f60c7a8c06ba88fdef6a382149fa6ae0b0d05344b24640d730d56736dfe38b645578f3b01c41528 SHA512 e0ae9b9ed1dc74b4b2a641f03589408d078ac7a2250e75fb024dd765dc755a6dcd1917d62cb271f541db5cd97ca8417433f8cfe8e40250331adc5609bbf1ffc6
 AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d75749140f16f595deaec1aa47021650da569e2f46b0fc4c446cf86f735c3b3a5a04df72737d175a51eacb52c0b7891 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2
 AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
-DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-EBUILD mutter-3.22.4-r1.ebuild 4094 BLAKE2B de24b62132b4b954a6984fadcb4fee2dcbf7bdbb5f6baf4ea34a5f61675265abcdc085528485931d1ae8a600501dbc6dc3f1e68db7dc1c3c936e6b6ee64a4e6d SHA512 d56659236712d90848b51e84f2890f0369c1e45b7bd611589a729b261f82d8f47413d86fb78c9cb165105a1e908ed98cf1dcc2268b1ffd2625271b3ab2965947
 EBUILD mutter-3.24.4.ebuild 3692 BLAKE2B e548157553fa97d84821a7a3c5cda25dd85ac1b9ac7301352810228ebfc12a1a91e5c332dc153d77038dba74a0598d0409d4fa0d7d30afceb63ff1531b795a6c SHA512 91e4831d296738b21a14846e5e6d9edc30cbad82845c2e2fc7c8a5df992944e2b6168f51eeb58c12ea61d8424c7a9980dbad04b18edbfdf9d7973e32a4537440
 EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch b/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch
deleted file mode 100644
index ed16b8c6f4b8..000000000000
--- a/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f6888519ff3e20ec8f5e6064bff5707acbe13fbd Mon Sep 17 00:00:00 2001
-From: Nigel Taylor <nigel@openbsd.org>
-Date: Fri, 5 May 2017 08:42:47 -0400
-Subject: [PATCH 2/5] clutter: conform/actor-graph: Add missing
- null-termination
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759085
----
- clutter/tests/conform/actor-graph.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/clutter/tests/conform/actor-graph.c b/clutter/tests/conform/actor-graph.c
-index 0dad49b..8fbf4bc 100644
---- a/clutter/tests/conform/actor-graph.c
-+++ b/clutter/tests/conform/actor-graph.c
-@@ -350,7 +350,8 @@ actor_replace_child (void)
-   g_assert_cmpstr (clutter_actor_get_name (iter), ==, "qux");
- 
-   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
--                                                "name", "foo"));
-+                                                "name", "foo",
-+                                                NULL));
- 
-   clutter_actor_replace_child (actor, iter,
-                                g_object_new (CLUTTER_TYPE_ACTOR,
--- 
-2.10.1
-
diff --git a/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch b/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch
deleted file mode 100644
index 24e6fd36a309..000000000000
--- a/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 19f08fbdbba113883c6011e4b8ccf3ea3a6eb57e Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Wed, 10 May 2017 20:28:42 +0200
-Subject: [PATCH 5/5] xwayland: Use the right atom type for further selection
- requests to X11
-
-If we translate between text/plain;charset-utf-8 from the wayland side to
-UTF8_STRING on the X11 side, we want to continue all further X11 selection
-requests using the same translated UTF8_STRING atom than we use in the
-first XConvertSelection call.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782472
----
- src/wayland/meta-xwayland-selection.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c
-index a78e846..24b8cd2 100644
---- a/src/wayland/meta-xwayland-selection.c
-+++ b/src/wayland/meta-xwayland-selection.c
-@@ -829,7 +829,7 @@ meta_x11_source_send (MetaWaylandDataSource *source,
-   /* Takes ownership of fd */
-   selection->x11_selection =
-     x11_selection_data_new (compositor->xwayland_manager.selection_data,
--                            fd, mime_type);
-+                            fd, gdk_x11_get_xatom_name (type_atom));
- 
-   XConvertSelection (xdisplay,
-                      selection->selection_atom, type_atom,
--- 
-2.10.1
-
diff --git a/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch b/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch
deleted file mode 100644
index a6eddb1f72e0..000000000000
--- a/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ba317dcd74baebfd8f8c8dd417ded71f6cc8c771 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Mon, 17 Apr 2017 13:27:35 +0800
-Subject: [PATCH 1/5] wayland/subsurface: Handle clients committing on
- destroyed subsurface
-
-A client can still commit state to a destroyed subsurface. It wont
-update anything on the screen, since the subsurface will not be
-visible, but mutter should still handle it and not crash.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=781391
----
- src/wayland/meta-wayland-surface.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
-index 99e3dfd..a6079ee 100644
---- a/src/wayland/meta-wayland-surface.c
-+++ b/src/wayland/meta-wayland-surface.c
-@@ -605,7 +605,7 @@ subsurface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
-     meta_wayland_surface_role_get_surface (surface_role);
-   MetaWaylandSurface *parent = surface->sub.parent;
- 
--  if (parent->role)
-+  if (parent && parent->role)
-     return meta_wayland_surface_role_get_toplevel (parent->role);
-   else
-     return NULL;
--- 
-2.10.1
-
diff --git a/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch b/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch
deleted file mode 100644
index 543d6edb8e76..000000000000
--- a/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ca31a94e54819b5bfeccbeef4e7c041bbef15eac Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 5 May 2017 13:55:51 +0200
-Subject: [PATCH 3/5] wayland: Make sure we have a pending geometry
-
-If the client doesn't set a geometry using xdg_shell, we'll compute its
-geometry based on its surface and subsurfaces.
-
-Yet, we translate that as a window (re)size only when there is a pending
-geometry, that we don't have when we computed the geometry by ourself.
-
-Make sure we set the pending new geometry flag when computing the
-geometry when it actually changed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782213
----
- src/wayland/meta-wayland-xdg-shell.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
-index aa355da..87a8382 100644
---- a/src/wayland/meta-wayland-xdg-shell.c
-+++ b/src/wayland/meta-wayland-xdg-shell.c
-@@ -1263,11 +1263,19 @@ xdg_surface_role_commit (MetaWaylandSurfaceRole  *surface_role,
-     }
-   else if (!priv->has_set_geometry)
-     {
-+      MetaRectangle new_geometry = { 0 };
-+
-       /* If the surface has never set any geometry, calculate
-        * a default one unioning the surface and all subsurfaces together. */
-+
-       meta_wayland_surface_calculate_window_geometry (surface,
--                                                      &priv->geometry,
-+                                                      &new_geometry,
-                                                       0, 0);
-+      if (!meta_rectangle_equal (&new_geometry, &priv->geometry))
-+        {
-+          pending->has_new_geometry = TRUE;
-+          priv->geometry = new_geometry;
-+        }
-     }
- }
- 
--- 
-2.10.1
-
diff --git a/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch b/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch
deleted file mode 100644
index 03b2b22fe655..000000000000
--- a/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 40a3d67698dc992d084886e01b07a78d438bbf8e Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Wed, 10 May 2017 08:59:53 +0200
-Subject: [PATCH 4/5] wayland: Apply size hints regardless of geometry
-
-Previously we would bail out early in xdg_toplevel_role_commit() if no
-geometry change was set, ignoring the possible min/max size hints
-changes.
-
-But setting a min/max size hint without changing the geometry is
-perfectly valid, so we ought to apply the min/max changes regardless of
-a geometry change.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782213
----
- src/wayland/meta-wayland-xdg-shell.c | 22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
-index 87a8382..bd576f6 100644
---- a/src/wayland/meta-wayland-xdg-shell.c
-+++ b/src/wayland/meta-wayland-xdg-shell.c
-@@ -615,20 +615,18 @@ xdg_toplevel_role_commit (MetaWaylandSurfaceRole  *surface_role,
-   if (!window)
-     return;
- 
--  if (!pending->has_new_geometry)
-+  if (pending->has_new_geometry)
-     {
--      if (pending->dx != 0 || pending->dx != 0)
--        {
--          g_warning ("XXX: Attach-initiated move without a new geometry. This is unimplemented right now.");
--        }
--      return;
-+      window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
-+      meta_window_wayland_move_resize (window,
-+                                       &xdg_surface_priv->acked_configure_serial,
-+                                       window_geometry,
-+                                       pending->dx, pending->dy);
-+    }
-+  else if (pending->dx != 0 || pending->dx != 0)
-+    {
-+      g_warning ("XXX: Attach-initiated move without a new geometry. This is unimplemented right now.");
-     }
--
--  window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface);
--  meta_window_wayland_move_resize (window,
--                                   &xdg_surface_priv->acked_configure_serial,
--                                   window_geometry,
--                                   pending->dx, pending->dy);
- 
-   /* When we get to this point, we ought to have valid size hints */
-   if (pending->has_new_min_size || pending->has_new_max_size)
--- 
-2.10.1
-
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild
deleted file mode 100644
index db6c355e133d..000000000000
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
-	>=dev-libs/atk-2.5.3
-	>=x11-libs/gdk-pixbuf-2:2
-	>=dev-libs/json-glib-0.12.0
-	>=x11-libs/pango-1.30[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	>=dev-libs/glib-2.49.0:2[dbus]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
-	gnome-base/gnome-desktop:3=
-	>sys-power/upower-0.99:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.5
-	x11-libs/libXrender
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-misc/xkeyboard-config
-
-	gnome-extra/zenity
-	media-libs/mesa[egl]
-
-	gles2? ( media-libs/mesa[gles2] )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-	udev? ( virtual/libgudev:= )
-	wayland? (
-		>=dev-libs/libinput-1.4
-		>=dev-libs/wayland-1.6.90
-		>=dev-libs/wayland-protocols-1.7
-		>=media-libs/mesa-10.3[egl,gbm,wayland]
-		sys-apps/systemd
-		virtual/libgudev:=
-		>=virtual/libudev-136:=
-		x11-base/xorg-server[wayland]
-		x11-libs/libdrm:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-PATCHES=(
-	# Important fixes from gnome-3-22 branch, mostly for wayland session
-	"${FILESDIR}"/${PV}-wayland-crash-fix.patch # firefox wrongly using subsurfaces for popups occasional crash fix
-	"${FILESDIR}"/${PV}-clutter-missing-null-terminator.patch # fixes potential crashes on armhf
-	"${FILESDIR}"/${PV}-wayland-ensure-pending-geometry.patch # initial positioning fix for wayland for certain apps
-	"${FILESDIR}"/${PV}-wayland-size-hints.patch # apply min/max size hints in more cases properly
-	"${FILESDIR}"/${PV}-wayland-clipboard-fix.patch # Fixes utf8 clipboard with gtk+-3.22.13+
-)
-
-src_prepare() {
-	# Disable building of noinst_PROGRAM for tests
-	if ! use test; then
-		sed -e '/^noinst_PROGRAMS/d' \
-			-i cogl/tests/conform/Makefile.{am,in} || die
-		sed -e '/noinst_PROGRAMS += testboxes/d' \
-			-i src/Makefile-tests.am || die
-		sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \
-			-i src/Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-
-	# Leave the damn CFLAGS alone
-	sed -e 's/$CFLAGS -g/$CFLAGS /' \
-		-i clutter/configure || die
-	sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \
-		-i cogl/configure || die
-	sed -e 's/$CFLAGS -g -O/$CFLAGS /' \
-		-i configure || die
-}
-
-src_configure() {
-	# Prefer gl driver by default
-	# GLX is forced by mutter but optional in clutter
-	# xlib-egl-platform required by mutter x11 backend
-	# native backend without wayland is useless
-	gnome2_src_configure \
-		--disable-static \
-		--enable-compile-warnings=minimum \
-		--enable-gl \
-		--enable-glx \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-verbose-mode \
-		--enable-xlib-egl-platform \
-		--with-default-driver=gl \
-		--with-libcanberra \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable introspection) \
-		$(use_enable wayland) \
-		$(use_enable wayland kms-egl-platform) \
-		$(use_enable wayland native-backend) \
-		$(use_enable wayland wayland-egl-server) \
-		$(use_with input_devices_wacom libwacom) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 81bdba679c35..c9416fe8f72e 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,4 +1,6 @@
 DIST pekwm-0.1.17.tar.bz2 405742 BLAKE2B 6cb47f92f8d32358ece8502fd706880478403ec01bb1aea0a042b2f9a110672c923c7289583f4b63b0e190b3979631c60760fae70174ecb205dfccf15baac398 SHA512 fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811
+DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
 EBUILD pekwm-0.1.17-r1.ebuild 1705 BLAKE2B 67f449a9837e209e5179a77535e20743464245986b014dc8ebb41b318e8c9e291c6ef9d624ab4475044b9ba087365758ec1c3e6ef9bb14eb501ef209350f3996 SHA512 a9a859e4ebf9b38e1eb1a4185462e956c4d9c08865d9b2c38a5ee6a7deee6ff21054af03c249dae6e2fdd706d85678c5269878078ea02d18ee07f8c6d84ebc0d
+EBUILD pekwm-0.1.17-r2.ebuild 1848 BLAKE2B a36026b0214f4f80058d01e83e5b5ab16b37eb499db70d6f21cd096e1405595b22268d55fc87aa2eb9729fb3b47a50cabcdfd83a41e5df0bd9e024468d82ed92 SHA512 b85fad7e124d116d0426a30ea350e479cbdbf6554f49ca410a0635f17f60442c6dd761954973d8074874b55935d3d11f4626c1750c15b1f5c67fd98e847a92a4
 MISC metadata.xml 1043 BLAKE2B 0f25d178a73e10fab1bf25342cbc22c7353c7c3687e92473076a39ed37b90f96826dce5b32997976bbda17e1d13b1e706f7a42c635001807b5e63224045af73b SHA512 b49fe56ed6f19963222c1268e8ef524525767594b969e6359f3efb6aef3b3dd25ebf9e7cb31bc8150c5b3d4e282d3a814d61b657a5e79eeddeb40730fd2f9b50
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
new file mode 100644
index 000000000000..cd3c4a3b07f5
--- /dev/null
+++ b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="A lightweight window manager initially based on aewm++"
+HOMEPAGE="
+	https://www.pekwm.org/
+	https://github.com/pekdon/pekwm
+"
+SRC_URI="
+	https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz
+	themes? ( https://dev.gentoo.org/~jer/${PN}-themes.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x86-fbsd"
+IUSE="contrib debug themes truetype xinerama"
+
+RDEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+S=${WORKDIR}/${PN}-release-${PV}
+
+src_prepare() {
+	if use themes; then
+		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
+	fi
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--enable-image-jpeg \
+		--enable-image-png \
+		--enable-image-xpm \
+		--enable-shape \
+		--enable-xrandr
+}
+
+src_install() {
+	default
+
+	# Install contributor scripts into doc folder
+	if use contrib ; then
+		docinto /usr/share/doc/${PF}/contrib
+		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
+			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
+	fi
+
+	if use themes; then
+		insinto /usr/share/${PN}/themes
+		doins -r "${WORKDIR}"/themes/*
+	fi
+
+	# Insert an Xsession
+	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+
+	# Insert a GDM/KDM xsession file
+	make_session_desktop ${PN} ${PN}
+}
+
+pkg_postinst() {
+	if use contrib ; then
+		elog " User contributed scripts have been installed into:"
+		elog " /usr/share/doc/${PF}/contrib"
+	fi
+}