gentoo resync : 13.05.2018

13 files changed, 16 insertions, 24 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index d685715029c1..95f45e24caa4 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 78be7b40b54d..a72befd1d5ec 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -5,5 +5,5 @@ AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e4
 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2
 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.24.3.ebuild 6051 BLAKE2B b90e06dadb05634f0afe218571c2ebcabc611f6f41ca01a8d40cfea2c35f17457f4181ec6c6a158a7f7c81acadbfc577661285b70ee40cc168d56b2c4dc4ad42 SHA512 b147cc536c6cc94513af5e57422e322a77453225f66b0b9deae9c0ef70a4622f818efa2e53e6d7ba09ffc05c598ded4a608466ff32c56d858aa8fb033fad0997
+EBUILD gdm-3.24.3.ebuild 5989 BLAKE2B 30e27e656a9bdf1018f19ad8c17a7bb630d1ab4ce902e411bea5b9eaa17ed870c9028eaa77717a5eab502a00bef98a28551467ab9b5dfca59892e6024eda8554 SHA512 66b4242cb343b289746c368de1d4a76868951d2ed5c422866c42a621d546e973902a7a4987cfee52a3b8abea9633acfe64ba08b49ada717c58871202a6ce1e70
 MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844
diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild
index 468dfb481a95..6dc61fc310ac 100644
--- a/gnome-base/gdm/gdm-3.24.3.ebuild
+++ b/gnome-base/gdm/gdm-3.24.3.ebuild
@@ -86,10 +86,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	dev-util/itstool
 	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
+	x11-base/xorg-proto
 	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
 "
 
 DOC_CONTENTS="
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 95e1331225c7..87f896f6a09b 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927
 DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a
-EBUILD gnome-control-center-3.24.4.ebuild 4887 BLAKE2B 65f684a560ed9ccf73b8ffad6a2c215ceb2e9a65639ebb24db11cf429c345905816924a48b3582d5ae663839e4804d61383e249ddeb9ff197e68dbbcf2bfdd08 SHA512 2a671d3845b1fd2f6d32b3ddc6a058bd45c4e23958eb74a35f30663badae8ece2ed485e3ee6fa857a345571d101940ae131976b7d0e7514dd469c0bac0ded07c
+EBUILD gnome-control-center-3.24.4.ebuild 4846 BLAKE2B 55a347117e272330e5190abe5b1e2a3f2a034a22ed0a746a848f7c1b14c06d1b9b8961b8281916d1775df957514971409b713bfc1743f2f59da7e749bf14d1f8 SHA512 aa8a3f470892b80b4ba03d8b0009b7f81a345e9156fcc718fcfecd0fec823aed61d96d93c85979a52b3b87412ce465bbc9210f363a693093e727c49711f26e77
 MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
index 3824d26612f3..5e32940aad46 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
@@ -110,9 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 
 DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxml2:2
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 03a7703fdfa5..6d8bf2de2f9f 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,6 +2,6 @@ AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a3
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
 DIST gnome-desktop-3.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2
-EBUILD gnome-desktop-2.32.1-r2.ebuild 2321 BLAKE2B 36bbc9ad0c5fadd3eb323e20cdb7bcfcc2a90acaed43c2319f4dc7c6835dd113e8eeeb6fa9a15468320e30a2b549a59e055fde416a9376248cf30b8261080316 SHA512 2631840d679cfdd6522a073012093a9cf532b990016ed6b4317d2a505c1c4dbdfe3b6a80deda8c7f37a69cd4a9edf718266e7c5ffac95f6e3378bc43212b9234
-EBUILD gnome-desktop-3.24.2.ebuild 1599 BLAKE2B 320d3099a184f6a2dcb148c74fdc3af8e447877a33af8f8c532dee9e4627f7da6e95e3aa884bad7270ad150d9e2c1082514d7092df34782254b89833b812d70a SHA512 bccc39c9205f7cb40d40dd9456f0abc795fba003215b60f25cc6337d58569fdaf3cdce1a12a4df9d64a3927eedfdfdc1f435a035b968a775f9a11dc99048db6f
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
+EBUILD gnome-desktop-3.24.2.ebuild 1602 BLAKE2B da62b47e959d77b54a023ff873e3f1ddc3192b8c035e92be21b3346acd8c9feb0d92abab59e25a958894a01baadf8eb537d3d40f0f32b43856c74c79a17b9876 SHA512 67fec7204f36afb1e32f7dbfa9023cbf4621811d6a5b82f48d5e65e2d8e5e5d648285544eeecc28be4099fe0f5b5ab41bde449730b8dd6214218c3a36e87fec8
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
index e716fbf0258d..dbcd5ea476d1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -37,8 +37,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=app-text/gnome-doc-utils-0.3.2
 	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
+	x11-base/xorg-proto
 "
 PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
index 2077b8c28950..23ef79b6f8aa 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.6
 	dev-util/itstool
 	sys-devel/gettext
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 6c7ccbadd17d..cb632e8c70a6 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
 DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
-EBUILD gnome-settings-daemon-3.24.4.ebuild 4758 BLAKE2B e94120f3002c588f5434bf2455fc70b5993dcbb98cdb75ae7512cb09dc3dee741265b4d03800d1ae23ad36138f98841b5dee85b49933b46d79b280a254dc0967 SHA512 9990f6f670cccf62e59862e1e770a2a52563eb0f30bc23fdc382ada13fd773cd2cbbfa64ddd9b593ba978ff8b98c1f44adc752dcbb7bc91ce3691f40553bea2a
+EBUILD gnome-settings-daemon-3.24.4.ebuild 4686 BLAKE2B 8feb81d9bc098af7247f182b22aa326813bb6aa0d08355aa2b1b74637089898a124e246758e0f7f0fb9fff855e60190f3b5b6fa516d7e2e18d45e307f116f58f SHA512 b9f7048dd90ca9c1a9f081e677ce2da682aa68b498e708341e927a59638cff3782c06005cbb85023e6b17809126a13528205734e1fbfb2773a436f9506f60f65
 MISC metadata.xml 591 BLAKE2B 6dfcef2c04291096bef621cb68ed9f2fa2c379920fb2072783b6245673fb37a6b6903d80ac8da46439a6a6be81372a3474585abbe4234559b558f48c3e23a1a6 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
index ce672aeecd01..30c725168566 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
@@ -90,10 +90,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.15
+	x11-base/xorg-proto
 "
 
 # TypeErrors with python3; weird test errors with python2; all in power component that was made required now
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 23e5cfff2394..e1640de139c1 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,5 @@
 DIST nautilus-3.20.4.tar.xz 3453376 BLAKE2B 47e09f45909f6abd735c976ea6ab0b90c918490193a931b186472d9be1d22f5c7314647ec14e36a88b9f8013f3784f7788b4d9ef136e139e1b1cb41b0167c378 SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e
 DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
-EBUILD nautilus-3.20.4.ebuild 2842 BLAKE2B 4988a1517e443a73e86d915d6d4db7f76d0422887b8ec76f65d00bf5d1e0e044fd773df619344476e23d4a95fcd281b12cd4c6d181e85e69550e1529cb03fdb6 SHA512 82e8360fffd669cdc4d31c1af637b7e557d4f0f59b582890a0d842c2924c711c653fa4d7d3faaa6cc48def59b7ad59ea3da80705189ffb2c34cd60f9b62f58df
-EBUILD nautilus-3.24.2.1.ebuild 2871 BLAKE2B 7998f98d2bae09a28ff6d352abaf106b78d061023fb938e7634bebfa418266206cf5c13b322e238cbb6f977fb29744d267fe510d05a1e210ed808bf5de36b32e SHA512 3f347e553b6ecdc3d2a76442e4d6f6ae61036f6c7637e8ef46159ec7cf55da5d9b8c02e5ebd998ca431a8f861c58a3c7b236bd833d8c15d6b5c22feff4ac01bd
+EBUILD nautilus-3.20.4.ebuild 2845 BLAKE2B d2bba71577e58e052e7ebfcb70bf5fd2b8bf2d29c17eca783466b477ac848e1d4d64b946e0f270f594dda877efc49ce585b674af8f532460bd373474e3838d73 SHA512 d8a41c19d696094b9fbe547b5933a7c4f78b95ff30818a814ca7e50270fadbdaf93624381547493603913b573c00f36bef840e493a0744978dd0fa5462b8b015
+EBUILD nautilus-3.24.2.1.ebuild 2874 BLAKE2B 0a8456f9952f4b91a92635b3f6b2b00268214f8d128646dc294f24be9c78eb56bb5fd9d12cf3ad7734a131b8886895b2a623176eb1be38fb87470c2125633393 SHA512 9f510f28d2b1d7e2128d224b9fc25da4450b76530a697f7c1fb1e129dd1af60de07fe226ccdc873131947562b9eb2f4353466c32ed078195e87ee74f46504334
 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668
diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild
index 080c2d9dfbba..50a2aedfd4d6 100644
--- a/gnome-base/nautilus/nautilus-3.20.4.ebuild
+++ b/gnome-base/nautilus/nautilus-3.20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
index 217195b511d1..ec1bd6f72c7a 100644
--- a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
-	x11-proto/xproto
+	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )