gentoo resync : 13.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-13 16:38:56 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-13 16:38:56 +0100
commit: ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (patch)
tree: 2fdc433d571e3ead010876d43ce2646b7d783680 /media-libs
parent: 88ebe56470c37b02a044e1091cad6b2df0f3be8f (diff)
73 files changed, 825 insertions, 201 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c69389dbf31c..4a2abde9c3ac 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 86cb0ec752ca..fd5464f06a28 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -6,7 +6,7 @@ AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r6.ebuild 1777 BLAKE2B 712c2e736b906da3dee8a485fc931d38f9e916896013945f26b5355ed73a1e3a39d06c547ad24c4de5460dc06e9910ffdee23e6d54bfd4961a597a9aac0a58f4 SHA512 58b7e629913798018fff1cb4b8ee5f2c13804502e945ce4a78e30dfc90e945f2d2798a572de8ffecd500f10923b805fa8abd39f7cb14ca4bdc1629ac93ec1b7a
-EBUILD aalib-1.4_rc5-r7.ebuild 1841 BLAKE2B 2fe18c0c96304e4b868d5cc663c161ba33c60c4486ebc937e99a0712e2f24b34a0aae9ab2f2b5be8704c1b1bebb832ad117a8c8418b9924ebaeac64e56ec6f9a SHA512 35485de873027f7ea88f450c88f8d84d3a9b769914887d6d6368d89798a02d96ae133c9477b956292abb8756c1a222b94541f45725507cdcae315e6f3e5add33
-EBUILD aalib-1.4_rc5-r8.ebuild 1985 BLAKE2B d917d972ad289c559d9590a43a9ff068fba3caca9474a67e7fba1ba0a9d92f711509da76cfa56a3fe43c037d997b48a88bacd70654268b278a03cd0fcc7cc7af SHA512 e1647dca40dcf445e9ea658c0c4b240ab845ee8bfadb525ec478135efb4f76add8aafcf8f05fd68013ae1bd0e8752656e42940da8138176e139c4c79213c1e9b
+EBUILD aalib-1.4_rc5-r6.ebuild 1780 BLAKE2B 9612eb7ce830849555921150cfb53e49fe7dd4cfa2b3f8e67b5191eded0300607184eebcc80c23ba0876063d5e7317b7796b9f4d870e04d88d815f9b9c479b35 SHA512 285aeb2d26cceb3a5bfc6bea24ce77da9ff38fe2ac2ba3955f9f6dc71119bccc9704a0c8548c81313eec856248e2e3b96fd61e1e6a874440a44ab1e9eb5ca5b2
+EBUILD aalib-1.4_rc5-r7.ebuild 1844 BLAKE2B c0da2a46a489a14d24268c78789fb2a381746533910ee313067dd577155711210ca2853e572e0cb9b9903dbf10fa8e6d6300cb2b199296e761f9f6bcb0dc39f0 SHA512 b8bb79cd21dd348258e0eb6fda05b75a009497d923801a742fc2dab142194e8bd1b60c3f640ae15063735721b6f0d387c4ec613f889e460ab982e1b5c3492477
+EBUILD aalib-1.4_rc5-r8.ebuild 1988 BLAKE2B 5cae6ea9906bc9860f2334ac558a2723f96da3e88f985067babfb6343eb9baeb245e9706537d2a1fbbb3b932579c98be6b43cbf0b785a0297f6b8e05f95dc237 SHA512 c70991712d711c03e8a4731846cd746aa000e0dbed97b2d3f66021bf5670e3068c6340c32e19ddf47abb5ef65e398f9daf0a49985dac80305334b6914f3d3f46
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
index 91b4a855d733..c9b66ed53477 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
diff --git a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
index fca6534c9223..33b7a1fe0432 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r7.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=5
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
index ed1597ebd57f..240f763610ca 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.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
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 "
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 6f3638785409..43569f05db70 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -6,6 +6,6 @@ AUX allegro-5.0.11-multilib.patch 340 BLAKE2B f36777114467418600b3cf7b07d7e0ac77
 AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 609b146bb64540d6a72cdab064357b11b335dafb682b45a2a5c302d08594fb1e84ade9748b10f2f3aa84d9ee77e776d7bc9a48d29737dde413e59c8c3c214afa SHA512 ad137dd9c148ada1a3075135df10e92462271327fb9d07768dcdb4c58007a5909cde52912750eae235ef5440bf9d6aaa7488f2c62d443729c2ecc4da3380d8f2
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
-EBUILD allegro-4.4.2-r1.ebuild 2616 BLAKE2B 1a81adca1865f7005aa89c760bf8090e78d0d853eb34815d45a2580e2bfd5ad8395e2ecb01ab1796345395791c2461746f95b4c4d6ad3becfc24638be8836ca2 SHA512 746d63c97049999ada61fb90c13e20b462fdabb09a5eb52504273612d80a1c5e1a3e63fdd5b7e2d274e2dd9404d823128c82fec6141719c85f92fec10b5386e0
-EBUILD allegro-5.0.11.ebuild 2594 BLAKE2B 2682737b85b3b823dd4347114336c4de4eb76ba3dcb0377c95799314668de9d998f9de013a76562c8e8397ddd5e8f7d1a152cf64517d8539b63f81763205dbf3 SHA512 2d21588d05b1bbd814410529996970979ca0ed79433030d906c8133dc883d5f674c24eea4694f1ddbf2e014988e5cc263b345f5cce96360ec76af16ca9bab47c
+EBUILD allegro-4.4.2-r1.ebuild 2540 BLAKE2B 730e993961e06aedebb4d552e0fc7eb434810c401ec871afad821acd070b96816d54c0a42704c20c5de18e816a9c91a629aa9ad62d3fd75995200482c803d46b SHA512 c56a71d7568bd9cda03d752fe6106fc6db00f865be6b0f4f661e53eb92042112dab81a514bdb921503ab4dbf0f2135d789e8f07e906c58d7b2d0fb701aeeaca1
+EBUILD allegro-5.0.11.ebuild 2457 BLAKE2B 7187a51596046c1517011b76d98218e02eaec9c3fe2bd587a674469e3df26462bc9bdccf72821380610f0ac3f34ea68a4828b24d77d64a94681bf46b843bd9a6 SHA512 365821339df7886eca0f84818ff1bcddb59dd01b9908d277888c69680d8c802fe7c66281303830ce6d8716a3b0bdc5802eb2fb02c6f974e8f00e9067e87cd87b
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index 5b8e1b43dc4d..0cb5aac9bf36 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-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=5
@@ -35,12 +35,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xf86dgaproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-	)"
+	X? ( x11-base/xorg-proto )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-shared.patch
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index 1dd3002441e6..f54c046fec53 100644
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.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=5
@@ -34,9 +34,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
 
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 3be6f4bb0544..4dd160c474c9 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -17,7 +17,7 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c
 EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
-EBUILD babl-0.1.38.ebuild 1464 BLAKE2B 94b20009d5596aea1ca481a5ba6dfdb2c4488425a562da29914b4a2fd26508caa07e4cf31692b0edaeacd5b77fe3094206841d7de30d81b4b4dd20e2fb1822f6 SHA512 0a7f4b9f0cd0eff14cf2590ba88072fafef3cfc7e8e7b65dd31304fc4384ce2cfcf969b32b369cbc859a5fc790509f71c86283d2dcbf8b22d9f87f22d30f270c
+EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 84f3f6b2794e095549ef585a45b57adf6b6ac2cef509c5192eb8933051eba64331743332ee0f661d46f6ed1f9288903936870dfc23dbdae5e7e857ce9da63405 SHA512 f226cbad7159e985d2199cb40939548a86ad554b536a644ff702a8c4d1931ce22b5de15fb6afe6d1d25b2d7a0a9cc057974494c3fc1f123f57cb06cb0d80d339
 EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
 EBUILD babl-0.1.42.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
 EBUILD babl-0.1.44.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 7ce8e23e93b3..6c87dddd2fb3 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index e83cadba9527..e25fae738e22 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,13 +1,16 @@
 AUX chromaprint-1.1-gtest.patch 3954 BLAKE2B cf94b85a97407f6efe1f6de75959506d3e50af685220df8ad7a454a46087029117de8c6b730172d69369e203856102771a3c234137fddcbf84511cba9cd83ddb SHA512 adbbfd9a8456751b4071d78cad1a67c4d11dcbb0f74dfefcbf6e92505c6543f81df316b2e43b927ac98405b054b1dba74658610c226e40e26184d4e927099fa3
 AUX chromaprint-1.2-ffmpeg29.patch 1573 BLAKE2B 8375d1ea02edbfaf1e39d8e5f33529296f3c80648ee8d534d5f289404f399830e28169109d9813aa844a1bfa42ec048f548e21f1d3c15ab540f3fb9d5f76834f SHA512 7366b9ebff706e67ebe3e0a57605607351076d071b62c9c1aa6e17f2721bbba315a0bde42b4a44f0a6d1921c410e224aac724017e8b4e33ec239b83675936579
+AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
 DIST chromaprint-1.2.tar.gz 529646 BLAKE2B a45b88edfe7e37bc09d960a385f8b7303705da9cc717c85f707b6ea3ed2f2f288589850461ab368ef5a9873239d058416757c5f7fd524d0e240b14145e3aa07e SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb
 DIST chromaprint-1.3.2.tar.gz 538395 BLAKE2B b08d6ff106c3728d91352e694d39722390500480bb5049298150de198593116def213445d5cd96772d3956508df80b92ce3b440c14606aeff8eeca934aa402de SHA512 7f89eb09f293a3691efcb01544da612cf674a00af1c188db3f1075db44fee0a8e0aeff3ca6eccd0731ae6bbff9eb0fd51b22128fa927fdbd21638e2832f76e95
 DIST chromaprint-1.4.1.tar.gz 611014 BLAKE2B 139a3d58392f442feab1d955b03accb5ec81df3cb3de43a9a1d53d7ce061cee94aaad4ce66a860326fa84f155eba39e50e34a7055522e0637cacee8c91e7f7e7 SHA512 9d414ba01be87f973df877afc600c761bf338292680d2626baa2a483f0bb681b506d02baa8f9de297489459ba1ebae9005202bfe7ba661b7bd4d60d4a2463ede
 DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
+DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.2-r1.ebuild 1130 BLAKE2B 035bee5657f5c579a0243716a1b3f29ad0b96f3ca012e4e6668b3461b8857df60d23dcdbca70d389e07e49e39497cd5b4af79235e8ee79c11a9cf37d96b0853f SHA512 f9672834feac2dd1d6ec0d11d123b22cf50d0f5550ae702eeb641d3296190f90baa8a3805e1ec98ba8d060a93e8d6270f8c0d8799ab0aecc6e2c0bcbe3e545d4
 EBUILD chromaprint-1.2.ebuild 1076 BLAKE2B 4042edcc33926c157cd7fda5ae9749c07b99a662bd12856b12973ff05044de6f32b79622d85cdc983d80dd070ae5b10abfb6042ed63905bc1e1288578c1c97bb SHA512 163e6bc812268032500c0ed1b97c277f97dc379bbaa6221dd8953b5797849a8f2af98c2eea52b518644ce6a99d5edae1462bb699fcb05a7116a3c0c492ccafcd
 EBUILD chromaprint-1.3.2.ebuild 1098 BLAKE2B 69614a6f80d2dd553f2eb61b5ca38ce69fa0cf69e812ead17a5ae15e23d55788996602a39ca795e19938a45f004d05a66444fb0a23e375f25d1d6ec1850efb92 SHA512 c15f598ff012bd91c312d26e25bd27c1981abf050fb76770a98cfe2f23d96faf50fa6a4e05dc4584d6fca5803a702c7f33bba328b5bcaf09c257509fceaa8da7
 EBUILD chromaprint-1.4.1.ebuild 1331 BLAKE2B 1fc4cb113fb92d29a5613687fc41a029df40e9cf9851171e3dc3ca417c14205128d2733d7aba59972add6b716364d32d362bf5d956723bec22dd708c309556d4 SHA512 9ed09f55707ddedfdb536f8b2613a5118d96e05878d9c37eda15c1a25dfacb07e6add91ffcef71a98a0a4b5b6caa9925074af449ec0e1edc7c333ceea986a256
 EBUILD chromaprint-1.4.2.ebuild 1354 BLAKE2B 15029b3527b9534047b54150899f4f7f2d2f2bbd6f4598eb6eb216150f44adca2a4a84a77e4b9fa545418212a0c86ec7044937eed41962d81f85c7ff92443ed3 SHA512 1589c4c72d09d8c89266f1cdf4e36153f88c42604c5596cf12fadfba594789257bdd7ca2b2886c66a03d2eeebc1bc2f6b74c631866eaa5dc38e4bdf8925a77be
+EBUILD chromaprint-1.4.3.ebuild 1467 BLAKE2B a3eabebfbec5ad69d188108fcbc3ac7225ec8905a9e061e4c11075ba3c94fe7463ff19dc315e88cefe6dbe517c5a87e925f1f2bdae2d46ee86c543c8c5a404ef SHA512 277fa46adbeac1bf4bf53a8eb276a406ea0ed9241c3581bd47a7dcd185c014caa6fb59775b901700a6df866e0cd78c8f1e04193f9cbcea71412fe4c744dde441
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
new file mode 100644
index 000000000000..c1ac357af584
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+GTEST_VERSION="1.8.0"
+
+DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+HOMEPAGE="http://acoustid.org/chromaprint"
+SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
+	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="libav test tools"
+
+# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
+RDEPEND="
+	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+		dev-libs/boost[${MULTILIB_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/chromaprint-1.4.3-test-bigendian.patch )
+
+DOCS="NEWS.txt README.md"
+
+S=${WORKDIR}/${PN}-v${PV}
+
+multilib_src_configure() {
+	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
+	local mycmakeargs=(
+		"-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		-DFFT_LIB=avfft
+		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
+		)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch
new file mode 100644
index 000000000000..dc080bb98470
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch
@@ -0,0 +1,60 @@
+From 8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lukas@oxygene.sk>
+Date: Sat, 10 Feb 2018 06:52:10 +0100
+Subject: [PATCH] Change LoadAudioFile to not depend on little-endian CPU
+
+Fixes https://github.com/acoustid/chromaprint/issues/46
+---
+ tests/test_utils.cpp |  9 +++++++++
+ tests/test_utils.h   | 14 +++++++++-----
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp
+index fc8bb86..536f46e 100644
+--- a/tests/test_utils.cpp
++++ b/tests/test_utils.cpp
+@@ -2,6 +2,7 @@
+ #include <algorithm>
+ #include <limits>
+ #include "utils.h"
++#include "test_utils.h"
+ 
+ using namespace chromaprint;
+ 
+@@ -92,3 +93,11 @@ TEST(Utils, CountSetBits64) {
+     EXPECT_EQ(64, CountSetBits(0xFFFFFFFFFFFFFFFFU));
+     EXPECT_EQ(8, CountSetBits(0x0101010101010101U));
+ }
++
++TEST(Utils, LoadAudioFile) {
++	std::vector<short> data = LoadAudioFile("data/test_mono_44100.raw");
++	ASSERT_EQ(data.size(), 176400/2);
++	EXPECT_EQ(data[1000], 0);
++	EXPECT_EQ(data[2000], 107);
++	EXPECT_EQ(data[3000], 128);
++}
+diff --git a/tests/test_utils.h b/tests/test_utils.h
+index 3631007..d01e9e3 100644
+--- a/tests/test_utils.h
++++ b/tests/test_utils.h
+@@ -31,11 +31,15 @@ inline std::vector<short> LoadAudioFile(const std::string &file_name)
+ {
+ 	std::string path = TESTS_DIR + file_name;
+ 	std::ifstream file(path.c_str(), std::ifstream::in | std::ifstream::binary);
+-	file.seekg(0, std::ios::end);
+-	int length = file.tellg();
+-	file.seekg(0, std::ios::beg);
+-	std::vector<short> data(length / 2);
+-	file.read((char *)&data[0], length);
++	uint8_t buf[4096];
++	std::vector<int16_t> data;
++	while (!file.eof()) {
++		file.read((char *) buf, 4096);
++		size_t nread = file.gcount();
++		for (size_t i = 0; i < nread - 1; i += 2) {
++			data.push_back((int16_t) (((uint16_t) buf[i+1] << 8) | ((uint16_t) buf[i])));
++		}
++	}
+ 	file.close();
+ 	return data;
+ }
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 744b2657838e..a2f0d9f61796 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -7,6 +7,6 @@ AUX coin-3.1.3-pkgconfig-partial.patch 431 BLAKE2B af57c0a4ec1985351db67f8f8f1d9
 AUX coin-4.0.0a-gcc-7.patch 581 BLAKE2B 2ee051f14c8c4e264cc887f51e49d817c7b08be735dcc4c3be8574fb1f4b5db2b41ad46d22c7adfd2283986a0ff87948b9f03783bb80a2b423c8040872fa9933 SHA512 6ebfca69557c867218526cbe9937a37a6a4936448353410586b24f60efbc19000003c67cb04e1b9dfa5cfe950fde3e9c9aec1762292b5c26169c963682630480
 DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
 DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
-EBUILD coin-3.1.3-r2.ebuild 2527 BLAKE2B 45061a6697b1bc6c7b5f7a38fd1a1310c609abad681b8cbcb496ec898d049e23e7658bc39eeb5b0e1db0142d5f6c968ef036bcb010fd60306498e918a9c372d1 SHA512 6b7754a385f0107c5cf5a755734bfb0f30d00589cf26434d2b237f147fd7cb79f868bbabbf36ae85bf4e181db61aeea83dab1d3f1232f056e70da55848246f5a
-EBUILD coin-4.0.0a_pre20180416.ebuild 1948 BLAKE2B 96330bd2e6622866130ed549269cf0de9ec89991292448a33b4996a2929ce96716d57eaca8c31a0f3e1e8a6b3d8ade514362b3e23b5c5e7811e1476acf792c61 SHA512 0edf5ef311c9113ddf61d1337baeec5d21505285b453b90551214937bca2dfad363a612d998e88692b1fb446c35c1d4383df900134ced56cd749d0755439764c
+EBUILD coin-3.1.3-r2.ebuild 2527 BLAKE2B c4b7de9bc55b7343934c8dafa321c7d644ad574c370c85d6e23bda16b6cd6a4308520f9189e8deb69e27ef01e0aac780d519a970a84311cb017d9f3bfe57c18f SHA512 4d0cbc7d042f3db45d47fbd26edcd2c93609093112e7e0a00ef4c9d2f79973f8921bbab93eb967332c5893dddc805dd40c4c4836f2c2b64aa9fef8b59e120741
+EBUILD coin-4.0.0a_pre20180416.ebuild 1948 BLAKE2B c9ef483cc14628bc324ce598dad1d3863d4c60b10d757da16496c3d056e3079dbf5eb1ff271071e0af12f17adf8494f27ac2efb22804b5bc39631eaa53a9cac1 SHA512 d77ec8ac2d0c7f71371b9360d1a07293dd306ee35fe5b869f2956a76a0d93671da8c6d97ec3235b66413ebbd22ee3522a3768b7d2167f5dd1c299e4adea9f7a1
 MISC metadata.xml 483 BLAKE2B 4b4e0a4e69a83b8cfa2be1298873b2ca28cde6dbc431a967c9c37839d17647c052cf8a465894451c23a75fea7be3cadd5954e3cff69de2b3f0bd5ef333251ba2 SHA512 e4419aa5e2ed7e0637f0c971b3b6d0937d4b7e0238b567ecef8bff4c8512ad88e6e04ca3f539f09b7c1f6fe6e2727b555b291e7ed5029776a7efef078bb88a1b
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
index 147ec0c3800e..3c7f941a6632 100644
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ b/media-libs/coin/coin-3.1.3-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
@@ -35,7 +35,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	doc? ( app-doc/doxygen )
 "
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
index da490ba09d21..815c8aa67e80 100644
--- a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
+++ b/media-libs/coin/coin-4.0.0a_pre20180416.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,7 +33,7 @@ RDEPEND="
 	simage? ( media-libs/simage )
 "
 DEPEND="${RDEPEND}
-	x11-proto/xextproto
+	x11-base/xorg-proto
 	doc? (
 		app-doc/doxygen
 		qthelp? ( dev-qt/qthelp:5 )
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index a23d9ae63983..5ba8aa6a085e 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2177 BLAKE2B 2cbdef5c3a1da787addbaaf65b43b9e9357d29dc2b05a1f14b547933947e8219fddd1d9b1f0de6477269b417e58877a5cb555b6b43e481967533fc86209a2982 SHA512 df753c555f9a7ecd356c1d56735b3270b97ce276e7a10344e90ca98a90876827002275e13d0afc0c99fa7f520bfadf1527cfddb635aca78068c9aff844071b9b
+EBUILD devil-1.7.8-r2.ebuild 2177 BLAKE2B 7b6ac84bd6c2552a219e5d7362b075e9db03c759ebd89d4fd6ef99fb270b79b0f1cabd5e4110671767d2ff3fa43d9a80f160b6afa1ec0161a86d6877d03df216 SHA512 c36245fb617a4121ec870a1251607ea872e97e17ed5db7c93ed6a51ecc367f40ac0004bde676eff753094e1b1d4d1fa10cce4e52782be0b381745659abff763c
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 9c833edd6833..4d74269bfece 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-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
@@ -36,7 +36,7 @@ RDEPEND="
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 PATCHES=(
 	"${FILESDIR}/${P}"-CVE-2009-3994.patch
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 87f0c3ac2414..eff17eeaa214 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,6 @@
 AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 BLAKE2B 858a7f7b4845e75963855cd7d6191cb57c96da017faf50a78addd75a994a53f5adca66c33e8aa2564623a469596e443a24caefb3288b2e77e768ee13e8b3d287 SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561
 DIST freeglut-2.8.1.tar.gz 1005343 BLAKE2B d830f6d19659ba6bbe60fc9c981ae16582de8d90e05d58bcaee43133b7699a5f0b2507a777c11c5fcdb730b17c394dd6fc562d5e857024d99d4feb2130ff7cde SHA512 935fddfa197c5f0ec74c5f2005fe5a0ebfd39f4a402cc79363da7cfe2e8576263130e44bd7e4f6c07ea53d3137bd7ca8ee8db85c0a09f25508fcf1b9ed07052e
 DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
-EBUILD freeglut-2.8.1-r1.ebuild 1167 BLAKE2B b11022395c48923b0f6505a002122d76e210c621578c9097939227e667d52517bd4efc4455f9d3b5bff174d5a51d0d1f9539e593480d98cae5b7cc9f29ba8bd3 SHA512 4ea0aeaa187330b64e2e504e6eda8ceb0d4eaef0da805dce14ce89151091e26d8e6296d5186b1b53d8c7210f263cc77864913455e90d6dd93c73ad3e8a90e28e
-EBUILD freeglut-3.0.0.ebuild 1294 BLAKE2B a860734deaa359e406efe6a2c827ea35b7cb80cb28e78e6955dce29bc36e60f0aaddb9230c4a62cf704e435bb467a3a5a6a2e8bcd7363f62e92488ff60aeff6b SHA512 86ce648bb4ef4d74cc4d88cf0131ea45d6c633e8dfb1bded5f2899213a0aef521aca910cd7afd71549cb12acb1f55e2e1cabe4575a8123ff0c83546416826b63
+EBUILD freeglut-2.8.1-r1.ebuild 1093 BLAKE2B 02f6fbbe3bfa11a27e36e4189d5422a8210870ba02288681634c3a303907e91990385234e3fe8cca6b7bbd932210ca4a092c709f2e4480a9fa0807e31fc43f75 SHA512 3065ef4d85722f1bfaa98331ed97609f3295f73fe9354f5aab17f04f5a1a1c234d68fe004de71dfd1bce173e716a7a0097a00cea1e6656a12977e94129e15065
+EBUILD freeglut-3.0.0.ebuild 1220 BLAKE2B 236bebc7f725cdc6b4daacd4c6e8d77c3a2f8fce247efbf9b3c0a7149db65dc15d918755439de56995903bb26b4a68bdd9d19ef40fc07ad946445f8ebdb6d169 SHA512 1d69032bee1190ca2a7cbc52ffbaeb6e74910dde6559097fdbf2ebd68b674b7d2bb32033ea8204ffcab0e14f1ee5a8009050756cd9a0bc6ab2a3bf3e8fa5f637
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
index 5999aa059199..e82008028a8d 100644
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,8 +22,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+	x11-base/xorg-proto"
 
 PATCHES=(
 	# Please read the comments in the patch before thinking about dropping it
diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index e1adbfa5560e..c3ee6fb9dd2b 100644
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.0.0.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=5
@@ -24,8 +24,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 # gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+	x11-base/xorg-proto"
 
 HTML_DOCS=( doc/. )
 
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index dc445109c7bb..a5ca90000147 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,7 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r1.ebuild 6657 BLAKE2B cc3b2f8bcc0c3c10ce70936d66074654763f290d4a288c8b1a650dedc08b016f70908501ddf5c7a01bab283917e2e524899029c42748aa8133359184c7d5d69e SHA512 660dc53ed5e0e0a723cbff7d3319d3d0b0a3979d2a88ca6ee6f298be51900eb06de8f14dc1e37b06a2f1675f8f69be6a358e08bdf11385c6e623d8290fce5ee2
+EBUILD freetype-2.9.1-r1.ebuild 6654 BLAKE2B b10d25f061bf05646c34142afd81322eaf670627e45207aca2b201caf73e03b510b5ab9469dc51adf167b9b279232f4d9311468fef3994b356e00f41aab26e2f SHA512 34425c7695e6f67d24c22c601fa15bef3cfe641fc201447ec9e61387f7c2cb6f3e937d853a8797d782f6dc7ab85ec0192960a16f6b9ccede0e2a3bb74576f4be
 EBUILD freetype-2.9.1-r2.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
 EBUILD freetype-9999.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild b/media-libs/freetype/freetype-2.9.1-r1.ebuild
index af4cd85ca024..25a9abd9df0c 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b9af0edb0d96..675804b4280b 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -18,7 +18,7 @@ EBUILD gegl-0.2.0-r2.ebuild 4787 BLAKE2B 0ff214b8275e0cfb2c7cfe1aa5b9b8d663006cf
 EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0192dae4870556d593e8e00ed02e8d146a0a5c10943376b9e00f7737d1ff465388bb536fd6076ca4be52dfc9c1 SHA512 54409f06ece1431191c2c6ecb77d8d536e8d87e78da3324e201796efa0f6dcd24ce7e0f4288f5ed419559ede5d2f8a35f4cb84b7f3bdbea36c59ca67d5e0d215
 EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
 EBUILD gegl-0.3.0.ebuild 5297 BLAKE2B 6f6ebfcee8dc76a7d9b5b9e7cf22b4f3e8ebee1cf2f2683d6960d6632ff7ed21b60dc9a92b6052c2cd89f2ebfa0d979aeee9d432c35ba532afa6825694d2b571 SHA512 17b071d9f98be37c8bb33cf5de11a64dd0d6a13bcf067172c6517b25b8ae633f94c3d5f116c68dec36c6e1340ad5a777cb3da21243b5eb59a2c9ed70b5a88c06
-EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 75a2a7992767c1d4c21603b18155d2f1612b93d5c5e97a71ad805fce20db32e2669dafde41c2a39a969227a574f576c6b724e3bb7a4edd49384104dc6104a960 SHA512 de35606c5f30e3f1ea6a9e6dd7dd96cb55e3ce9a83eced15c1ba8866a7f6ab6ee489b5413dc50a659e7459d0cd3ba6d8e06da7ce2ea165c4863afcd36e228c2a
+EBUILD gegl-0.3.26.ebuild 5232 BLAKE2B 30dc1d3e133522622ef297b6dab50fcb158c36539facf8d5c08f700d3b7347ad81725d732cdbe01752fd5262cd48371840edbae4e4edb1dd480fcb714ffad4c8 SHA512 e3199c48f170255f7794752e937b4fe80bc35d099c6d338f2540a65f99aa5cfc5326f0ef22a17ca71e5d1d528ec60c87430c12bda9dd851d600c4ff2146bb647
 EBUILD gegl-0.3.34.ebuild 5239 BLAKE2B 5ac20b0e841256591bb38f6b4a2e03f3f37525b4c716e5a14f1315d03a66484732c13bac74f1731f4c2d46bdd99536c4b55d779e1535de18303c14ac4eaaf6c6 SHA512 5422d262f5da7f66b5bea47cd3f32a7bcee63c89cf67a5cbc05da070f03648564e542a4352fd8f30a2fdda95c29353ea1bd322a15542679aa795b7de0959983c
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
 EBUILD gegl-0.3.8.ebuild 5216 BLAKE2B eb91252d7d87e0102817b756d8b16c7839ba68ac9b104d2d683e1a59c24d1a183520f0d40ee62767aa0601dc2d636eae37a20a0075ffcc809ea9e2732d96be12 SHA512 a6407382b1cfe1b27922f0b77887353e5649d3203caea9a04bf685b0be66d5a4cba8fb582fc8d62555bec9ff583f6d4067983ff6ead816d27105370382094f30
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index aaf6fcd179ba..b742c229fab9 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 12b0fa670cb8..121f1d32f13b 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -4,10 +4,10 @@ DIST glew-1.13.0.tgz 616070 BLAKE2B 73a1fa4f3a49a072c7c23c2976775521c85afe4aec7f
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
 DIST glew-2.0.0.tgz 667340 BLAKE2B e44fc13a222d613e2cad4717dce24a86941e7ef60331a4c18ac6aeeea09dd51fd3d1f40ec3a77341158911c26ff2c45eaf2df8e002fafda145ae6e89fae6c440 SHA512 e9bcd5f19a4495ce6511dfd76e64b4e4d958603c513ee9063eb9fe24fc6e0413f168620661230f1baef558f2f907cef7fe7ab2bdf957a6f7bda5fe96e9319c6a
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
-EBUILD glew-1.10.0-r100.ebuild 1945 BLAKE2B 84795d7933d564a70c9cd21d21c4e0661d670098f4956042f6efa9b645f9cfd4d82cfc8facc0fae8e6741a68a4aa2761050801a9979d3692ab81b4b5fd110a4e SHA512 b39c123fd4c5fb4e986ad05ad85c2ec23f3172b8402a85f521529f63c12742320aaf760a073d928198619a7a17ac3bcf8024ec7ca5b3cf970f7b8e30965eb9f6
+EBUILD glew-1.10.0-r100.ebuild 1948 BLAKE2B 49358c8d4969c8ed80c551d6a8dc504a2368ddb5a96f6f8a3e41d38bc028e70f88b714913f6b55cf85d101cb4b8f5a1d8eeef0a64803291e3e553dfb3234fb5b SHA512 97b574ef48d5d88bd86299fd6a9cf3fb85440af015e50ecd5ed841b214b0e9fd278c4d9e70b57c3c6224a3105582cbbfd7da1d2fcb48a6165d51a9421d9c797c
 EBUILD glew-1.10.0-r2.ebuild 2315 BLAKE2B 403bf435c4c4ac04b2004771d7693e0798c1b9883d9841c0c334f6c88b57c566c3ad5fb4fd809cff3cabc647544587d2a6e23406dfdf661b8b0abcfbe31d3402 SHA512 45bfd975303ce4874f013ce5a68689dc9bfb9a03208025ea8b5057c689c4ed1c3ff08d0341dfeb05d65f16ced9115513c8b043bb88a44adbcefb5867aa85b151
 EBUILD glew-1.13.0.ebuild 2363 BLAKE2B 7697beed6e91c72651668f22a99fd4056d767a41d49e97bd4b19a2eb62a065d8e12073e3a16ce47afee199d05f0b672a9f6c72e37ff2b942aad8373c08ca2e71 SHA512 2cb6bc63987555d2318beee186cd1067637540e0f9743248cfcb9355dcc65d1c5bd58bdcd31994a42c2d3a20cf25acc7c40bc27399b1d6daf32dd194072882db
-EBUILD glew-1.6.0-r100.ebuild 1918 BLAKE2B f4e0743ba9f5e76e6a9b1a19411b59a6fd08f71a01443c61e819bd4d2ba4528a1f635826ce5c7359ea31d0a1f6045888b36f4833c15b88ab0c5265ad9839ff25 SHA512 2b862eac1583f939d416570776e48675aa307762c7a437c44dd07d212c60fee33cc7671b4a3b659d9d86e5fa7938ab8d9a09fc340d412c10080827378c598bbb
+EBUILD glew-1.6.0-r100.ebuild 1921 BLAKE2B 634e76c202e3d4b08ef68b0faf4d8c8c88692b32e0b8536c9a3ab617361ad008030994517dc30146171f61d80bc75fafc1cc8e3e51a1ee76563c443ecc7033d7 SHA512 53e816516b5166ec273a9a722694c7aa0961b63144562630979b2db35d0da697f3bf4f8ff0c1cfa44d95a788d0b5304733db3470b6b245b0e2acd952df67a93f
 EBUILD glew-2.0.0.ebuild 2481 BLAKE2B b5bd5d5548b813dd8a7d3417def5b59d94c51cba7288ece7f54caa7427598afc0671378091f867c5923b95a7dc2965eb615d23ddea1ad3bc9fa07aec715506f4 SHA512 892f40d7db982d74e528570479add88b60b8552339a5762973dab1412061bfa4fe963e2d0c19b7c504f66d966086d4cd23d64244ed62c19c99177602b2c01a50
 EBUILD glew-2.1.0.ebuild 2514 BLAKE2B 3405ce81a1f6e8c8b1ddb50e0698d9cabf3606c08303fc2a2b184f1a90733a17cbf972836f1d5b92f9e3b3171e6b216f0a62d414faee1548f84303e38963980e SHA512 db8380ca88da0d1214979e2c12520bcefae9d5d5804b5242a8abe145910eb54ca75333bc35b93a51a0dacfd1d4f7536d5678e460d1a9520824f42beac43cb5cd
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index 8c4a9717025f..cc4b3786ef67 100644
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r100.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
@@ -16,8 +16,8 @@ RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	!=media-libs/glew-1.10*:0"
 
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	x11-proto/xproto"
+	x11-base/xorg-proto
+	x11-libs/libX11"
 
 DOCS=""
 
diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild
index 1ce200c72f2e..e730aa775712 100644
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r100.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
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	x11-proto/xproto"
+	x11-base/xorg-proto
+	x11-libs/libX11"
 
 DOCS=""
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index a8a288666e9e..399d5ff85ba8 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -4,6 +4,6 @@ DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c0
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
-EBUILD gst-plugins-base-1.12.3.ebuild 2694 BLAKE2B 05e7a5b9b4d4f6401c2c896897f975841807970529463729e20022d2339174db355588ce34ef6b2874ed18b9de63f7ee7d093ced6dceb13c878805c695fd6d3c SHA512 e3bac4b68020c749671cc95937e289cf92c05591556cb275cee018ada983234c4ba9a50b2792ca878c52d9cf5a9f2c53b6761e38f528ea3091384e3776e179f4
-EBUILD gst-plugins-base-1.12.4.ebuild 2772 BLAKE2B 59ae3c2e796b7fff58f33fdaee9a5fcd0f7d5b69ae428da6207a2b4f849460408740469eee83857a1813d614051f262224b7372ef924d0c94ac2f2ef83126503 SHA512 f610d842340bdeec3c8d438aba92efbee13aa8e0dea36d1c3e09e6c6280be4c02eccc71d22db3e613c661d735bd978f05e0754137f4abf94033093b72b9f9fde
+EBUILD gst-plugins-base-1.12.3.ebuild 2559 BLAKE2B ecc42507c99ff833f3918fff11b4667b210b1f7c8688d55c1cad1b5ceb0e637369027bf28e343ad7528af409d81ccadf1da7a128a1f1873cc4195f6e2c6e5e2b SHA512 0ff63387e44a61fc8d2be8d93d75cd720473742ed68652d1e901cd85fd167b8a683870065a4bfaad10af91348dbe7cbf1adc4d00cfb909df7d284daf700c1998
+EBUILD gst-plugins-base-1.12.4.ebuild 2637 BLAKE2B 07819e92f34435a8c2c0ae9a8f0e1697848795bc7f52faaaecc2b81fb6640a78d754b3aec5ba326a879b5ef90bf51051d8741b818ab924966cefb92230e77c09 SHA512 415d5bd26782aca201ee569573b4e5e41cb27545d77d4c5729e10db3736dac3ea94419d1495d3805fb16e832c6a6456a8fd3b9fc2ef222394689bc614b2aeef7
 MISC metadata.xml 397 BLAKE2B 4bb000c5586a8912669b1584356b30d8483b6f15180e7acfdb03d0c4e169c3cc703487a9f1f96867c23ba6b5114903b92bb2b2fda4deb9b979ccf610f8151b8e SHA512 89c4bdb8f7a5da325255b43be4017510c4a5b4a3f8f650dc625b513d0cd2260267f840fc52926fe9ca262d9f3f2c16bcf0aff9c22dd0c8b577e632155910b568
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
index 16339238ba98..e2424730804f 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.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
@@ -41,10 +41,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
-	X? (
-		>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
 "
 
 multilib_src_configure() {
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
index 7d3e5f7618e5..e3e797dd39e4 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
@@ -41,10 +41,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
-	X? (
-		>=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
 "
 
 multilib_src_configure() {
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index b33ff44eb1bc..9976ceb7a84c 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,8 +1,8 @@
 DIST imlib2-1.4.10.tar.gz 1016606 BLAKE2B 8d70930d3f4dabb3ead557337ad8eb65ebc84afce40fce97bd1b5bf3e78092d7c7d6c8a3d3604b6d6026cec4b7460a51d966c63a2d4b315c197de233a1205f32 SHA512 e8ba42399773fc8e340b914be4b07bb170ad39ea0840f909cc611ce2372fd2467148f0319aeae1a10b8b4f5ea6b38b1fc1fc68f649d4940b9096a2633a588987
 DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538ae8beec23ffd96254b303c5ddd3e46c8850221f7ad24a462c9f04daee155878b41d96d602f3c9ca6aac2b1e386 SHA512 303436f447142153928e2d76226b6798c65cb834bf3bfb760e278d2558a3f072ff43fe46616baeea927254200c4535cc323f6a83c5d869def4f6a7213e30e2db
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
-EBUILD imlib2-1.4.10.ebuild 2087 BLAKE2B 4be5f44f59fbe143b3edbdd90c9cafff323f78add0e2e9909e08a5e27d5d6de9adea2266dbfa1d80a3481ee36b217a0bdf6974fa515589fb59f417df8b2ab36f SHA512 a1e9ec3050489cdede172c5f0bb213663f17f6ab9f06c24592d282568f5eacd9f591c353aabdcad97ed214cd752f0a802db1d2f94256bad5a4c4f13734325efd
-EBUILD imlib2-1.4.9.ebuild 2070 BLAKE2B abc5e363da21bad5b8f2e10ce45a0d03ae3e439b40b454a5f56463ac052d1ae272f28fc1418c1bdfcb7180f7a4117a4b772a094e094e8faa9ec84adf2b8835c3 SHA512 76e64aed5acea1542e8ab67b5d69101fc6f3fe64d5ecabe38c4528c545fa435a4e3188304a84c9b8ef6810e8b65bd297ef6f6b0432a9333485efb9b9d006cee8
-EBUILD imlib2-1.5.1.ebuild 1882 BLAKE2B 2553d4049273c2ec58d996205bdf2c870de90f9342b5de4fa37883aacbcf3839cbe135a9447ac5c0842e517a357b7b01eac961ff11e6eececa2b408efa88beb5 SHA512 a1261b11c354ac6c28a82f70c3b5cb8627778e848ae9fea6ed6170e3b8173e22b556dd35cd9866634537e698569bb6070ebe8a7780c735e74acb215a4555df48
-EBUILD imlib2-9999.ebuild 1902 BLAKE2B 6dc263963a9d811487849c4d210db0ee8548d425d382254310da3af807f72b69822f6e62023ddd1853c2b42f05d9d7bca3a8ded648c3657fe70af0e754923000 SHA512 cf07610f0fc4b9ffaa4a75fdab9af7f84d1a9de58f73f68a00a723291eab15c612b2b4b4e2e641a6b590873d9f95eb9506b89e8cf84fa1a826aa291c683d6bb6
+EBUILD imlib2-1.4.10.ebuild 2005 BLAKE2B b0792ae68d5ac1c4d0a17415d4614bfa35b7ea8e4293b55399abc897dbd98f04375efc2e60d349e968ddfd8757614689d2b6dd0b4d8ce18c6e7c882b0d26cdc4 SHA512 fcb939157b9e7d840c00af3700f2e119875bcfbeef2b48bc72aea6a835c66936c747de350894702abc8159c9925b7e6ec4f1c27eb2be773abff3fca396875801
+EBUILD imlib2-1.4.9.ebuild 1988 BLAKE2B 17390f940f2381e276754f332fa6d68e69dd2e34f5edf950c04dbeb62f4e2fec806a7756765f60334b8ee2cb0e7dd4584fb2c46ba533a47cd9e107eb6027669e SHA512 8b2310e639ce77034448dc4d917d5ab67b75c1dc835370f5975ef82e973099bcdef538612ca7ff4a1f32a83c49cd440d24c721a27de4c961ac3fdc60c4fbb92e
+EBUILD imlib2-1.5.1.ebuild 1820 BLAKE2B 1c779d00926860fae3725f16f263f2146b77f91cb1a04b3554696b8bfc88615b5e3c76ee581c9cc934899879b5bb98c0314368df24a83b25d4b3fc8314093e74 SHA512 2c8fb5a87025fa284abb18c1c9b57e045ae6ff60dd43d03b4600471ae3bb669bfee112fda8934233d4f3b41388391d0445123d5f71206f5343907cdf20a97394
+EBUILD imlib2-9999.ebuild 1821 BLAKE2B 27418d8106be818a679ca03d8789baf4b467499fd57213925043b382c091b51d5cd06d1d255e8f5958883792421638bb44c85786f3253230388251c417e63d9a SHA512 e581cda5453333395dc65795ab17b6c3978bab2dab3adfd2cb0a4c713b33f41472864f57c2e822799132d7b62960fae9aced754e59f37e8669f99ed5e876c954
 MISC metadata.xml 2278 BLAKE2B 7461b5d38509f5908d239712947f2f9d3ba91d5dcac79cb82f78ba74c0f8b51b54740cf734b0cf70acaf450f22b8c926ef5661631ac99269f3037d00ace553f8 SHA512 c9ac86bfc0e1cc55096dfb4f99321fa5c5efec65c7beb6d14955b7359ec362f8f41b15adf5e511ed88c1080bd568b59bad2c258fa98d6b89ba5a9dcbcf5b6c67
diff --git a/media-libs/imlib2/imlib2-1.4.10.ebuild b/media-libs/imlib2/imlib2-1.4.10.ebuild
index 01bf754dc87c..c6cf6140491b 100644
--- a/media-libs/imlib2/imlib2-1.4.10.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.10.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"
@@ -33,10 +33,7 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
 	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)"
+	X? ( x11-base/xorg-proto )"
 
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 assembly
diff --git a/media-libs/imlib2/imlib2-1.4.9.ebuild b/media-libs/imlib2/imlib2-1.4.9.ebuild
index 9205b5741a33..5f43a4f2b01d 100644
--- a/media-libs/imlib2/imlib2-1.4.9.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.9.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"
@@ -33,10 +33,7 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
 	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)"
+	X? ( x11-base/xorg-proto )"
 
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 assembly
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index b9c2d44d1bce..20c6dc888539 100644
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -32,10 +32,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-	)
+	X? ( x11-base/xorg-proto )
 "
 
 multilib_src_configure() {
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index dccea068d84c..d615b8dd8ead 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.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="5"
@@ -31,10 +31,8 @@ RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
 	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)"
+	X? ( x11-base/xorg-proto )
+"
 
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 assembly
diff --git a/media-libs/libXcm/Manifest b/media-libs/libXcm/Manifest
index cd4fa9fa8ebc..eb20ea6b6ad5 100644
--- a/media-libs/libXcm/Manifest
+++ b/media-libs/libXcm/Manifest
@@ -1,6 +1,6 @@
 DIST libXcm-0.5.2.tar.bz2 301813 BLAKE2B b8823058a44cf8f1800e9f451d3efc641f6f66e059511b03c61c980426995fcc2fcd30df2bea9c601784c823e97f60b3bd026643b461f876fd69e2314c4f5477 SHA512 4d67218206ba319cb768c055c44a0537468232c12fa463525993c578b5a5a8ee82fc55463ef5e34e85dda221facd2517372bc1920bd025e951337fa84c72f6ab
 DIST libXcm-0.5.4.tar.gz 397552 BLAKE2B 73fb9aa2e52f1b0a26108d6e07fc66afa9da6503aedd49a140692a467bf5665c4551ac34224f91305debb5e15384e29b93fd4a2ef9f233e0b4f5c6c0ab1bce27 SHA512 96d279aff907bbbe4e38d099b79ebbc3b3beaf242be296d10a16e36e721669086ae0b5252f5abc629cc1fd65e595e2eec70bb890ea6ca4bbd08e8ce91cb05b53
-EBUILD libXcm-0.5.2-r1.ebuild 774 BLAKE2B 481a047dc9454832eaf261943e8ac1eefc2f39fe5ae2af3312e1b1913e786ebc6d9e0ee2431447d91723be94237264d025654c5903cff5fdd3106bccd89933ab SHA512 50c6b92405fe5f133d0205cdb79908913dbd44a8045b767c5a939994296fc01bb054f4ce4f3d7199a610bd2d201df7ed482d297001edbeaa983e7f5550e39f7c
-EBUILD libXcm-0.5.4.ebuild 1075 BLAKE2B 46c35704d83469169067cf9bcd43252b951de08103ff187a9d1f3bf34bd2e128058bd21066da706305058cf7752110f86ae783d4d29471119eec1bb2e73947f8 SHA512 6874e27d59c21cf70cbec0c460475232c4c64d49807a2ef1a5b73451e82d68dac85e062a5ea537a44b3afcfaf670a90046c08efb1a5c9305ea0e8a4285c36ad9
-EBUILD libXcm-9999.ebuild 1059 BLAKE2B ef9dc6356e0b607f7864aeb33bb77af50e4788dc1f47f4c597506144649c8daeb94f51e2c466414f76b4b6c5bec50066a9f0b4c4c54bc36fdbb3f8a3138b7619 SHA512 cec5d7d8a892dd52c39095da86241262661b788bc3b1f1f76c60f3589c066d2ed65793c7b193ac42ef71c5b0186f7c3f959cc75a4da5196bb2005fc57ec8788d
+EBUILD libXcm-0.5.2-r1.ebuild 749 BLAKE2B 10ff2e93e6ab4f85c029372ba3174ce1f59ca8a514b219e389e882ca10bcc994b23eb694a3ca7dc9663c0da8f1579afd8df9beca83f2af2af73d37f1f814fc5a SHA512 e1d56e7924177e9a512aa37f5253ae42f55d282be9d4c0f11572bf1fefa2db761d42f63435d724393eb70d5e50c78b90ee8ffaceb7d129d6289e0f707de85918
+EBUILD libXcm-0.5.4.ebuild 1057 BLAKE2B b7c54fac177b6237c3f5ec35932471d0db735967480fef56ac80b20543b228542e65753f3376250dc26ff04461402506a6a32f96253bb24c8baf7669cb76234a SHA512 32e64d476f6d466c35f89ca8b44a3a9852049a10df0bc02675ec5c35edef1b8796c20a931b9d23fcc596818b5c357afa7e7ebf76cc001ed63c2f657342ab6ddc
+EBUILD libXcm-9999.ebuild 1041 BLAKE2B 1ed9d2b456497ef69475c45cad8890fccbad63ab4cdb6fcd9b210e0c19290b2ea382344289138ed2f16f02fe6f77642f5f478c3ba66c267347113fd4d701e055 SHA512 0bb7a0c19467c9546624c9e4f279f00b634317b748a93aa2e1f316284f42e8826686d3e4aeafd453e1f56d3472d6a78486fff00e5e2a000d82841511767d4c6e
 MISC metadata.xml 378 BLAKE2B 434f469eed70f172b77afdf87f566b0b1dd1e165e69d468be26c2dda364ac130169692507cfaca7556e76beab16b0d4fadfd2103b4ddb2536b2a69b81294e41a SHA512 0d5a3ed8260ac13fd93222edb03365a3541e8c444a4df7f1e240100e81ca270201a3e0ec04285ce6cad485bb3cc73db09f7823bd6ba927b0768e51c130b68007
diff --git a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
index e6e47afe01ea..a07d828b9ebc 100644
--- a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
+++ b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X static-libs"
 
-RDEPEND="X? ( >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+RDEPEND="X? (
+		>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 src_configure() {
 	local myeconfargs=(
diff --git a/media-libs/libXcm/libXcm-0.5.4.ebuild b/media-libs/libXcm/libXcm-0.5.4.ebuild
index cd3d3486d625..9cc1630a341a 100644
--- a/media-libs/libXcm/libXcm-0.5.4.ebuild
+++ b/media-libs/libXcm/libXcm-0.5.4.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
@@ -25,10 +25,10 @@ RDEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXmu[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 [[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
 
diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild
index 1ffafce9a399..d39e3f05a318 100644
--- a/media-libs/libXcm/libXcm-9999.ebuild
+++ b/media-libs/libXcm/libXcm-9999.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
@@ -25,10 +25,10 @@ RDEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXmu[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 [[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
 
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 9bd527474868..ff9dff544bd9 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -4,5 +4,5 @@ AUX libafterimage-giflib5-v2.patch 11725 BLAKE2B 92ffc58146a513bb7aa0789d24ca3f3
 AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db14062021d4886bd4258da8e034cc6982086f532ff53fb0c2ed1cee7557ddd53be6d6baa9ccf6cd8f603d7d356e372fef594ec SHA512 67fff22ecb8d2027fecb50a6450b90d3be457c69c8d7c3c0cd16715ead2824634ae5b792cf3877585b74a1323c25934ab31d1462ea983557dc8acc4a6d11bc7a
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
-EBUILD libafterimage-1.20-r2.ebuild 2688 BLAKE2B 911ddb4a55182cdc805939ac18b75f883182c2022e0084df667ecdcf3b297f6076e100d91af581666d6345dc5d0869a8a2fc79539c59c821642295aa8add94db SHA512 e5be4a1c881d3a2abba70b29d109a9e78ae9325d868a812c335e781e4356ea09eef33494492f3d9242e40ff413be042b086f68af61d19a62f6bc7d1ba3a15df5
+EBUILD libafterimage-1.20-r2.ebuild 2688 BLAKE2B aea13f936d29281c4282b4c90baba653152870ad117bf1e729e05bf9d97b2215cebfe802074e1fc55ec440cae9a442dcb403833e4dc6c80463c7cbba9831d658 SHA512 1d52582cb20ca744e99b3e5da7fb59014ff7b4a369916d68c73060c007df6147fe6ec78c6751496805883cd3f7db52aa87324a4a0d6a343c3367aff2fb1eac2c
 MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index f2ef350c2460..c811abb6f5d7 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-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
@@ -27,7 +27,7 @@ RDEPEND="
 	tiff?	( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
-	X?		( x11-proto/xextproto )
+	X?		( x11-base/xorg-proto )
 	virtual/pkgconfig
 	!!x11-wm/afterstep"
 REQUIRED_USE="
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 7afe723bd4fc..daff54451372 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -7,6 +7,6 @@ EBUILD libepoxy-1.4.1.ebuild 1055 BLAKE2B f4d5b8ff39e7e06f7be21001bae24e7a95af92
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.0.ebuild 1212 BLAKE2B 7cb9c61326e602863f9c8e014eb403c3d243a30420a45a1c252dc73f8c1ba49580ec80e6784f8a7432c7bbd8363232ec34f5ea0f3b0de1c7a2ef2ed364d379d7 SHA512 2a34ad6e5a4a70cc637480006e75298c1674aac76e80ae8056b48d75e5a69357c8a53828383e72a25abf59c1caaaeaa5490758887cf0cab1b73478a191b8388c
-EBUILD libepoxy-1.5.1.ebuild 1205 BLAKE2B 2e714c865eb87ccbf292ddebfb5d1c1e9c532ecb99b31e0fe1658d7cbc642a7282e04a67c9500b769ea14b6c4217f7b5068af38b81fb2e6e8d5bb6b37314cdf0 SHA512 21c15ead0b5a451eb7d6d31c65215f744955a068fd9a389f32e88df49eadb8ff7ae48c675f061b4999bc4a6562e4f3210db64b043de18cd5cb168bff80362c03
+EBUILD libepoxy-1.5.1.ebuild 1204 BLAKE2B cbf59f6068940199775d67cc2b430c0c25106812c97928a07a76b52c1db540794048909789c5e35094317aa0e0019ef7494a00d5fc3036e7c0ab7e9fdb9494e4 SHA512 2569e13fc5aa1d274f33c5f0b76e9c1676274bf01e144df96327f75cd0fe7f2f39c0e0ea046514e459a09ddd136739ebee726028c23cdd2ed5b4fe4e77f7fb5d
 EBUILD libepoxy-9999.ebuild 1224 BLAKE2B 47604c61c6f4e9baa84e4eb5e87eea12141cb0c5fe139dba409a091306825bb32162e178c4a8ac22b06aadff6534ab0801ee1f7f8bcc9c6822515182a287337e SHA512 dd72815b8bf3d0aecc7c66ec49596dbf9bdf3aa855c6d7c469903829801b92e5ac4f8786fb12bb4e716908c3e53eac584bce7413a68227f7804127740e321f70
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.1.ebuild b/media-libs/libepoxy/libepoxy-1.5.1.ebuild
index 543d947443c4..a72f1f566fa1 100644
--- a/media-libs/libepoxy/libepoxy-1.5.1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index d2ccf7f0fb1a..f810a8088365 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2.ebuild 1591 BLAKE2B 586dc390d8e107123c3cf1686794597f04fbd6416f43b1a621fa8ff71f22ebd8865791fee358439f2a13cb2eedf2d6959cf0b94cb8ab429d80acad55dc2ae6bf SHA512 1c2242fb4be6295acf52a0b3b3e62d240f3c520e6ca320ddd43429d31de852cb8bec16d66cd3a9c3283f29cb353dcbc44dfa5cbea7145054334e658d72fe7954
+EBUILD libggi-2.2.2.ebuild 1537 BLAKE2B 53e329bf85c0b48810421a01d0bfe1318b2b359554a2da9cf1db70e0f694f8ef79a27fbbd21438f28123f789e0ef82fd85667b5b4c00d278ef7ee4048999d6fd SHA512 065164ff763594e84626095446fcc2c96fe2913e5412d2d41df8f2839ac27c954960e5097464799b5b75c21b56aebdb644c0b53359c7d08c3dbd752ab77c5485
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild
index 3bf50416b5cf..49ee65b7e717 100644
--- a/media-libs/libggi/libggi-2.2.2.ebuild
+++ b/media-libs/libggi/libggi-2.2.2.ebuild
@@ -20,9 +20,7 @@ RDEPEND=">=media-libs/libgii-1.0.2
 	svga? ( >=media-libs/svgalib-1.4.2 )
 	aalib? ( >=media-libs/aalib-1.2-r1 )"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86dgaproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 src_compile() {
 	local myconf=""
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 5758f3716f40..2e3a9f14232f 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,5 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1498 BLAKE2B d19c7c6d3adde3ead86466530b9272b0411437c4a8c3a51d93ef650c0cb3244fa0f7099efd7f61bc13593d91957d910fd5b762f74cf244738077976547b10b15 SHA512 10b9bfc142231e42207520d4184f588fec6ecec8ddd2363dc71685856157cc73d4d0a3c7f58b42a20bb02382ddeae1e8f75df25eef391945eb0b595a1e9f33a2
+EBUILD libmpeg2-0.5.1-r2.ebuild 1498 BLAKE2B 4653b884c8ff713d9f0668da4ba9adf98b619fa2ec5b9230abb5637c2bb5d3083e0d0e6ea336e7b91a25c2d6c39c51eab7753a65db13d0f732937033dcc8115f SHA512 246df2fc5c129fdfcb7967412ae282ec798b63861a26a64dda5d6285e2972033813f85ab323e39ec0330b38900dedb59104b5e3fecda8c061f83da664cfe741b
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index 0404b4793fc8..a894b9e8eea8 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.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
@@ -22,7 +22,7 @@ RDEPEND="sdl? ( media-libs/libsdl )
 		x11-libs/libXt
 	)"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index dcde315eb669..55710047d9b1 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -4,5 +4,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r2.ebuild 3887 BLAKE2B 6ec251c76e7e19b84a86dbb42509c0f349fd4617959df59f3237d6154ea7574298eec544f5de22697f1b9f9634f5ea98445a75a759419a350a857a6fe90d1fa2 SHA512 fe087d81f5b88ad1c73688e59da72684cd313db7f807e5095ce480a9c6e0725d16a9af1f15ba609c8ab04ce46840a6e495f86c6f5e8f79855d3fcef240365a67
+EBUILD libquicktime-1.2.4-r2.ebuild 3855 BLAKE2B a14612cc6aac547c5c645cee85bc5f8757123245b6c054e0c30d6eee5e87818c8a08b3010fccb3c1bbe91c88b049fff23c871f16c532239548540b85f17bd147 SHA512 289b95ef005c3a9895e2975abf084e74422f959b2b6816fa3e1815ce9fd249eefd8d3ec953677780fa78ca331afd2ce2ca736a8ce0dd5ad7a3f8847e01604dc8
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index f52066263bb0..ddb69d4245d5 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
-	X? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )"
+	X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="opengl? ( X )"
 
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 31380f0e3845..f14b7a9627f0 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380b
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4269 BLAKE2B 24099aeb0213b5d58d8a729e33a939e0ae25e75d9892692ede6301c8de819d8ba56cffb4e40afae87f71b60be11081eb541408843f3382295f2943904a7aa622 SHA512 4df8c3e8df59bb42794d57cdaf53bfb30e308064da9474ac9d9419f41073ae7e8fb171afa7ca2f2f2834913e73893190ea1406a8a267ef29fc40199ddf5ff211
+EBUILD libsdl-1.2.15-r9.ebuild 4105 BLAKE2B 2fa64a8dd91478257ed9d5adca4aa7753c389f5f586a5ef86c0c4ebede43a1d2af9cf466a1c139dc94584ce75035299da6c5e6179e3776db34f941e7000c3224 SHA512 4ece1e8dddb187b3b4bebc6edda9c95b94923006b90cdc4a2e5c2f731bd3139bcbf33f24bea08f63158faa06a9353a036fb7789f3855125450f70b843ec3def9
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index 9adcccf9a4b9..f5679f595b96 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.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
@@ -39,14 +39,8 @@ RDEPEND="
 	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	nas? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
+	nas? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )
 	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
 
 S=${WORKDIR}/SDL-${PV}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 0fdd488d0fb2..84dba5d30d38 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -3,7 +3,7 @@ AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25e
 AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81
 DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
-EBUILD libsdl2-2.0.4.ebuild 4724 BLAKE2B 81b738d8d00280008bc2e764e07210847ed765c4867ed8b2e071c8bbe16ddc250c9600afe30b4c9c2941e56eaa81249e6e8f872f6d15c7c47cdcde81342d683f SHA512 a02673ae1dd84a173d9479ccc572470484666f429fa36a4a2c4cc39bcc21e93b1691ce51cbc012d1c06c1e9cf073e7d694b77f25b1b9a229e5ea719c1c835254
-EBUILD libsdl2-2.0.8-r1.ebuild 4828 BLAKE2B 83bb97994c1cfed4e2c09640b97348fd14020a490728229c9cfbf0a309076f10c3fd35cdbef6c9ab01651004e3a3d2b61ac25db31b4ab77972192ccdb6205169 SHA512 4aacb457c897cc1f31999bd6d4c843cc1223219646b1d1f61e4b97bfe5a5bd5e024c54f02835998a07c1d06043578d620537061e1807f3db43bc20b8efdf1999
-EBUILD libsdl2-2.0.8-r2.ebuild 4927 BLAKE2B e8ec809c20a747986b32ec0521d18531a3175db628d65add66eaa029ceb5ce5dc63b665a4b853a7ac2e82c497516ef814924db25a8469a5dcd44a0f3f5ce6d0e SHA512 a86bac0a56feea6f2341361a3f3e338cb7ae19ff444a42774e4d394fb4c1c97c97a09aae383a11fbe5915edf26755da4acc24ec844511bf97de409b662499843
+EBUILD libsdl2-2.0.4.ebuild 4642 BLAKE2B 4076b8040962f3640151a53798ed20baba3bb07e8a607191f76a0cc7fc1015fb8fca6b11184403d798819dae2b3b963d5aef21732b5092c8e4497bc2fa4d1f50 SHA512 a83ffe2f864f559c359b9315f50b82735ccbf246719b5598482a85afd3000ee52a261c17076dbde86078f31a8f7f46a22ac8d2891635d287f71e83715c8a4452
+EBUILD libsdl2-2.0.8-r1.ebuild 4746 BLAKE2B 549664df04ed88438d9a819e04a2ecfc04a4f31bf7bb0cdb74057420dc86e85fcb1a239b6d417503b1f769c03c5a5cb9c19fc3a6861437b83c55ddf44f82e153 SHA512 7094310edb9f19b367f8a449fe45895b5be91c8425f2bdf481bb985e4502847c32b62b67b76a7f78920b95b837a4a3a0be3a7aa1ca26f510f3c84ba1ce5c2b81
+EBUILD libsdl2-2.0.8-r2.ebuild 4845 BLAKE2B 887338bceb766becec09ac65ea1accf67dac9eaf32abcb57e9f22b5c7736c317685513728a4bdc5b0b5691a3853a65d83ed959fefca615fc59fd0366c06dfc75 SHA512 493524f7b36713426fe1d1543a2fdb3080e052266f074d8034b3bd3c28a6bba3cba52191c11dba93da8a50fa2483ad6ddc34fac73ce6f1a331b3d0e8689c74ed
 MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
index 64d505347c66..e3a0c12691c3 100644
--- a/media-libs/libsdl2/libsdl2-2.0.4.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
@@ -57,10 +57,7 @@ RDEPEND="
 		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	)"
 DEPEND="${RDEPEND}
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
+	X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index 8ee6ce877f35..dc0b149e259b 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -55,10 +55,7 @@ RDEPEND="
 		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	)"
 DEPEND="${RDEPEND}
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
+	X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index 0690eaf5b399..e94f3842e77f 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -55,10 +55,7 @@ RDEPEND="
 		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	)"
 DEPEND="${RDEPEND}
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
+	X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index f7db14382fa2..a8e9315ff571 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -10,6 +10,6 @@ AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3
 AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
 DIST mediastreamer-2.8.2.tar.gz 882966 BLAKE2B f025bbfdf8e5940fd7e185df687f4d53c4416afea0e0c237ed63bd289cea0a34643945f625881d90564f025e311ecae317114e44ffe81484ecbb2edc653cf8f4 SHA512 2041d9fbba0f831aea6bdd3259b21742a37cfdbdf473b0bc4f20bd730371395ddf2866804ae496e9864adf5fcd0d24e03193d5d8feadd54e6ff0b3adda01ff60
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
-EBUILD mediastreamer-2.8.2.ebuild 3824 BLAKE2B ad844e6ca0b7d3c7432fd8a6110487c84b5d67d15c387953deb35cfcc9123320281e04f9f337a0a62602635beff62aeb28b593dab8a10a96538d3e53ae6b6ee1 SHA512 9336b58a8b0ef34d58ee9f3d37cb40911e25a5c1979bbf9507370f3d9018de5c13833d8cfbaeb3482810bf1c9d366a0541ea576c345af5837fc4e4ca9d0579c1
-EBUILD mediastreamer-2.9.0-r2.ebuild 4632 BLAKE2B a3e4859766821fe9936ad23368ec9ab1250fc0db207a358d2b5eb2357894a2e05e9f9bb2152ed1fd45933a7cc2e5ae70438faa14ceac28022008c4642c14588e SHA512 6c57cdb71150764b6106777414c0319d2735536010dacec88800331dbbc14c0359e4fc015967c05bad35cf1a05bcc9954cc588726bcb4336768d6ae73be76821
+EBUILD mediastreamer-2.8.2.ebuild 3823 BLAKE2B 4c6b6935227bf511c28928e1afc0e9d8f1d40737fc68a50cc59fe9516c80c8fad5362f3dc80f11229c3c3d6fc132cb87b2e84beba11d6f955161ca30044d518a SHA512 999c46ef8f9b5de7a7fa8f2625ae1f0b826f191117b0bf1f2e9a76d341ed30b3c3f65396e5bbe0329f9f2f18e8e30084ed4e97735e198e3ee4360fa09571029c
+EBUILD mediastreamer-2.9.0-r2.ebuild 4631 BLAKE2B 25462c1ef45ee9e5aa2aa20a1736ca44a59d5220381ea9adc7c99e1e23c65d3b3b82f8710c0f44cf12e4363d91b484d434769edc297ef6f3817955a0bac14d09 SHA512 096d19166bdd2b0c63786563fc5fc1ecb012e0d12e5a6343dcc6b494486a32c2d20335842edab8bcd3f43a5dee4eaa8086f18d7d0828a6af5e3c6ff22a5a4af3
 MISC metadata.xml 934 BLAKE2B 2e1402da227d8892f2a2e739510ab4b81e2588bb057479976ddfe917a08d4248a3d7c4c286b4a5367b703557b799df57049a42baa46bd6c5fe1058a9466941fe SHA512 8cf01a51dd7bafcbd4ca39c49deacd38104d9640ed26ceab65e3f96ebb9e9be6caed8e8e0a3813946365fd6400141fac0481e3d29d59cef1625f132a81b2eddd
diff --git a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
index 2b029f159483..6be02060bb7c 100644
--- a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -43,7 +43,7 @@ RDEPEND=">=net-libs/ortp-0.17[ipv6?]
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	x11-proto/videoproto
+	x11-base/xorg-proto
 	doc? ( app-doc/doxygen )"
 
 PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index 59f335c92f54..b86f9ade9547 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( >=dev-util/cunit-2.1_p2[ncurses] )
 	video? ( dev-util/xxdi )
-	X? ( x11-proto/videoproto )
+	X? ( x11-base/xorg-proto )
 "
 PDEPEND="
 	amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b6108fd836d4..f7c24248aca7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,9 +3,11 @@ DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25
 DIST mesa-18.0.2.tar.xz 10949364 BLAKE2B 8b0557db70f61ac39df96e923383e41008f483ae2f89b3723e94e644cb2ced81a7996d61009acaebaf7813843742a24351a573c80f1173615e6c0302552cf621 SHA512 77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e
 DIST mesa-18.0.3.tar.xz 10922936 BLAKE2B 7281579b39b3fcff7fbe56576c1345954f47f42edaceea2ee02d99f3fd704704bfdcfd698ae78c4756df16acac9f0a297a3248e46e2c2aca61d7291df7b0b521 SHA512 decd050bab049d17bcde3f832d4da0ffdb80f147c99377a162739bbe72fd6fd32b51e56e6fc66895b8c30fc19a1815bae164b21aa557816c3998ad18c1ffca2d
 DIST mesa-18.1.0-rc3.tar.xz 11121648 BLAKE2B ad36da5de124cf1d7d785e26a3b9ac6cad492313d342e011d29b2c6bbb96e3af2fe377f0f6857743696ef056e7e80ec9eb4bde60a8510dfbdaa060802d5b4aff SHA512 aae834672ce2ce28c9223626019b7ade5908919e9c2423ded070b215248b502dc1cc24e5c12527e28ae23ddce0b37e69c5d777ff923143c273f0a775ee215fc0
-EBUILD mesa-17.3.9.ebuild 14837 BLAKE2B 7ad0078d67f20badfc42bb8da629affd31c45314a733bb1628ad13017d9d4c50c11696b540b6bf6eb86ba1ae2de4b4eeb46a7e1f2f1c0b664c0bd4076f5deb5c SHA512 12fe1a22f0cc238a67262ed15da0c52706666847cd6483a855a6e17b089e1bdb72feeedc7021f0eafc420b689eee59448ab78fb7cc9056ba3aaf6c15a683cdba
-EBUILD mesa-18.0.2.ebuild 14889 BLAKE2B 6451b69e15a9d5b92bcd2eb9137fdc41ec3c6206c77c7cf1bd9b00849b2a625114e593f74117a950a028b6a8baf96e3c32966f362ae8073ddcdf1a385f9822db SHA512 191befc6f75488eac2f94404fd6fe87f1dd6f12dd51c562a02f7a29fa54c47bfe242cadb200393c384cdf50c7d781f7c9ea886a68cf5dc56ca940b2f51f8f764
+DIST mesa-18.1.0-rc4.tar.xz 11118452 BLAKE2B 4f38f8b77650077244f91ab688a93eb4827961e1b34e6376c63fce43be2b73239e77086dc9fb91c7cbc9f748287402463b24bd2b4da841e905452e34d7da6f84 SHA512 5a00e12cf588a7ea165b096d67d36d53899d6fea9922e6c09eb6fc3acc99a004e0baf3af06277c920e14f4c9685af7d5e4ee6096d9a8c1bc3a6456775af57d23
+EBUILD mesa-17.3.9.ebuild 14426 BLAKE2B 1b6e0152cae7d03daff8c214d5ba17e2e320d8f989c8ade3b1c146bfe6d3da14540cf43a78b244d855acc709f9a464d0362ce145fc51ae0b6b3bd24f75c7964e SHA512 dd5f69042a0432a4b820ecd5263c8269956b6e2063e95f645d1b845d744d322d348c67d6aa017666c0694f38e03cda1609e1dc507107328255363700a2796ce3
+EBUILD mesa-18.0.2.ebuild 14478 BLAKE2B 24f32dd26529183baf2d2455b63ccc9e1d0da7e81c0071e979994edce639a80e7a639f97699aec2df07ae88b5102b84de4f222b0731a8942421f367f92712584 SHA512 b2df6fe2cbc5d2fdd2792f0b3e5a839baa0a127517d138aea040bc37b5e4469c4d525238e0eadfc56295688338f3a90f53f9e8f132bcb9dabfb01eb1e8672954
 EBUILD mesa-18.0.3.ebuild 14381 BLAKE2B d96d38ef80c12c0e9b11ce47a85fa4b3a0c4b384909b925100415d294b5b7a71b3c88669c819f212fcf768c14f1b5efbe51bc7963e9e80cbaebc6378c1158567 SHA512 8b921bed35cd1005bceb0b05855a0043e556b2353fb66bb2bef42e826a0da44719aace06d57f494dce1435fbe947a25e65c39e285bfc63d90a832b7aa76fcbeb
 EBUILD mesa-18.1.0_rc3.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847
+EBUILD mesa-18.1.0_rc4.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847
 EBUILD mesa-9999.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index c1821f5ec1b9..378c8541a722 100644
--- a/media-libs/mesa/mesa-17.3.9.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -76,7 +76,6 @@ REQUIRED_USE="
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-# keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
 	!<x11-base/xorg-server-1.7
@@ -222,15 +221,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
 	vulkan? (
 		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
 	)
diff --git a/media-libs/mesa/mesa-18.0.2.ebuild b/media-libs/mesa/mesa-18.0.2.ebuild
index 6cdc82a5cc3e..874ec0c25836 100644
--- a/media-libs/mesa/mesa-18.0.2.ebuild
+++ b/media-libs/mesa/mesa-18.0.2.ebuild
@@ -76,7 +76,6 @@ REQUIRED_USE="
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
-# keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
 	!<x11-base/xorg-server-1.7
@@ -222,15 +221,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
 	vulkan? (
 		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
 	)
diff --git a/media-libs/mesa/mesa-18.1.0_rc4.ebuild b/media-libs/mesa/mesa-18.1.0_rc4.ebuild
new file mode 100644
index 000000000000..cf00b47b8bc8
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.0_rc4.ebuild
@@ -0,0 +1,572 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ $PV == 9999 ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
+RDEPEND="
+	classic? ( app-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 422be2fac2b8..4036bda541cf 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -3,7 +3,7 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r1.ebuild 2316 BLAKE2B a211cc31f9ad20d0c34322eb503faea164f7731452534886aba2cc7055f16c7371eb98fb6eaf2a2986eb288048e236fbaf8c26331527ba4a799e6cb3cf8271ff SHA512 f44ce492d9d04b17beaf8f81f0eee3a319da52ea76b91738151d5dec307822a1c8f666b7fb0d5a0a85e1db47f1a975bb56e4be12d98d09ad646c8b45e1932342
-EBUILD nas-1.9.4-r2.ebuild 2426 BLAKE2B d379bd93e15c92aa1dbf403c4105e2f062ddd3c4676063473b9c8726aa69a0b5af04cfe32ca911829df4f39a3f12eab880c3032a8a82829bfb1003da6e47eb72 SHA512 8961ed470b03406ed8ebaf9de5cb7a383f1f589ff8dcb1db710ad350ed33a8ef3dad5c2c72a6f6532e2c36bc50f7fe0ab0cddf5c7fa15a282bc36e89b5bf88dc
-EBUILD nas-1.9.4.ebuild 2260 BLAKE2B b802d170d9948d1e8a8725d007d1843679a588d03c28939bce6387e3c1ca95a8deb96e52729b4d6139baa1e28f086d6f8f3bcafb729a40b180454c14e77329d4 SHA512 89965044fa4d8e9d03c68fbe2b6bcd0bcba4dde3be88a6f5abe622e17a2c0111f6820b1fc7aaf9e2b644e76e75483f609a192fb420b214f465c753b532986a3d
+EBUILD nas-1.9.4-r1.ebuild 2290 BLAKE2B 5b7430bf135bff1254da018c4d430be7a064a021563789fc1c4ad95e8a67fded25c57b4ea310eacb05228575019f65466bcdf0f2fd4710d0dd5241386f0f76cc SHA512 db3dce97cbebeb460f7bde498526cf4b5a0554aca02458fa7a9030e968ff2d59b8d9110e8694cd446276c73f5e53fb2f35b981c2b59c6c6bb5de4e8cf8401187
+EBUILD nas-1.9.4-r2.ebuild 2400 BLAKE2B 3beb32f3da7b45b6d758f971e0f90e20841037b6fa78fa5cf34c01c87e70e1e92002fc23e42e272e5112b34c57a36ab59c9a5bb304667fd66e2f341f9d4773fe SHA512 6e9997c03681b545e040b92cb6438cfda3acb1fb675b5a7eb35e1f6d012f427de8d65b3102b7bafced8642c9442d7eb2e559d0f54dad3c10107ed9e14ab360fb
+EBUILD nas-1.9.4.ebuild 2234 BLAKE2B 67b5e2f22991ea8418c40947790fddb5ac3b33edbe950d533bb5450b2e9bdba47f2a4a5bb7bf330390d7b970a31d988c3984985cd6fb0d405127d95feebfcb45 SHA512 312cb7a453b619d8d1cd95d347a145305d5033f9c7e25ce1c5dad0266bbc937af1dba5a571c270b0039f87cdddedab46c2007e18a2546476cd689553851938b5
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild
index 61931b3908bd..b32a29ee5f5a 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,9 +26,9 @@ DEPEND="${RDEPEND}
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+	x11-misc/imake"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index dd390c7ea581..f1d536a4f7b9 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-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
@@ -26,9 +26,9 @@ DEPEND="${RDEPEND}
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+	x11-misc/imake"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
diff --git a/media-libs/nas/nas-1.9.4.ebuild b/media-libs/nas/nas-1.9.4.ebuild
index a25f104c28aa..b4d725430ae5 100644
--- a/media-libs/nas/nas-1.9.4.ebuild
+++ b/media-libs/nas/nas-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,9 +26,9 @@ DEPEND="${RDEPEND}
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+	x11-misc/imake"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 26dfd8f80e79..12ebe9646d91 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -6,5 +6,5 @@ AUX urt-3.1b-rle-fixes.patch 5072 BLAKE2B ebaf3c54ccb83fff9884cf80b6fef719ee6337
 AUX urt-3.1b-solaris.patch 277 BLAKE2B 6f7541f8f7de18b332c2e0a8189269158ae0a7710c02dde6bef6568cbbe320ff628aafbde37c0672f29a696180264e56ffa2c58a411798d6dbe3b93bc0178f7c SHA512 871ff71abd69473b23e133aa01868803a4c6776828ae80761b4215648605c6b18fee7fb4c6948963bb1705c51476b4de30f89221fe5240aca6f6c90399b439c6
 AUX urt-3.1b-tempfile.patch 593 BLAKE2B eef5868c8499b399dadea82284bb25f0df636cfafe3849d68fbf0821e663122c5944a4fdd30429628551c30e57517f4e1fff907e76c2d63128d1ea70e7210def SHA512 d456b7219a3d7986698f8f4f7b75c6b10c5b4d9fb5ef1491ec3e85e4263832f24514d187f31a5c76c747dd9381cb7a6be94b1c2147153e774c70dec7b5ca1b11
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B d37a998327927d789b0da1aa6da6d697e6ada94bf6ccf35eadd537c3ef9e93806db985026682d78e6735d235e70aafb5ab8de9a267785b001015eed05f7f92be SHA512 b0c317132fc4e715a95cd99c8b321cfeefbe3d60141c1e9b49941d1fe1873f65f12d0f2717b5cf9604f3efa561495e16f97d5d3cbdebe46d7a6ffa014d709bbd
+EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index d25337bcbd08..710fd2e1797e 100644
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-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="5"
@@ -19,7 +19,7 @@ RDEPEND="X? ( x11-libs/libXext )
 	tiff? ( media-libs/tiff )
 	postscript? ( app-text/ghostscript-gpl )"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 S=${WORKDIR}
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index da22feeadb4e..0e9761daa6d8 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,7 +4,7 @@ AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d0666
 AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0
 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
-EBUILD xine-lib-1.2.9-r1.ebuild 5497 BLAKE2B aaba38e048f06472cd2aea6f0b46fc7b7210016caebf45d31699fb11fb82b2d228db1d5f8ec2a8bc24ee6c6bd17b25f90b664a15f8c03cfc24169ce40eae49b4 SHA512 da46ba5be24111bc6ff5102db146d419849b606d14b8e265e1c19700f0724d1c2282aaa376d392ed2a35fb00441fbce3ba883eb52275b7218c223492f52330b7
-EBUILD xine-lib-1.2.9999.ebuild 5385 BLAKE2B 5be07886ffa9a495a74ecb5c8ba77ac1fb833260a22b17423651ad84ab560111cf9959e67b4e8e5a349e8724cbc51de9bea444e62ac1303b6eced26eee742bbf SHA512 312298cf43fe939a7cdfa489677445dcd04b8be19c94d8ac35132f82c450ca679c3b4a3369ea32937a15c68f21d6de4e38f858b5fd015308fd4c3feed3a708c2
+EBUILD xine-lib-1.2.6-r2.ebuild 5694 BLAKE2B 473dd0c0d65f95058a3969a831644dd7e0defc70c9967d20d592f33f271b99bd5d4798ec64b27faf20e573192c6c7524edacdc196bd362f7802c21e4b52942de SHA512 f58713c55b90f387be0ba956cba82fb93bf2e895e02dbe010b16126d9325c889f7d27a253d54f65a193ab1881bebedd5ac8be968144a907678727c4b10b9cc80
+EBUILD xine-lib-1.2.9-r1.ebuild 5465 BLAKE2B 228635a52f9a391bfdefab38040eed72941bf7d3a01d5169fec82eab24c8ba1788856bda2c8c2746fd8143863d5df5da575035dc01b091c50f3d69d05e1eaaf5 SHA512 7bebed6e02042ecb0a22ad8fd73ecb42a7b38e84ef61d5cdd84264437121e86201404975e6a877aa234a2f7dfd755bf529a4a1b45d9ace33fcb30b003f49ee60
+EBUILD xine-lib-1.2.9999.ebuild 5353 BLAKE2B cd2702c8604e9b9ec7cb0eba1df213df2860ae2a7f6a5404cd10ec20b819433e5fa6bfb45ce3f987c9323a44e71005c29008c12bad1c0711e03853b700c70412 SHA512 287424631d94d2f05e50bba16b53069a00aa28ae205e2b46514e8d4aea6800748c0710bc1755c0d8d007be3ab3af4ecafca537c9f9ead7c063ebce3168fe3b34
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild
index 46fdc6533c60..085547073ef7 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-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
@@ -104,13 +104,12 @@ DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
+		x11-base/xorg-proto
 		x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
 		)
-	xv? ( x11-proto/videoproto )
-	xvmc? ( x11-proto/videoproto )
-	xinerama? ( x11-proto/xineramaproto )"
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )"
 REQUIRED_USE="vidix? ( || ( X fbcon ) )
 	xv? ( X )
 	xinerama? ( X )"
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index b3fd25d6f7a1..8b7764e24710 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -103,13 +103,12 @@ DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
+		x11-base/xorg-proto
 		x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
 		)
-	xv? ( x11-proto/videoproto )
-	xvmc? ( x11-proto/videoproto )
-	xinerama? ( x11-proto/xineramaproto )"
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )"
 REQUIRED_USE="vidix? ( || ( X fbcon ) )
 	xv? ( X )
 	xinerama? ( X )"
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 7938ae7f0b18..053e16e28383 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -103,13 +103,12 @@ DEPEND="${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
+		x11-base/xorg-proto
 		x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
 		)
-	xv? ( x11-proto/videoproto )
-	xvmc? ( x11-proto/videoproto )
-	xinerama? ( x11-proto/xineramaproto )"
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )"
 REQUIRED_USE="vidix? ( || ( X fbcon ) )
 	xv? ( X )
 	xinerama? ( X )"
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-13 16:38:56 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-13 16:38:56 +0100
commit	ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (patch)
tree	2fdc433d571e3ead010876d43ce2646b7d783680 /media-libs
parent	88ebe56470c37b02a044e1091cad6b2df0f3be8f (diff)