gentoo resync : 13.05.2018

23 files changed, 36 insertions, 47 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4cbe7b944a14..9fb62ee08c0a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsamixer-app/Manifest b/media-sound/alsamixer-app/Manifest
index 0d6711c9ff2e..6dbd88a7de75 100644
--- a/media-sound/alsamixer-app/Manifest
+++ b/media-sound/alsamixer-app/Manifest
@@ -1,4 +1,4 @@
 AUX alsamixer-app-0.1-Makefile.patch 964 BLAKE2B e6f1bfeee8f41002c9652c3a729c8d3ea1e09580bd1193459bf18900a5d4677654482321bfd109ca300fe7e2d391449c9a56789555d26d5003a3da373c24e6d8 SHA512 105ef485de8339760608f9b95ff9ffc5059deff3f63d02c5ab4a82e7957e9cf52e878a35a06d58e5e4ed6bb73e074c22f977ec68afb8ab11703690e67c541a2f
 DIST AlsaMixer.app-0.1.tar.gz 26939 BLAKE2B f581aedc043c12bcbf43014b04fa92614b0acc8e49802bdb87ec550fdf2649a7ceb902e01b4ed7c2fc038a1a396a7ad6169e0d418c55df91733038a7bcb524c1 SHA512 48f741c578b51a10d2bcaac375be07d9c2ed705c876fa17d69565b41ade6dc28e72af1509b7d817b452199e8ad60f4e24b78565c134b90ac7f29623b89765e24
-EBUILD alsamixer-app-0.1.ebuild 772 BLAKE2B e4e62488e535407d27ee436b3d2788b84411ac910b43b5fd60a9e10c9a60e520bc68a7b94337d53d64a1df732a08f820bb52ec8d4c1ada62cb6cd588c147338f SHA512 0b879808d32189785fb5c35c9a03cde41d5c08051f7376cd0babea5e54af47c4d8ec179b9d5c611e90e1e80eebe312c2ef3d2c550673fbf156e44bd19fb10443
+EBUILD alsamixer-app-0.1.ebuild 772 BLAKE2B 82e0faf7682f837775a22628445c8ebe09eefe3fa878d3d8fc3fead66054aed644ada032073a54e943ea9cb25c16a4abb7be40ab8917264d5d90931807e1466a SHA512 757f6fb3113cd4e4336ce7b23eb19e33f182f3d6471ddacb97c18bfb3946e42396f28d9ea9aa722762cd1fd98d188782b1c4329619ec7145cbf8453ab6673923
 MISC metadata.xml 360 BLAKE2B 77601ae25e278b9d7941342cf3e4f5bdcd30a17d7d61c3bd9476a7ed2f16e89434999b59f77518af2938120fdc4565eca01eb6d7a12f1f500bfc37e82ee1df0d SHA512 94dbf40a7a9a38902608e108dedc3c6667e436e7b04c00a7bb4bc9d90d05a88e2f3275facf275709c181a9650f954d31fb97a5c24bd775cdd2277bfe4f84bae1
diff --git a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
index cb7082f7b1e8..47b54c20984a 100644
--- a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
+++ b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	media-libs/alsa-lib"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 865c54390fec..002559d3206e 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -3,6 +3,6 @@ AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8
 AUX bristol-0.60.9-cflags.patch 553 BLAKE2B be5f096b1627d15d90b2c915e45e4f9112d41ff29bcc7121141c91928724af4fec0bc78a85ca79f5f398c4c304fb41f61cb41fcbfd84bae80a31bc2a1f6a89c2 SHA512 a687832402925cf596fdc563496607dd366bb6bd0f0ca6873ab28053eb6f03a164308cbcb2a9da3acce199610b225b3581e2dc3dab723693a57a1498aa32c4f3
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
 DIST bristol-0.60.9.tar.gz 4323706 BLAKE2B 39c9a834ba9411f7a434dbc8db8630dd0200c25e645a315b57f1ed8626c816b42da6b5473ff882a01f766ed10240cf7bce98d3091be5c2a8e16c4af0cd6afd5f SHA512 216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff
-EBUILD bristol-0.60.11.ebuild 1077 BLAKE2B 6ffcf6e9d75d4eef54ac9a4783a99475c7204f3dd261625ed1bc29c49a7ddca5a565fa2d625ac9fb0c0264e4462a7c6693209b5747f5f7c920de439e323488da SHA512 b980fcd0c402a44360fca7192f20128fde81827984bda8d55371cfe67f86fb6499aef2a57d8586f8458d93b20697f7a19b00d8d5afd4f8ba581969b385cf7e46
-EBUILD bristol-0.60.9.ebuild 1022 BLAKE2B 5a123574d485c4480fd8895d7a498157a4af54b617bf6582a99549c0defbb699dcbb334477c5fe21289b6950d949ea51a99faaf1e3706fb1c199c2c2f5ed2190 SHA512 10764e2d9d328295a8b3b58f90ebbc869886c3478c8f6a1f94f7969bf5956d5bad8cf115b4497d2ecfc408551874e8acf31b74940dd4c829759794608470f9b6
+EBUILD bristol-0.60.11.ebuild 1080 BLAKE2B f12711b0229ea0a2521e38751900c22837609d96de5a1ae5995b4f99d5b7a6cb62964de14f7a47878e87272b6bfb217f01c434ee327decfdd65f544311b878f2 SHA512 9e5066243a226662bc0909e8336365d46422f94104783db4455edaf3a1708a97606429f6c5e215a989ca94605e1c710ed2f57a1a3a322f38c0c0052d7a39ea13
+EBUILD bristol-0.60.9.ebuild 1025 BLAKE2B 26bc547f9f90b14e036d6eca5518145cab2a67dacba5ab41c1e7efbe74e2d3f01f87ea80b6df0e0c1300e371a966841614b7dd5e0910353e18c849965457134e SHA512 21c3632efc9d820b1f6fd5277117c59d03d941767e67710845eb7913dd49ed2a4d295b282b7ecadf735a559988b5fe87835604cb087bbf08d10c434e86b2f8e4
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11.ebuild
index 70e8fdeb0cdc..a5df5a182405 100644
--- a/media-sound/bristol/bristol-0.60.11.ebuild
+++ b/media-sound/bristol/bristol-0.60.11.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=5
@@ -22,8 +22,8 @@ RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
 	x11-libs/libX11"
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
 
diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild
index 84cc501d0363..1b2744c0bfc8 100644
--- a/media-sound/bristol/bristol-0.60.9.ebuild
+++ b/media-sound/bristol/bristol-0.60.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -21,8 +21,8 @@ RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
 	x11-libs/libX11"
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
 
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index a981cf9e50db..ae00b3298c45 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,4 +1,4 @@
 AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
 DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
-EBUILD mup-6.6.ebuild 902 BLAKE2B f364d62ab4d9058c7fe1da69dcbdd3fef7f8ef5e8904f8633831e216e9d93915fb97dacec518f41f5a0e3fd06da5b8193693a6a373ecb1998d1eec0ba58430f1 SHA512 c39de5f32cbe018e3bea77f61d120e43ed64184f075c3479c919cca0c2b2cb2afc6cd33744e364c4f763ab717b1377e3173e4abc0b33867b30d8cda05869775b
+EBUILD mup-6.6.ebuild 905 BLAKE2B f3b807f60097085b05c04689fda392c2b1967ac604cd6884ead3a27356785f58ec78881191b02376af667b24f38cffeceb2e1a04036fdf2099dcf29d279bb68f SHA512 140c359ef8440ee3e88a25fb83f5004f3610abb4ee6bfbf5fcc2f9cca08e4ceb0fd3fdc27675571c34bf77789b0ea4c94d3a667dd09190130ccab7e579cdca02
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
index 19665203aa80..2647e954d2c2 100644
--- a/media-sound/mup/mup-6.6.ebuild
+++ b/media-sound/mup/mup-6.6.ebuild
@@ -21,7 +21,7 @@ RDEPEND="x11-libs/libX11
 	virtual/jpeg:0
 	media-libs/libpng:0="
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
diff --git a/media-sound/playmidi/Manifest b/media-sound/playmidi/Manifest
index b59859aa1930..5e72ff02aeaa 100644
--- a/media-sound/playmidi/Manifest
+++ b/media-sound/playmidi/Manifest
@@ -2,5 +2,5 @@ AUX CAN-2005-0020.patch 2512 BLAKE2B 097dd8cc621e33beb82e4cf8a7595adcea9c7328321
 AUX playmidi-2.5-includes.patch 2365 BLAKE2B 30a635afa0b515ef79cb93561f8acc51832097fdf324c1c4dc43cf1660df481066746f7780425d143374d69b56085144a09da7be7fcf31c8a253bef8497ac2a3 SHA512 d02a17ebda6b39ca938195bcebd385b63cea41e3a7448fcd8d7d9f547013d828f44dab4eb5fe1da08ddaa369b4b11faa2add22f76e0df3a646dd03fbbfbe7ed0
 AUX playmidi-2.5.patch 773 BLAKE2B 8f24518f55bc70350eb566752fe0931c9518a144cfc1ee3d25da9edea599d250781352a2148bab517cbb726153f741706890e6a1bc5f615fbd7bf1c4278981b8 SHA512 72914298cc9a54f4c596a69031f5b02b0155f6b9c68c1ad214e81b478a973250a26c7697b714f9f6b8490784febfd688ea5a603d8175c381b5fa2d02e8fbd42d
 DIST playmidi-2.5.tar.gz 147687 BLAKE2B 2f59f2f25672dd50ee4b142221c8dbf708b7210931bcca148a98892ee0865a57b0525ba9af3620fa405b45ee8d3df867aa65ba72611d2034d80b407003ba9b1d SHA512 246885e17c89469ed10ded2ccf47ac8b89396458315faf26e312ec0bfc2613ebf97c3634e0ec220d87e3ddaefe7291d1fb4d16bd99e32f18a053d2dcdbe1629b
-EBUILD playmidi-2.5-r2.ebuild 1254 BLAKE2B d2ece17c2c424cc9388153e487b49ccfcc7386fd73350b16d62c1bdbf554590c6cfe6dd565922c96e9c0a32ef567cb1aaee067015e54dba61de949b0652a9761 SHA512 e02e181f289b62281913656f8d261d25914619ac05e087478673f9c5ce93037c49edfaa88e6496385f114134dc54c0cbdf53697affa4884a542b4cedc24445b9
+EBUILD playmidi-2.5-r2.ebuild 1254 BLAKE2B 0f723b234985f450cd0ce47dc88bfe7dc74684417f4c5dea9f195915ab51158509f989d265619b4a24827481180142e9587889300d193cb5fc44cf9430c8e1a2 SHA512 92422078b23850cf62b24fd8fda298b684423a0cf68daffb82c5209b201d1be9a072469456a725dd974500c9d3cf18e55660f2ba3e0c2b53326ef94dc01d0de6
 MISC metadata.xml 331 BLAKE2B cbd40c088c9dac4e86aff130ad42103d68ec5c6e91692028089228677a6830c0720f6415b27a2fb2d448b3676dbe62b6efd992a0f4d8673a47453e52f9330c0b SHA512 b3c5e539cd9a23bc7e5544d014f09f25eb7c68fb23df7b91a24215286c305c1289641d718fdb957197ee160df5d36997baa44e936f7268fe5a01d4c3cf2ca6db
diff --git a/media-sound/playmidi/playmidi-2.5-r2.ebuild b/media-sound/playmidi/playmidi-2.5-r2.ebuild
index a0ed1dae4518..a1bcd8e8f0c0 100644
--- a/media-sound/playmidi/playmidi-2.5-r2.ebuild
+++ b/media-sound/playmidi/playmidi-2.5-r2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libSM
 		x11-libs/libXaw )"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto )"
+	X? ( x11-base/xorg-proto )"
 
 S="${WORKDIR}/${P/2.5/2.4}"
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 89dcf8e133b2..29c3536db7d7 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -3,5 +3,5 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
-EBUILD pulseaudio-11.1.ebuild 10867 BLAKE2B d1c1809a13ef120fcbe67fff974a93a76de720c3dfba078235ae11822fc58e2c5fe528c96630d960ee645c3d261a20999c240eec9fd4d43291baea8aa5777ee1 SHA512 3289fc2590443eb0562a92c6ce85bcd9c8523ac2953a140974c4ef9e7e8f02b0e960fe58b81a2e2008963e2ebd3bdff3f2fc7b6c2ba1bd143074849348c3eb5b
+EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672490aed122a71887746ac9ca4554a96cddaf7eec8ae9b7ed91b3fa72a1caab541c95fe53a7117b4a93e8d9c982274 SHA512 88584bc0f38e6bb559d913d92fa5b06370590f43eaa11ac59af4ea07739d6f6870165e0801655982a11ff4f42e44de1b58962e5123f3d657cfcdf4727f04b0d0
 MISC metadata.xml 3415 BLAKE2B cb46d59d9af2a364730ebe48d9ee009659ba8c9b51c8da97c341151784dcb595cc7d6469dae20f5a5da2382d762a984e038077ce95840fcb8e4205b1f0fab06f SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
index 718125ed583f..05a7ad3d1780 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
@@ -90,7 +90,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( >=dev-libs/check-0.9.10 )
 	X? (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
 		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
 	)
 	dev-libs/libatomic_ops
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index b35763f4bc99..72f4d55aaef0 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,3 +1,3 @@
 DIST schismtracker-20120105.tar.bz2 1097124 BLAKE2B 978e4b3e81b5c9ed93132aeb12febc2add281060f41d74a52da25799d7ae291d2cbc2401619fd01bc7bba342049d4aef6ac0fbf326443b790c4704301a78a511 SHA512 5b92603af3b6add0e8bd6d0b140b0ddedbaf8e2b434f651ab887e3211ccc8bcfa94be281aabc3b28dbd84e3d91f539eb0939d6d4e0596529133db7ce10aeafd8
-EBUILD schismtracker-20120105.ebuild 1406 BLAKE2B bdade458aaded5df7ee1f399c34c01d7f5294880e585ac2697a22695c22e124ac3ab4ac2c510f981e07ae0ceb328f331af7cfbae7dd582573687c90e4faa2097 SHA512 edd74023adffd42d23b319251f73bca83672beb3b0f7b952aac50922faa8845c1686a388cdc7f8b3ac88b2a57cd7301610ce70485916561a2e0f6fcb83a4e58e
+EBUILD schismtracker-20120105.ebuild 1365 BLAKE2B 8386318c84c7cc74cd744dc8d64ac739e9d109c60626e27400eafce87147c99a7d706a5bfbf5c756ca777f30b3489678764d959380b7f9a5ab577a37460073f7 SHA512 aa012b9e698edfd9a460c80101e573ddc627efeaa2d5a8c65e2bf41600212f0c1dfb44da2f55a57ae7c4e940e187a98c8464ce8092f4de0b1c0bd4cfa827076d
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
index b64ae46f367d..14de37e0dfb3 100644
--- a/media-sound/schismtracker/schismtracker-20120105.ebuild
+++ b/media-sound/schismtracker/schismtracker-20120105.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=4
@@ -21,9 +21,7 @@ RDEPEND="media-libs/alsa-lib
 	x11-libs/libXxf86misc"
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	x11-proto/kbproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 DOCS="AUTHORS NEWS README TODO"
 
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest
index 2b0d74508522..f79a3c24e3e6 100644
--- a/media-sound/synaesthesia/Manifest
+++ b/media-sound/synaesthesia/Manifest
@@ -1,3 +1,3 @@
 DIST synaesthesia-2.4.tar.gz 259531 BLAKE2B 2ecf15a58793de77addb2dc2ab6d7640902c4a34838cff158d7bf9ce0ea5ee171cc205d2c8d9ee3a07d5434fd8e0e48f0cf1bf8c9d5b53de9cb9b70799cfc9c7 SHA512 e48f210f055486aa0a7c9a03f6aa7ff6a3292a2b598bfd8536dd592c3934b7672ed0b9b7dfc20427b5ea2b4cd1dcd6e104bf2c41f80ec38ab0b4b0a9497ff905
-EBUILD synaesthesia-2.4.ebuild 802 BLAKE2B 8666f0cb2292d10e387c1a4f2bc1d7a43465df238765acc3429453b3b345173638e6b7ace8b006b2891764cf7ed7208119f4b483bcdfd7b8c661e7b020ee45a9 SHA512 46c1fb2f8845964116398368336f6ebbe72cdfd721638defcd9fdf354bec01e11065b9347e8f797ee6ba5e2a675dc830f61656def12fb86fd60bdfda11f8a734
+EBUILD synaesthesia-2.4.ebuild 802 BLAKE2B 73d8da6940405aa6ed875555f4fa6b7dc4defaff8f8fd82538556c225a54dde1f28e62301fc4963aafccefef5569cbf6dd5b4c7f55815c2ff9bbfa62fde1d3f8 SHA512 dba5d9b72eb0aee4b314f01b34c3f8b667d0567768e25f430f784607f6f43fbf92416726b10301c1dc53b14eaa1dc1fa03a43b1e2f8a8f27ac6b61a0c7db8681
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
index d5c52c114d11..ade33b06d5b9 100644
--- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXext
 	sdl? ( >=media-libs/libsdl-1.2 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
 DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \
diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
index 0e1de7d5b671..dc085fc0ff95 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -1,5 +1,5 @@
 AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
-DIST TeamSpeak3-Client-linux_amd64-3.1.8.run 76052606 BLAKE2B 7d69c964b4d5adf2fd566fb6a0245e80cf93ca8f6a281ba41162fa87e23e9b072c4a2f73f7ffc7cf6d8050dc98bb62f1d735c7a9d04ea023e7834db320af04df SHA512 a3bb7ec87995ef61de3b010c3c125b6f1c05fc456966e7ac95b872a97cebcd2235204cd3d0bb9f9d32f66ae3b773467075f8e48650553541771b4216fbc5db89
-DIST TeamSpeak3-Client-linux_x86-3.1.8.run 75780927 BLAKE2B 1de77d23de56bf9530ae2eb124c4b6f1466a48d567ed0d37eaedbf26f7eb84cdb0822f92db9c0665d094b82022b436ec9f2f01ebcd92f3f604af16a8db2b0fc9 SHA512 b6fa5a9bc48cc71834b12b39f8746085419359875d00a07c238938e00c7bd837e6eb0da756c09593536a7036f5b2bc2ac43eb3c6a33bf5e797c38ff93bb5a7b8
-EBUILD teamspeak-client-bin-3.1.8.ebuild 2442 BLAKE2B e1c99d12eb9ae46356be93f24f786f4b9e5847d67cae8e43ef75bb03e1579b9767aec172717d3f9145bc3101fd86ff955861f4f5fa987a659595299ffc02c27f SHA512 e9c1a449ff27db9ddbf6f077adb5196da5aef2b903b96cd23d486e8085f498decba1911bbb43792a6d95f7dc919cc6ac86efacb43b1ec4b2cde787a05655734c
-MISC metadata.xml 969 BLAKE2B 42b49d768bd4c26c68f1d304f68ab5e57c61463c2c77aca29d3dd894dee565e6044cc15fb886f929b44e52c2ff404cf1cb2acd52b720840701259b7142818618 SHA512 2df8bfb7f7bb343af1ac5ee62e14a191c04ea7ee0913946a12a07956d1f390f3612d7b7aa2f07cc594ee0b3dca37a49efc4bc9b873ca420996e5b4287c18fdcc
+DIST TeamSpeak3-Client-linux_amd64-3.1.9.run 76048588 BLAKE2B 7eac5590e4f915e072ae29bce7dcf1912a817c499660c88fc4a2f3918482dde7c3c49794200ea00316045f00cb4b02d4275ff860bbcebaba6199aab8c7cd950a SHA512 079afb6b624c56916bb87941b44d62a786ba922d9e69df0c19a4f8930f9d67d7ebc752be2d2f83f971b36fd12e2080cdfc3042b654c2beaba93cf4d8fcafa420
+DIST TeamSpeak3-Client-linux_x86-3.1.9.run 75782289 BLAKE2B ccc97995c1bb0813b9b4ab5eca64638f67900f64c49bf4603e88e3b3b609cbed4ae302c4cbeb43718478ceb44e9504d3ea991a8f106b02c12697e3ba123c764a SHA512 235581f29285feb0b940a6e968a7fe2afe22929b3a58f4b555d14c700183d0056022825846a0482c6c1693188dcf9f8ca95a725f328a9614d21b6cee774e5cc6
+EBUILD teamspeak-client-bin-3.1.9.ebuild 2459 BLAKE2B 606f7b03679d4b084d1e4362134b5d1adb11ea9d2f2ff3f4313e293cc53a919868c1883d6814693cdf634bcda3fbf121fd556a1f95b162dec082d89645060c57 SHA512 8b885ff34be1af8f9bb033707622d7a01cf2b5df1b27d61d733de21c7121728cb689a4683590b8b163263acc06b4edfee169c77544fcee8dcb523c4f72e57cf5
+MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
index 0842b401d4c6..9c659d70a2cf 100644
--- a/media-sound/teamspeak-client-bin/metadata.xml
+++ b/media-sound/teamspeak-client-bin/metadata.xml
@@ -5,14 +5,6 @@
 		<email>ck+gentoo@bl4ckb0x.de</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>gentoo@karolherbst.de</email>
-		<name>Karol Herbst</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>dryatu@gmail.com</email>
-		<name>Sami Loone</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.8.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.9.ebuild
index 9c6ffe96819e..806dc9b21dca 100644
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.8.ebuild
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.9.ebuild
@@ -5,10 +5,12 @@ EAPI=6
 
 inherit desktop unpacker xdg-utils
 
+MY_PV="${PV/_/-}"
+
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
 
 KEYWORDS="-* ~amd64 ~x86"
 LICENSE="teamspeak3"
diff --git a/media-sound/tudor-volumed/Manifest b/media-sound/tudor-volumed/Manifest
index 5647ddba52e2..3c225d941546 100644
--- a/media-sound/tudor-volumed/Manifest
+++ b/media-sound/tudor-volumed/Manifest
@@ -1,4 +1,4 @@
 AUX tudor-volumed-0_pre20110427-build.patch 829 BLAKE2B c96b5ef46d148c2311529f18f80309e4c43acb8ea06a05e696b9cc2415669c66c83d50c97f75b70c8097a92fa089578ed93c4e9648021b2829affe4384a97f1d SHA512 3cba0bd7ebf2a08e3fd44cca80436c1c4884f014759f0cb770d9af1612340795c282455be8b6cf9822fa746998ac1b4a28374dc88767d5e350d5036c7d9d6829
 DIST tudor-volumed-0_pre20110427.tar.gz 5651 BLAKE2B 7e64a90ab0e7f6b6907392b6bc8fd8fc18c4ccd0d252478121b9188b9d6c61e3f7196e73a0b4016a8067ebcf64cf3e4f67b167a0d01e8c2f5d63de8c209706c9 SHA512 e05e8fef96985355b2e12b34a8858b98fd508e1849bff377c96593a5fee6cdf542decae2b9f1292c25b886cdd44545d99350c4c614553665fa3c7ea21ce5bd51
-EBUILD tudor-volumed-0_pre20110427.ebuild 644 BLAKE2B 12012a4403bc8626bf318f3ea8aa70ba231a12aa39fc90117a92047049c084a51ebd714759a5316ef9b8cd52c496564adcbb436e8b8d47a59001c549d58568e7 SHA512 5975061da042e54c623c923c381e928a365054c641de7a27c1ddca6709c9aeecc62c074d821b024625c41794c39a913ad0f367714bf56977e6359a5432e1711f
+EBUILD tudor-volumed-0_pre20110427.ebuild 647 BLAKE2B 019a90ea391a3648276071d33641e29855615c0c4f4bc4ece5ffeba84326cf2b0b83823e6baf7883e74b13595c8dd44816561d0f7e49dd588e0fb5a6967fe1dd SHA512 d4ee33c242c33142d3e25ff30e293bdac018cb39217c3e06f0ce24ed3692dfa499511520ee5530bf2ecf82df527819924acbbdd954aaa98ad66ae7ab9768e066
 MISC metadata.xml 338 BLAKE2B a70756929374370b4176d8dd13c9f71b0f3b2d12b3a4e02198db5ced3d10e4d28b8c688be8bb7df26a47e55e52563234db3996801f98db9f190107899e4be0fd SHA512 9ea28dbca9978bead16d9d0d0292ed5a6791af0d6a0e7a2608fa165762436bfa6649f304c032c0e51bd6cd7cfd28ec60c25660f1f78191686f4bf381b0bf9641
diff --git a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
index 8723f7c1e47a..4a36941b17d5 100644
--- a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
+++ b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="media-libs/alsa-lib
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	tc-export CXX
diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
index 248f88e0cc2a..5de9e0c8e4be 100644
--- a/media-sound/vkeybd/Manifest
+++ b/media-sound/vkeybd/Manifest
@@ -1,4 +1,4 @@
 AUX vkeybd-0.1.18c-desktop_entry.patch 498 BLAKE2B abc3ba4a1425e097b96fda6a3fa14f99adebd315d493a46a40422b6590a4fceb567e1179af58ba52fcc44bdffe9d7e611901c67f3c3df3d2ba6c28bfae39076f SHA512 5bb4d0a1b47e1e3390f927c1c8394da12c3058d68b43a5b46b4c3d91659aa720abd2fff2cdd1a8827c90512a116010d8d023b35214f6ec696a34857eb547b6a9
 DIST vkeybd-0.1.18d.tar.bz2 38918 BLAKE2B 75af417b1458f840c22c4fb1fd10da24a78b1bff9e64c094291643bbe6c2c0dd5e552665ee41765e3cb7659f4d81dc35b69e372291ab1e154f838417b936952b SHA512 d26766e80b598af12e3962d043896f7737685a04dc5bd466be6902cc14a8bf5727900e0dfe66e443169a2539f22a110d1fbbc514a621a4a7cb8aa0e9d38be583
-EBUILD vkeybd-0.1.18d.ebuild 1507 BLAKE2B a61afef2c163513764cbed60c17551719465032363f4dbb7f5bf28fc985debc67967764db774124eaa34f3f015b5e04279b581a975a3c83df846196e392bd046 SHA512 5e981b29b014343a43215c06a1cdc1866c452dee76106b49484e655cc7a4c4c59e3a88bd88e640f90a17be401019646d3b0f3a0d3983597221ea767e94b1ae4e
+EBUILD vkeybd-0.1.18d.ebuild 1432 BLAKE2B 7f032bbed481f71dbde70b92455541aafa6e94e275808629acd780317697bef6f9c03232f55a66f22e418c1dae1e0fbb3cb1c8c580177b6e77124e67da122253 SHA512 93987076c0b7ef1b933207c077a631216ee476671e8c787cf6e87096235c9da498ce00fb9b75fbf0186cdcc0093171c331f9e537ed3843683ba15fa893d67800
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
index cdf69d35b90a..56fd2ccbeca4 100644
--- a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.18d.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=2
@@ -18,10 +18,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	lash? ( media-sound/lash )
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto"
+	x11-base/xorg-proto"
 
 S=${WORKDIR}/${PN}