gentoo resync : 22.05.2018

8 files changed, 10 insertions, 16 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 7d252aa30113..0669b2d5aeef 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/gnuboy/Manifest b/games-emulation/gnuboy/Manifest
index fc71139ab44c..91a13c156629 100644
--- a/games-emulation/gnuboy/Manifest
+++ b/games-emulation/gnuboy/Manifest
@@ -2,5 +2,5 @@ AUX gnuboy-1.0.3-exec-stack.patch 487 BLAKE2B 09cc0019eed65610d67b4c305588b990c9
 AUX gnuboy-1.0.3-include.patch 350 BLAKE2B 30d5bd6fc959e56cd3f6a49b38b86f973cb2b119856921675cdd1c5b665e13e62e9fd675adbc5340c9e1ed715aead8445c50e63b78a31106497fdf08cbcb79a7 SHA512 9815515c39bf0a387b32e0038a050dd7ca51b5b47d539ee39fcb77b1908735890aac9abfd7d1fe03733d7c9359398b1688f401aa2170ac48d0ed6d2d50acf04d
 AUX gnuboy-1.0.3-linux-headers.patch 1721 BLAKE2B 2ce538da8270a7893ddeb4233954b9abc8237785ed085cef8129108eaef93d5c34e37b65db246c91c61b2b7e71bf452b0317ceb5ee7b5a169b764e5f1fb44790 SHA512 710fd830cabea8fee05ab07a6342470a1176d7ed1c5ed14c110f47218d7d3b57704c09e0887da6152b05ed1b12e5a6959efde865359c220756176290617b3917
 DIST gnuboy-1.0.3.tar.gz 187627 BLAKE2B 1fe01abceae56244d28544f10cc5659063cfe19ac491374bcb2b818f01385e065385fcba01e0038f51d4b29bcb3018f02402adb820c0a556c201334766595a51 SHA512 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6
-EBUILD gnuboy-1.0.3-r2.ebuild 1089 BLAKE2B 9a60d2006a88ad5a77d8206c4c7d819f0b1125c368cc385c8f4144d8a0444d863f570717164e3353f072fe4910510bbe16ae589defcd483e41041886e7b0b3d4 SHA512 89672f1f34f21634d871fd7498ad3afdbc470524c918af0d5179ebe44050a8385ecdf08afbb6fcd9640d50d6078b7d03dc7b3fd145d1fa3e087b1613cc5553bb
+EBUILD gnuboy-1.0.3-r2.ebuild 1068 BLAKE2B 8f750b31e7ce52c19992abbf167385d217a78f114f548e8ef39f4648b099e3ea98066cedf7a80129b54f8fb957bde2579090a7f5b2fb025980197448f326801a SHA512 7eb6e0885259eb224d93b1505d943113f8db50e2ca08efd50368ec941dcd96bddf78b7d624d383323736146b136f75e5ae49497112bc936c4764436d5fa61d28
 MISC metadata.xml 329 BLAKE2B 121873380b3adf5f6fc460d258de391a75a04f4d50b285c1f882e7461814133507981e7829ae1a783eddfc56933c328fdced934d04e5092a9c0e0f6eca7bfbdf SHA512 79c14f0442b618a82acc9b067360ef978d009fb61a44d869d0c6b4df375b005bc721ce8b90ac80be2bdb8e40e95e111b941a5ac9f006470eefc3b41459b52463
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
index 3c4e37c07831..177799b9c235 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
@@ -19,9 +19,7 @@ RDEPEND="
 	X? ( x11-libs/libXext )
 "
 DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 src_prepare() {
diff --git a/games-emulation/pcsxr/Manifest b/games-emulation/pcsxr/Manifest
index ce4f8da90610..e8f69e37dbc2 100644
--- a/games-emulation/pcsxr/Manifest
+++ b/games-emulation/pcsxr/Manifest
@@ -2,5 +2,5 @@ AUX pcsxr-1.9.94-disable-sdl2.patch 1059 BLAKE2B 6421cbf6f2df49c2c61cc83602c13b4
 AUX pcsxr-1.9.94-ffmpeg3.patch 1890 BLAKE2B 74bd342c5ffb1cd8cc280add5b89aee448d180356e5cf7eb8252414d933c83ee5e0045146e3953f219b4330c2df2e5a4f68c0e07c4d5c1060d1708c2229455ad SHA512 091c435337468aa958c5b6e87a0ce5730675d9f8d109474c92d5e1d61830a8b4c525f8e3208e86654baca5ae602a39bc234a0c54b24b4f51a1297fb123852dc3
 AUX pcsxr-1.9.94-zlib-uncompress2.patch 1522 BLAKE2B c872121a676d42f6855359eafa50be57e42a573ae2b470463fb25322cc5e7004c443de7bb214a55bfb9a99c4f88026892313301fe1c4960e823c842889f28966 SHA512 28350e042810a8f1c3829891d68b028b4c464b75e614f8451f8708bbff0ee47e94146a05cf5e6e3fdfe6ca7eae2e839fc8cbf95df8458e28e3d025feb728c310
 DIST pcsxr-1.9.94.zip 2631125 BLAKE2B 686503faffccc820bcac73bc69056ffe05176779ee49b834ce0da84c40a047b7882ca7b91a7b7f95ab153329ca6368ae545bbe567cac6a9bdba1a434c397862c SHA512 c49471c27692fbf22da32d2f5697a1dfed3dbdbfdb86cb789b0ea6cddb2a7da4f3390e4568f4e9385bf30d6baff0f2a591a80f424cf0c640cae0035ba81dce39
-EBUILD pcsxr-1.9.94-r2.ebuild 2676 BLAKE2B f430e31627b9dac4d65f437d82f6517d8eb2e5e5b0181f88ef024824de2c8ed25a73b07a122a3478db3b6521509d2c36dcdd322f56ae55cea41d60674a92ecd6 SHA512 6c7a1ca717619d0faacfb435269b05906f043b04a73bcdf07a918d7deeca5513946bb921af0728b92b06bfa74547748412c3d530c565c3b616ad7c58b2e055b4
+EBUILD pcsxr-1.9.94-r2.ebuild 2675 BLAKE2B 475bdfe5e53828f78b434cb6c1ea7b86deb7bfbfe83b470f4f6e54fc4ce6f0308e4329883d8564734fc1d1e178179e8e47aeeb8f6a4280078131149b59599f90 SHA512 1210b0fac40c7f310efefaea9342ac4a9a89e6eb366ac7de4db87385627a297947e2cc0d3cbfc3b00104f0c58c41f3aebb2bc6222a7d10f489969f3efcc6960c
 MISC metadata.xml 410 BLAKE2B 43f3920798ece05509e24b693d5b8de55a87337e637bc9b1c6f57ebd79d7c67e3d47c2d8c695cfc3386c733396a7c59e2fcb1f4087fd8b926b30c8962b698d99 SHA512 4c7e8a04412bd0851f4422bd646423558cc7e67ad956b518104285eb537a7a3cbf492239a11a582be65c45229299d0309823f3a6064717704d2fab4c15d2ee52
diff --git a/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild
index 319b46f2fd2e..b58d16a4d360 100644
--- a/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild
+++ b/games-emulation/pcsxr/pcsxr-1.9.94-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
@@ -44,7 +44,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-util/intltool
-	x11-proto/videoproto
+	x11-base/xorg-proto
 	nls? ( sys-devel/gettext:0 )
 	x86? ( dev-lang/nasm )
 "
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 97348b86c3a2..0fb7c35e8233 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -4,6 +4,6 @@ AUX snes9x-1.54.1-system-zlib.patch 7925 BLAKE2B 231ede4d63b3de7eba6933c05b852f2
 AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731
 DIST snes9x-1.54.1.tar.gz 2186737 BLAKE2B b433a167035577ab785901acb65b9df289218fa214f664494e7f0559a1a843c9211f81bfea3add73c64c6f87e974b0964a86fa43433fa1b5c6e20a724d3aa320 SHA512 2a8fddc0b9044c0b7e10711b35c06555e280c93ddde3c101c4084f859079947acb209f2632ca08937fa2ca47932094040c4a7a60b6188354fd92f72dbdf854ed
 DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
-EBUILD snes9x-1.54.1.ebuild 2679 BLAKE2B 2fd6a90eb94a351fcba1e698bf3730cba4719156299d258f5e5eb7b320eb1ed722a8db38e9798a56768375b58dbd6e4df593983ebfabfd2fa62631da40c715be SHA512 e15f019f095854a39b237dcaf04c6e04ef71d6a1fe63c860e2c91aa3013da22813d6d35fe02f4529acf8bca7b995eb8175aae8f8948adfff1e43a92896b2d988
-EBUILD snes9x-1.55.ebuild 2684 BLAKE2B 44e0bc96353fb4d9cce8fde00c3de7aed84a1a08eb35ef4b55d9b53fb0ce66cfa1f2b2361737147db1102ff3ff887aa840a5babed165f15838803ad67bf14d92 SHA512 ee41e0138dd5d7e42cddbd172749db696ef3f9a8628d39fa2d823418492d07debe5e9ebe4e4429fc58f3a8afadc544056d6d9f914b1a35a1ef4ba4fabd17364b
+EBUILD snes9x-1.54.1.ebuild 2623 BLAKE2B df02581127ce64319caa21fcb5d2e39504d10062c150af5b0a0f27a372bc4365c22df1aefa1cb21ec8fe2b38ff89676a4f4884e23408e988f83dd52a8b5ec3c6 SHA512 aff9791602aa30e892c88d97bfe0c8cc316d64b7cf10299f2647da293c749215da2f7aece3d6918166879eb3c2e6f082180dd4a745bbac9322c78bb51eeb70bf
+EBUILD snes9x-1.55.ebuild 2628 BLAKE2B 48b8a8c0e9388c0f11e3ffa5d919c0bb731ebb33a7f456012c7d508aca5096de7f919d168d5f2eac04a5b9190c9f8bba568ce1a4fd041abcb0f2c4b5f0b36a35 SHA512 e3f14efadcd4915991a97d90e26dccf159ebc47e25b9070c358670e1231a1fe831977042c08d7bc80ca9b84163a5fb0a560936f36a11dbf54c7ba45c34bc57eb
 MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca
diff --git a/games-emulation/snes9x/snes9x-1.54.1.ebuild b/games-emulation/snes9x/snes9x-1.54.1.ebuild
index f7531d383ac5..972c9db684b9 100644
--- a/games-emulation/snes9x/snes9x-1.54.1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.54.1.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
@@ -31,9 +31,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto
-	gtk? ( virtual/pkgconfig
-		xv? ( x11-proto/videoproto ) )
+	x11-base/xorg-proto
 	nls? ( dev-util/intltool )"
 
 S="${WORKDIR}/${P}/unix"
diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild
index f95ee81863fb..639a39ffc5c6 100644
--- a/games-emulation/snes9x/snes9x-1.55.ebuild
+++ b/games-emulation/snes9x/snes9x-1.55.ebuild
@@ -33,9 +33,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xproto
-	gtk? ( virtual/pkgconfig
-		xv? ( x11-proto/videoproto ) )
+	x11-base/xorg-proto
 	nls? ( dev-util/intltool )"
 
 S="${WORKDIR}/${P}/unix"