gentoo resync : 22.05.2018

13 files changed, 18 insertions, 18 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 7164143f6bf1..8ebf140ddb3d 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index 5c0bcd6ec834..28e3d8d5a6e2 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -4,5 +4,5 @@ AUX ace-1.4-gold.patch 3339 BLAKE2B 904aa238a703730ac9d188025d6ecaddd79e3683d43e
 AUX ace-1.4-libpng15.patch 853 BLAKE2B ffbcda5c4d25fd404291f0b2d3e98e53f50108b6b6ef7ea135949087402e656b21a21da82cf3def5f12fc75e7a412becd46f4363aa604a184ddb0c20562ab84c SHA512 f746ad95efac927d55dff5122d759de4c8a3947a85b960642e6967e6ef8362e45d05fe5504b159b97bebeb92e2d86f4fea4f00e50fa7c59a8861d9aca8f62013
 AUX ace-1.4-no-xpm.patch 571 BLAKE2B 009d9c7efc8b26e25905f4562c019b7cab1bd0b9df853b256042dbeb869b8be0252fba6275331772dc080f43066fe8b3fffc797a7962c9bf5e665605ef2a2f9a SHA512 1316313302dbc2a2456f4ba3afcba1e35a0f12c3907b04ae55c5e246254886693633b3bd04defd718ad9e2ac04d7d02c80eec89089f7624615e74d18229764b5
 DIST ace-1.4.tar.gz 530490 BLAKE2B 62d32bcada9a945d0a409757ca24c8c5c032e905528d56a51b95f82844c6c8057d39763016fa05015877f23313d842effeaaa362507bb049816d7cf6bdf01a1a SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc
-EBUILD ace-1.4-r1.ebuild 965 BLAKE2B d9a6397068585afcdcd61569d420f4a74213707a75df060ac2e77d23a0845ece0c8576839514af06c8d69942bbdf047b7496ef972d3e1ab3507df141a67c2b18 SHA512 b3dc70ab8bac7e37030a37a524ec80c9b4b467dd69e160a4e5303554f1c73c52d0ac5e486bb353922af52fafebf52fb3a04e3b53029369b79a1756f1adca5dbe
+EBUILD ace-1.4-r1.ebuild 968 BLAKE2B ba98eff8fea59d109ef6b2f71b20c03df8e7129f71e06ee66c22a5a2a047eb1488b4ab2af539b44dde5a5896e26befad27af9cb5121800e1c226b1d866227102 SHA512 0199ed734756903d0c3279a87b8386346aed6b30b5ab02f5667b6e388e7074efb9d0638777d0cb95f00c7fac7d6f2cdc9ea978cc6c54b15975c29defa689b8f9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/ace/ace-1.4-r1.ebuild b/games-board/ace/ace-1.4-r1.ebuild
index dbe79e29977d..66185f9eb84a 100644
--- a/games-board/ace/ace-1.4-r1.ebuild
+++ b/games-board/ace/ace-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ RDEPEND="
 	media-libs/libpng:0
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-no-xpm.patch
diff --git a/games-board/cgoban/Manifest b/games-board/cgoban/Manifest
index 89bb71d30bae..c08e097d601f 100644
--- a/games-board/cgoban/Manifest
+++ b/games-board/cgoban/Manifest
@@ -1,4 +1,4 @@
 AUX cgoban-1.9.14-cflags.patch 1053 BLAKE2B c0eaaf1b08fedf89b8eb93e37665f6857b8de6421e4ca8c2c43b318ce7488b2334b88a4b07cecd754fdcb8b0e0bbcf9810fb620df05bf93417a8e0a2efd907be SHA512 fef74fd04ea9001e697f11e615705c45ee8660c905b9049debee88cf13e8657518cbbaba5a814a8874956c305c6c5c73592f62ad9a29389482f9c2bd04b120f7
 DIST cgoban-1.9.14.tar.gz 417691 BLAKE2B e6eb97b5368704f5c431b6439faf8a319a586f911843a906215cbfd2c271bad15b4cd9dd9cc28f5bc43b8f76e6d0b46c2e68cf7fd6a07d63fc9e286f48f7a246 SHA512 0a471845dbfb3029c2371ba91375aa19ca23591f355452d87eeef2ed56e948a60aedb21923658e74923f16b40ce00f5d74f40f44facf93695d20615b874b354c
-EBUILD cgoban-1.9.14-r2.ebuild 717 BLAKE2B 1706ab9c3f5a08fdd2b50763ac55565d7f4cdc8deb9f8ff8f98fe5d29a8dc334816e7dd6ebb8ad0ed27407d4a7567551af30ccd00a18a7c374333f300a545730 SHA512 b2e1d8fe5e9786f54a60141070c7ae95ff2f6ac533d68f959bfee37c5a260711aa9dde0a9126030e068e561ce2bdadc0dc8325e8585ae119da5a0954709137e5
+EBUILD cgoban-1.9.14-r2.ebuild 720 BLAKE2B 99c7f601d3bba2b6964e8266c2181f007d213942faea501572c8b8fe45e0b0f946dc0cb7e9da5b358dcb9807a5138ea407945da9148e9e2c36ca027c94614df0 SHA512 567ae1af4358e2a0e9d2613bac734aec8b08e66a420b715bf29bb720f5cfbad5fd97308a24d8425e21a04a1d8de9404a72ab1da0d1394b836b93e0f4f036fd51
 MISC metadata.xml 330 BLAKE2B f44eb19307bc266f86ef6579284d24583a973b0885e45a9b146ff453c470aea6f6b3d9b4e3a6610075c3522f45ec56dc96f85eac6b1935e8781ecb4692015514 SHA512 70ecac92daf0c24d24deb6bd6ec575d74b078f0ccd9c88108b99b226ffc78d787786f4b39a7888f75f9373712a3f537c12ecf9bb412f76771aa62d004b95ce56
diff --git a/games-board/cgoban/cgoban-1.9.14-r2.ebuild b/games-board/cgoban/cgoban-1.9.14-r2.ebuild
index 95912a591d7a..ad2c9a790a3d 100644
--- a/games-board/cgoban/cgoban-1.9.14-r2.ebuild
+++ b/games-board/cgoban/cgoban-1.9.14-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=6
@@ -18,7 +18,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
diff --git a/games-board/spider/Manifest b/games-board/spider/Manifest
index 6b0650bc24aa..f6622132a4d8 100644
--- a/games-board/spider/Manifest
+++ b/games-board/spider/Manifest
@@ -1,4 +1,4 @@
 DIST spider_1.2-4.diff.gz 2882 BLAKE2B 3016e4d6a7f4aa6e4f47e7abb78b12d70d5cee400a4e61b514e8fbbfdb7ad8484f84c1c1006447f3c6ab8a5897dfc4d4af5304eeaea716203c5c5440f9084b3b SHA512 e1e6eb4d5b14de7c32e1537877a3d26470c032bea567aa679c8a3744d62ab6b12d81bf05120679a273d98b6fd976c32d24ce9c54b720d006c51464f7ff6d5e75
 DIST spider_1.2.orig.tar.gz 168209 BLAKE2B 3a1163099ba9ce4faa9bc7c3424a2a2105c6fe001487822898dba7598dc5dc8d43cab2a3d7685fb71b1d19ff1b667397a41a3ba03fca4abf5d700308b19dc202 SHA512 a1d01f15ca37c8abdcc9f7c3dac925b1726f9b58ce51eb4096a9248abe0a55086ccdd5cc5ec358c2ee609ff089978676a3e3c669062a522ed7f1d4ea1ce33ab0
-EBUILD spider-1.2_p4-r2.ebuild 1601 BLAKE2B 4e15a8f2bac4f49184054e75dc23c9d85dca213f6421bcc92f3e304bafbc8ffff730b599a2d4351957270f1477ac68b2649c91404a334b7af836124d3f02c505 SHA512 48f0b26a8d42b1ed788350ce1e976e6431088c22318204ee72e199faad2be918fc6e3d5cbb4c615254b13bd132f8f27c3765feecb569546110a35c3d43c9fa13
+EBUILD spider-1.2_p4-r2.ebuild 1604 BLAKE2B 2c1e8f6c6da9778ad9d6e50b8f2106270f673c3bb54e3a0f8bd8e9105430f09fe7ab45dc28598a0f53733f642c639f83eb7f19ba8df0553ec41b5f49414c5112 SHA512 eed7419df57dc9cb833f87c33dddcd8b99aa8da45a93c0a2ad30a224df0fcf1be68283ad4bc4241c88e3feeb7c1d22e7e06477ebca267ea95a5229476f9adab2
 MISC metadata.xml 327 BLAKE2B 60eff6a4428512cda35daa5d6d02f55f946b5e7840a9ff866a1f76014a837c25fa5c4e142187270a5b25b1c38c96a61cf3e7a229f39caf70d830731565b9222e SHA512 e55a8b00c37c88331de81c2c28e9a187c1a28d4fd64c5fcafd9e01c8cdfbdbd455ded19f523d1806506a1652a5eecaf09b5f8097a42ac40bb36821b92bd3c4b9
diff --git a/games-board/spider/spider-1.2_p4-r2.ebuild b/games-board/spider/spider-1.2_p4-r2.ebuild
index a543715af982..e6d741852790 100644
--- a/games-board/spider/spider-1.2_p4-r2.ebuild
+++ b/games-board/spider/spider-1.2_p4-r2.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	x11-libs/libXt
 "
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/imake
-	x11-proto/xproto
 "
 
 S="${WORKDIR}/${MY_P/_/-}.orig"
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 43f80cdf362e..596f6815f7bb 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,5 +1,5 @@
 AUX xboard-4.8.0-gettext.patch 502 BLAKE2B 9c763076afb8ef182e715cbe82a7935ca495d9485326807146fcbe8406c56cfaacb9ebc0221b18628ca36379cf8d8d14f5fe0c4d0577487e39abf8305e9fa6da SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9
 AUX xboard-4.8.0-gnuchess-default.patch 1441 BLAKE2B 2b37c3650d45fb46bdf57b93152d99de3a88c1f75db33d0f4ecc1b2105cfdb444599af8905955b3a5a91527bac770fc67e0ee480d46a9c81b73fc1c11bf3ec68 SHA512 3ba68ce96dbdca3f0f8027d54c8cf7d8b7f278a2eb8bf549e3f9a2979bfb19aa0232d391430e6725bfdc73befdcc2da221663ff974774ab81bfe052286205956
 DIST xboard-4.8.0.tar.gz 3691531 BLAKE2B 7743b654e8bdd37672a6076ce032fcc92c846796a8cf84906ae8b74454297f0fed1bce078883e9aff6237c8bfee67db659bdd7b93acd94e1b27bc90629dc3b1a SHA512 fc3231f170baacdf97df5d08488f5a1fb9a144810f7b0eb72e3e95d345ce47aa2ff67a586ef45b6a9e45932300babc59c161a29e055dd0d19b133ba986985c81
-EBUILD xboard-4.8.0-r1.ebuild 2013 BLAKE2B c55529e59308fb98eb341296dc0d8e6894537ab9b09ddaa15fdf2e976787c0a418c4ae59dc5ba4e07bebd41d137e525b6ace56f13ed0963bf08b26572a2de9fb SHA512 d85e92514e0591980c287108ed81d852706e7b985702fe47335f852538b9ae81a337cbf7bcedb5c78749e189e141784dd5abaf296b5996f4d48c4872e1bdfac3
+EBUILD xboard-4.8.0-r1.ebuild 2016 BLAKE2B f519703868c61099a0aaa90a150c1293a9a06eb62dae2f92b0f1d5ad1bb4932dbd8df527c2b166ed1e89381178b6f0cb0b349a9430bc4aa8a157ad771f89a3ab SHA512 8b262a091b80ab8c531fddc8d76a6efe0ac8cb2e6ab7cb3d5e3901d37c97ba4b47c9f61a3cff80c64788387a6f1f44c7b71b470ba14a75612895aa6e9cbc46e7
 MISC metadata.xml 418 BLAKE2B 0fb5a3b7607b0c609e7bf50224e1a53abc1e9dd90a811e964bbc5038f96966d32d4cfca6b8eaefc7e64be3fb2302a0231162554cd436043471c578830f74e1ec SHA512 ff385f8c46788e3c76fcdd891f4a4be50b100ff47298eece8a2f1ac3dd166ab384961f3fde0967dc3b3afcc3978cefb5025e4eb0dc69177395c75affa2416d1f
diff --git a/games-board/xboard/xboard-4.8.0-r1.ebuild b/games-board/xboard/xboard-4.8.0-r1.ebuild
index 60b2e7c30059..398488b60b28 100644
--- a/games-board/xboard/xboard-4.8.0-r1.ebuild
+++ b/games-board/xboard/xboard-4.8.0-r1.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
@@ -33,8 +33,8 @@ RDEPEND="
 	)
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
 	virtual/pkgconfig
+	x11-base/xorg-proto
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
diff --git a/games-board/xfreecell/Manifest b/games-board/xfreecell/Manifest
index b1c9b887f116..4f1991a9ce12 100644
--- a/games-board/xfreecell/Manifest
+++ b/games-board/xfreecell/Manifest
@@ -3,5 +3,5 @@ AUX xfreecell-1.0.5b-gentoo.patch 11060 BLAKE2B 631f75fddd90000aa350a97f8f412341
 DIST MSNumbers.gz 1212278 BLAKE2B f976aed03fd176407cddc91ecdc42c26a94bc6e8cb09b24dc3f2e577c05d7a2695e7a33e9784e411cdcb30e7d411f5a6712214660ee0dffd732b0136913afc2f SHA512 6a8215f72bb4f10262c41875e1668bc5bb691f9ba2b803162675cf1fb8ce6090f6009727939ecb86301de76264d35d7d10614887b677055ac470975029e55785
 DIST xfreecell-1.0.5b-gcc6.patch.xz 18888 BLAKE2B b0bbba9a093bb00bdc3d21da61375db8d0cd189adae545c149b0816088a595d585df1e15da9da76696df74fe15a23b4b74d298575fc87b9b9a49efaa168982f3 SHA512 08c544d14c43bcfccb4eee7e99d77225297be8274b85de98edcb4fa297060f8b219814729286f90939b99427b4d32725c82134b860939b5894ccbba2e15226d9
 DIST xfreecell-1.0.5b.tgz 49367 BLAKE2B 6a2fd34f025cd86e55a9f8fe3d4294396078b850e014b6df5584b0ee575856d99ceeae7822d0ae33e168003b4b673920bb03dfbbf4130f46adcdc5acc79c25cf SHA512 b4437d9c78d5a6cb5fabd0157528aef85aa1d01b87875314e122d1eafbe5808af67b7b4dbf4db8e70d3d5193b10e61cc20210725b75c01ca6ff6db2b5840a64c
-EBUILD xfreecell-1.0.5b-r1.ebuild 973 BLAKE2B 7af231b933a9a12249d282608fdaffbfa8a05708e8a1d86df5feafec867fcf37ac59695346a4f8a5c86b3dfbab1db13f276929fe0bceaa7baa36d935b30d3e57 SHA512 6f5991c95b9df26085eac5088ba2acac5eabf2fd967b80f7cd8a2ee63c606bd7179932bfe9006d70aa7c95d75a864c04680745813817db4d6696ca583420cffe
+EBUILD xfreecell-1.0.5b-r1.ebuild 973 BLAKE2B c6eb237433230abaa3ff8cc07a8df1af6672d3383470fcfce56606674b5fc3a998aca95cd85448f07f2c38629eed9539825f4f19226f7e42c3274ed06fb595c0 SHA512 885942c051cb61c0d33e505b532e05d4a6bc5cdf9709a8b96179543e1b98d86e8f0ccfe35c5307f44cd0455aefb326a8d00f5f1b3e81eada091764d9cf4f34b5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
index 491d3910b26a..b5e38916ce0a 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b-r1.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
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND="media-fonts/font-misc-misc
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}
 
diff --git a/games-board/xskat/Manifest b/games-board/xskat/Manifest
index d935c65edb66..e7e4ab1a4649 100644
--- a/games-board/xskat/Manifest
+++ b/games-board/xskat/Manifest
@@ -1,3 +1,3 @@
 DIST xskat-4.0.tar.gz 179059 BLAKE2B 0494db798eadd17b4b35256560aa82ad8ec239b08f7adcdd86621088676cbc4c7cae0d0a53bb15525d56319ba0549406038cc1e64cdcfefd280d379ffc326a96 SHA512 508d83886063be01aef509fa8050110e599e0120025a94747717fcbae38e2196e8db041296b984fe37895c211519f511cf75dfa6b948c5789e6b37064f3d0c0d
-EBUILD xskat-4.0-r1.ebuild 783 BLAKE2B d924b91af1e229b4c8ada5a821782e83eb3a9b1e99d70a464805c74d4b74fda8bd643164734305e377ccf6670243bda13afa979acfe7ebc4752d19a08202ccce SHA512 49624bef02584ac649bbac1aed73eece06b948547d511878a410c074596468c643fc7c9cfad964c94c420ee182a0afc32710fda5a9c2b49f3a7d58606b6f2410
+EBUILD xskat-4.0-r1.ebuild 786 BLAKE2B de831e59e9180898684b1f2ba41adb63a4bb86cda0eec38eac70979ceaca9efafa1761665d58054747b74d957f1fd51b2aece84b9321d5400fe9bbff6daf274e SHA512 17402d201360565001c527201b2153fef04dd848f040e7691eed35c54d86e53848a9cd627d9111e9a3e8e77019c13e052d5126d342c46d0e761eff18a8457a7e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xskat/xskat-4.0-r1.ebuild b/games-board/xskat/xskat-4.0-r1.ebuild
index 4443c46caf31..517567ee1cf1 100644
--- a/games-board/xskat/xskat-4.0-r1.ebuild
+++ b/games-board/xskat/xskat-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,9 @@ IUSE=""
 RDEPEND="media-fonts/font-misc-misc
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake
-	x11-proto/xproto"
+	x11-misc/imake"
 
 src_prepare() {
 	default