gentoo resync : 28.04.2018

15 files changed, 16 insertions, 213 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 465504fd542f..76e8dd1c424d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
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.
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index daf2e8f51cc1..4a30e035be4f 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,5 +3,5 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
-EBUILD fvwm-2.6.5-r1.ebuild 4840 BLAKE2B 44e4c8e28121b004c2a43c3e75816a4256881afab01eead66f0dc3fba05ca285d9fe536e9b94cd86c9d02485abf38cfd5f539a056665b95c2f3856e68297c99f SHA512 6330e511bac5e014fc3170a74d001cf9c1afea7b8c17fe0981ee2f42e59dd99fd8758c54d096b5655e1b3b698f5daf315e1853bd083b5fcaeb12a4e458eb3181
+EBUILD fvwm-2.6.5-r2.ebuild 4811 BLAKE2B 05828fa21464a072c6d383ebbea9abcd148ef1cecb42d8c561d8fde19e151e093f4b572302d66c2c0a5892bdcfe9018a34728ad0cda423da3d3fc0e2488ce429 SHA512 44991b5b512d6b449ddf3aa61a6f463c865db0c916f77f38da91282665622769a3ece2b12066c8f018a51e14a3ddeeedef2fafe188117ea054ca8eee06987380
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
index 202190bfb62f..c25e8794bf6c 100644
--- a/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.5-r2.ebuild
@@ -39,10 +39,7 @@ COMMON_DEPEND="
 		media-libs/fontconfig
 		x11-libs/libXft
 	)
-	xinerama? (
-		x11-proto/xineramaproto
-		x11-libs/libXinerama
-	)
+	xinerama? ( x11-libs/libXinerama )
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
diff --git a/x11-wm/matwm2/Manifest b/x11-wm/matwm2/Manifest
index 33a73971c503..e7b010e24f31 100644
--- a/x11-wm/matwm2/Manifest
+++ b/x11-wm/matwm2/Manifest
@@ -1,5 +1,5 @@
 AUX matwm2-0.1.2_pre3-destdir-fix.patch 1104 BLAKE2B 696ddba152f6283bf317d6edab99648d8c955e799b7eb8fd9bf46a7c5b89d018e7e11ad645e9f11b0530d51a882dd6329858da78dedef15235e52e3cda8f19b6 SHA512 339986e58e4ca608d0d481f1c820662a24a012021733c242aceaec3e82490deccf395bf3766124469983f55cb2cb3552f5a3d07e3f56a34dd93a1251d3dd29a6
 AUX matwm2.desktop 69 BLAKE2B 6eda01e92285ecb8e56e701c2d63995223274b31f140e5f30fc0b7f806bfbf0de2c7efc592e9aac2de56b2cb831deb145d4e4d424353e1515f48b98d2516dc83 SHA512 1308539065599bf807580868510ea772bc09b5e06c6cc184ece5faf100fb14cd424f47e030bc77d62525b7751c874e7313b73444b85ab07076f31bacdcf24e3e
 DIST matwm2-0.1.2_pre3.tar.gz 860231 BLAKE2B 5734798c1833a02783c9ff7ed52c2b0ef95d5c3b3edbc51a4e8440f45109b6f3e6cf85f64ce37c9dcbfff2e22843b7f57c23abcd2f5012ffa53fac0cbfbd766b SHA512 30c55c6090015432bf99853f136baebb5b4c1301d5f922dc933e0141caf18d6891a982bd89e22e065c146c0c5c570d0e8aebb7e4c708dddde9b0570b7ed5f9ba
-EBUILD matwm2-0.1.2_pre3.ebuild 1481 BLAKE2B 29a41386bf5ee740e414be8188195130d8422d82733c3950d7d638c984d2670fd31f67fc5ddc1197b7a74cdd52853adef843994f55183bdcac93fceec961bd3c SHA512 7cfad1edb7e45f24aaa73530dd5dc80fac511b4bf3117bb6c1bcceac8eb9695e0d4e67df84949bfa049b9ec806075cae737f5540170a54ee66a9be7efa067707
+EBUILD matwm2-0.1.2_pre3-r1.ebuild 1392 BLAKE2B 0a9af7b79085d43f77f757232d92fb46528a3a7b75cd12edc9928fb09c4b099ebf9453f919089a26edaba604e077d0e0b12d8bb0c68fee427d381b2a3d682133 SHA512 4836810d974c4f3848c9ceaf4b219c37f11f4f54a93f3258431cd171bef2385cfb1600d5bc27242310a96d7f07861d83e6277b95f5e256482d95437e46ed776a
 MISC metadata.xml 244 BLAKE2B 68503e38f8ee5114829cb49fb095b161e21ac98a298e594b7210608817457be4819536b3c27862c7ffdce1e3c5fc5413c95406153a24d8da3d91f377f9d9eb14 SHA512 ab9836137510572de701a29e6c8f81e7ec496e1e6b29119b5bcf183e4f7e99b1c8790c123054abf8cecfb4e93d427a42e61b862590c9badee70ec4736ee82eef
diff --git a/x11-wm/matwm2/matwm2-0.1.2_pre3.ebuild b/x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild
index 0f564a80660e..c6e017074c9d 100644
--- a/x11-wm/matwm2/matwm2-0.1.2_pre3.ebuild
+++ b/x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild
@@ -19,15 +19,12 @@ S="${WORKDIR}/${PN}-${MY_PV}/${PN}"
 RDEPEND="
 	x11-libs/libXext
 	x11-libs/libX11
-	debug? ( x11-proto/xproto )
 	xft? ( x11-libs/libXft )
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 
 PATCHES=( "${FILESDIR}/${P}-destdir-fix.patch" )
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 2c9ad43a5103..978b9a668384 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,8 +1,3 @@
-DIST page-1.9.8.tar.gz 993882 BLAKE2B 2ede40d5ce223b7ab775d56cd594b5db69dadfd7d376d2232e6739bb288479913807755a74a209e4705b5d43da84e649b341f83461b449a639639372fc1021f0 SHA512 624493282bb3258bbbaf731d4b6e0fe50741a6dfe80a559feb40112042aeb799b46e820c23d8a1679c4374ceb5be0b63890e2f660f1240b4dd249bb3b8aa61a8
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-DIST page-1.9.9.tar.gz 1007419 BLAKE2B 0f7c59d153bdc85b5f8167ff6a07202b3e294829573fb9427893b33b23b66605691ec664223fbdba1244e3059f5b103c4ea62c67165eeccc161738a839a29ae9 SHA512 4dfd7b04823e13c2a592e3037803022d6e30019ac9390b6da9196e0a250de8e213d2a6a7546cd97c3d77deac4fa70410def2ed2367bb3a21c6f1ddb3df61d5f8
-EBUILD page-1.9.8-r1.ebuild 1280 BLAKE2B 3c3bbaf77bdb427133a4120dd367565746fd6734204be1478b376ec328954f63ec6a4dce542d6b75c0c1941b3507779270cc80ed8d85e2abb89c81ef9deef640 SHA512 7624875a2346240593e1b90b14d098612cb291c110e4576e4563ef81230c5cc3c1bb7be00ab05d1ba433b5d3299d3b1df71950280d936d6e425be7956b2052ac
-EBUILD page-1.9.8.ebuild 1278 BLAKE2B 61a4669bef7e8e627ae4d30ddf975e4ba31fab2e61961be68c26ba9aa9bb175f51f6845e9c1da9b0013321ec7e4e9e51125964d3207dd20e1a244f24674885c0 SHA512 18f901d6d0a07e68da1c36421e7fe9e7c31dcaedf5a36a2f7f70533244c8712c0dc1eb0ccd3a987383afb52bdc1664a40659116f7e33d8ce111bf52683381702
-EBUILD page-1.9.9-r1.ebuild 1464 BLAKE2B 3935a367ecb3635ff0c5d9dc341c43a357e2801c5409cdf8947599784da359bef33a3f15888da12d035fd01d2218825c919562a16068cec69c24b4069707e52d SHA512 335958186d44525a725a1bdf15d25d66b4f392af3db4dcf8d8b98ef0cca82589fde50e93d5bd31466d892aba37c4aae13df9bf73b7f39c97eb502624dc884d89
-EBUILD page-1.9.9.ebuild 1463 BLAKE2B 453a539746b8a2eb138a270282d62ad33b9e97f4c6eec31fd16705fad9ab161e900832695ade2ea83e6e35e40af7a24db05847e632e932803f5941591af0775e SHA512 b55d92be0c9cd3cb910b0e61b6f453a1fe50f846086bbd357400bc37a16f486ff652a90d2202308ee133c86c183e1479344d76f78fdd9a488df90440a4e508a7
+EBUILD page-1.9.9-r2.ebuild 1270 BLAKE2B 03b885dfd99c6a2d4a870d833734d233713f6e769171faa571b80cb6cece9f4c50f3babc6da8e5af3268ff048d79a56c06bfff628fb19e34d94616b4756f0244 SHA512 1019cd373e5066dea32e6f8d42fc6096236eb1813826ac3093a424d9049fc5bb4859774a9e47d59f9679671c28d275f1da8b4d64fa9ebb2e4c1a7a2617de6b66
 MISC metadata.xml 498 BLAKE2B 5b05ebd39950f440c83dc9c2893f52e7d39d9515427aa29d04e6c7b9069787117aff644e795f6ce3e125b84f179d6c073294292f75b77f1af14828659f8bec4b SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca
diff --git a/x11-wm/page/page-1.9.8-r1.ebuild b/x11-wm/page/page-1.9.8-r1.ebuild
deleted file mode 100644
index e121fb854d10..000000000000
--- a/x11-wm/page/page-1.9.8-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-proto/xcb-proto
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	x11-proto/damageproto
-	x11-proto/randrproto
-	x11-libs/libXrandr
-	x11-proto/xproto
-	x11-proto/fixesproto
-	x11-proto/compositeproto
-	x11-libs/libXcomposite
-	x11-proto/renderproto
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-libs/cairo[X,xcb]
-	x11-libs/pango
-	dev-libs/glib:2"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.8.ebuild b/x11-wm/page/page-1.9.8.ebuild
deleted file mode 100644
index c03cb2442c54..000000000000
--- a/x11-wm/page/page-1.9.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-proto/xcb-proto
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	x11-proto/damageproto
-	x11-proto/randrproto
-	x11-libs/libXrandr
-	x11-proto/xproto
-	x11-proto/fixesproto
-	x11-proto/compositeproto
-	x11-libs/libXcomposite
-	x11-proto/renderproto
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-libs/cairo[xcb]
-	x11-libs/pango
-	dev-libs/glib:2"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.9-r1.ebuild b/x11-wm/page/page-1.9.9-r1.ebuild
deleted file mode 100644
index 21d6b712d59c..000000000000
--- a/x11-wm/page/page-1.9.9-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${PF}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=x11-proto/xcb-proto-1.12-r2
-	>=x11-libs/libxcb-1.11[xkb]
-	>=x11-libs/xcb-util-0.4.0
-	>=x11-libs/libXfixes-5.0.3
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-proto/damageproto-1.2.1-r1
-	>=x11-proto/randrproto-1.5.0
-	>=x11-libs/libXrandr-1.5.1
-	>=x11-proto/xproto-7.0.31
-	>=x11-proto/fixesproto-5.0-r1
-	>=x11-proto/compositeproto-0.4.2-r1
-	>=x11-libs/libXcomposite-0.4.4-r1
-	>=x11-proto/renderproto-0.11.1-r1
-	>=x11-libs/libXrender-0.9.10
-	>=x11-libs/libXext-1.3.3
-	>=x11-proto/xextproto-7.3.0
-	>=x11-libs/cairo-1.14.6[X,xcb]
-	>=x11-libs/pango-1.40.5
-	>=dev-libs/glib-2.50.3-r1:2"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.9.ebuild b/x11-wm/page/page-1.9.9-r2.ebuild
index 4bd58b7eb176..a99b66b74284 100644
--- a/x11-wm/page/page-1.9.9.ebuild
+++ b/x11-wm/page/page-1.9.9-r2.ebuild
@@ -1,38 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A mouse friendly tiling window manager"
 HOMEPAGE="http://www.hzog.net/index.php/Main_Page"
-SRC_URI="http://www.hzog.net/pub/${P}.tar.gz"
+SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=x11-proto/xcb-proto-1.12-r2
 	>=x11-libs/libxcb-1.11[xkb]
 	>=x11-libs/xcb-util-0.4.0
 	>=x11-libs/libXfixes-5.0.3
 	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-proto/damageproto-1.2.1-r1
-	>=x11-proto/randrproto-1.5.0
 	>=x11-libs/libXrandr-1.5.1
-	>=x11-proto/xproto-7.0.31
-	>=x11-proto/fixesproto-5.0-r1
-	>=x11-proto/compositeproto-0.4.2-r1
 	>=x11-libs/libXcomposite-0.4.4-r1
-	>=x11-proto/renderproto-0.11.1-r1
 	>=x11-libs/libXrender-0.9.10
 	>=x11-libs/libXext-1.3.3
-	>=x11-proto/xextproto-7.3.0
 	>=x11-libs/cairo-1.14.6[X,xcb]
 	>=x11-libs/pango-1.40.5
 	>=dev-libs/glib-2.50.3-r1:2"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.12-r2
+	x11-base/xorg-proto"
 
 src_install() {
 	default