gentoo resync : 29.08.2018

41 files changed, 462 insertions, 199 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d927907bd113..85daecc527fd 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 20de7ab13ad2..be3e625fc421 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -2,5 +2,5 @@ AUX abcde-2.5.4-eyeD3-0.7-api.patch 622 BLAKE2B 2ea52354945fa8d503b06785b0a6a1c9
 DIST abcde-2.5.4.tar.gz 104229 BLAKE2B 38244005df80868e24a21d39f3d4cabd6d8b8d6e4d8384a37c01a40cc550b584a3fc4ee1dcd88ae05980cf4a9368a51d2035e49717faa8086b922f2815f735a6 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
 EBUILD abcde-2.5.4-r1.ebuild 1556 BLAKE2B 1b05caec47b0dd5b10d530641d5fd7963b1746524b6a660bba397e8bbc94cb0468f2a04a7f72f75870c08561626091a32cae871e3832bc16d00e32715a3a084d SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030
-EBUILD abcde-2.8.1.ebuild 1783 BLAKE2B e8427c9735e78c1b9459b494dc0745dc4429bcf3cc3790abd69439fbeaeb8e3237014d2d8d9ac8db9139e6e1bc1da4cfe92599cfb09338bc37d204b9f5a31379 SHA512 7339823db4743cc7ec7ee99648625f45ebc87cc6cb0070c30b13beec24b2a66b8646de6d994386b48d523fc6322151550980730ba6c3f002b85834cda03cc885
+EBUILD abcde-2.8.1.ebuild 1756 BLAKE2B 84baa7f929ae4144ab55b2b470eba21982306ee02afed134de69aec855b3abb23637b0ed1b485047ea00fda2ec2e408bd8c3b52fa5a3d7183a81a5dba870433b SHA512 4010e4bdad8d4b489c6be85a9c8eb96b17a05f51662e6a88d6a888ff05b99f4c0e7060063e7f7a3e7bf8a9fc7830d9ba29e4207d5276b734679a88b0c1cb66c1
 MISC metadata.xml 651 BLAKE2B ca84bde665367b9f55bdd57c3c7783c293b037715cbbec3540142ca1e3b4cf98865cb57a378973c1383bd6d83c263ca4e1520bc49c88ce299b3a92fbbbe04d2f SHA512 9174fb9c065d85ff2cb5312bca39bf33d5798f06caafe2a6d8e5fc239b253df8956a30b920fb0392e6a979328c975718f8393655a7cdaf975a72747de1c67ef5
diff --git a/media-sound/abcde/abcde-2.8.1.ebuild b/media-sound/abcde/abcde-2.8.1.ebuild
index b027b72810a5..7ac38d645102 100644
--- a/media-sound/abcde/abcde-2.8.1.ebuild
+++ b/media-sound/abcde/abcde-2.8.1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="media-sound/cd-discid
 	net-misc/wget
 	virtual/eject
 	aac? (
-		|| ( media-libs/faac media-sound/neroaac )
+		media-libs/faac
 		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
 		)
 	cdparanoia? (
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 3b94842bfab3..1f6baa0173b8 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,5 +6,5 @@ DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.1.3-r1.ebuild 2716 BLAKE2B e382834bf933f73269c4122b173361d071a976d4dfc746559ac99ca953395fd22b8d1bc5aaf70393426cf08a97cc8a6d18aabaa9f2fdb737f9560a47c1ff7a20 SHA512 1d92991b6295ac279c898c94fa30c9928b596918a0425ca30f7acbf77e417dbf0ab8e819df14e93c69293f6fd63b80845c2943c4cb2635204d5596a552ff86c5
-EBUILD audacity-2.2.2.ebuild 3309 BLAKE2B cd7c007f7be4c1105578bd90db98b95f04f16a66d1083979c5e212d8d0a051866af31d05ed9bb4f911fd72949b327be40dd889409d4445fcb807e858cf26f68f SHA512 378b58253ee03454ebfcc7f1cfd29c6e06e959683f74a75d31400e246465ff80b7ca995f85754a2747faa61a41a6e390bbcea8a16abb3a0aa72e48b7d5f5aa96
+EBUILD audacity-2.2.2.ebuild 3308 BLAKE2B cea563a92f65b102b1fa2eab190b653ee12d7abb16c1a89400de47681778c21c814d640bd15ccdf30fa218c1beb85f14a95ea3e918c716a9f3202106fea704d6 SHA512 fc58fcebfffeec13309b6570dec88314eab5cbbc98f1484096cb83992d34e42f4f2d70391be5c8791655939d452e91d0fd47558721d87ece383a74e98578462e
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index 7f0a6fabb20a..13e4b20853c5 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
 	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
 
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index efb6b81cfed8..c828c40122c2 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,5 +5,5 @@ DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.9.0.ebuild 1205 BLAKE2B 91e95f5185f242c02b0b25dc0cf0503bf8a6d68a1c041c552da88a5a8bfc8a9b9b979935a8da2b4bba35e62a4c52bd0db43f64db01004a75887a9e1429cc6a83 SHA512 3e182396784ca47538a2b95b92f2003847b9a5ca30bde4eaf13e5b5c930c45b5addb5272ed68c12c9a40ef6f9e9ff7c210ee69a840a48586bfc86fc16c84f2ba
+EBUILD grip-3.9.0.ebuild 1224 BLAKE2B 3c07d1e91920ad522cd7f5bc91e10aa97fc62f74a253818118552cad76c88b004b0db2a94bc1ffa2013481142cdf0cee0a2dc12b027aaa8c340ecad0fef3dc36 SHA512 31bdd7c3a03d9b45ffbfa007affcbbb88627cb56fd975580e6afc667878aa785925affbc80dac85e3dc2213fcb14cf5d1d7215ed27bba47506648977b4daec7e
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index 9e2562a4b9ce..a6f2a40b36cf 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
@@ -48,5 +48,6 @@ src_configure() {
 
 	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
 
-	econf
+	econf \
+		--disable-werror
 }
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 4728e66c285a..20da1dbbdb16 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -14,7 +14,7 @@ DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B a0dbc03350bf6d6a8ce5abd06df50bf58cf
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae SHA512 3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
 EBUILD mixxx-2.0.0-r5.ebuild 3717 BLAKE2B 3e838a7dff793c2ef3bb4c99803746e3dd85fc19e837f4022d15189b8527eb6c775627c8e95c8dda42c875e33e1e89737791469f0df17784c2f15f318adfde6d SHA512 429289d7d632a723bc3919740f9f8fcde60707923e1c4b384ce4dbeea843a110b954c95519b3e91bff5fa7084179982736008e5ae207a4b018af2a087a32be21
-EBUILD mixxx-2.1.1-r1.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
+EBUILD mixxx-2.1.1-r1.ebuild 3005 BLAKE2B e806ef891917a0abb00a5f9295e454fb98c6f7dbe9e7ad70731acf6b6aae8c7be35fba41f355cc8d45aa9d290c9078901cbb1a8795301747509d3bf2ea0c5fa4 SHA512 2d11acf52aad36769d209d137f94484c99a8106087d8cf4a864864171bea9255b65facc65a35e2efa3a8d8cfe89fe218f0f5db917e3dec531f23b23c02c2318c
 EBUILD mixxx-2.1.3.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
index 465a2c26cdea..6ddad2e85e46 100644
--- a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
@@ -14,7 +14,7 @@ else
 	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
 	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 07a91ba844f6..b028e39e1911 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,6 +5,8 @@ AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75c
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
-EBUILD mpd-0.20.10.ebuild 7284 BLAKE2B 956c7f48e1daa7a9c5ab632253d9f252e1c63b95e947febbb70e120955c641e079f12b33a6ab0a5c9326ae8f784938f5c8d193f687ecd6bbfc408cd54989ba63 SHA512 26e006b99a88d1ce1de0e4dc096be643e5aa6a27452197dcd815b8fb59fab1c46bf0b71689ec01d10e3cde83e7898599071f888d11976d9bdf6bc8d36057f09d
+DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
+EBUILD mpd-0.20.10.ebuild 7285 BLAKE2B 08b8d0afe72f0ad186438441aa1229e71c1c2564250c9e624eac2f7c6ec7596bd9f0ad4b353b4ca37af9acac2bda7b2a59f134265cb9a41be0bdfef64cf384b8 SHA512 82c6c20fbe05137a61ed07daa9bdcd0e7639267d8301e14257978d13e67a6ec9e0581f873c22df14a90a1dffb71dfd47fc456aee49889dc5d67a566ea6326ba4
 EBUILD mpd-0.20.12-r2.ebuild 7361 BLAKE2B 6c257159de263c22984a28331cf6ad9bf17ab34bc6e255901f2871588133f2ddcc99cabe142f14a75e831faaad9cf2588889286cb6183716d9a14bd4e4f74624 SHA512 c5d52149a1ac383c35fdf5f22c756459545f1f0ca630d0ba3a433e6f856c9ad49482e3a39e94abc025c2e094abe2e260e8716fbda78e1ff8280a92957e720a36
+EBUILD mpd-0.20.21.ebuild 7314 BLAKE2B 20aa5ce2c93174d07d817025b3288fdee09b8d8809cefdf4caabc2c5294b5c454b792cac12952b3a4a89f291cc200bda650cd2916e50b80dd28e6f4d15690699 SHA512 49c34993453e3ff6a4776ca50c109f7dac3b506baed976675f8b07f0255d010a56e6b551300077708c02d48f009760f2e4516343042778b53a71d505cb29fb05
 MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
index e5b9f541a62f..e61366e3f1d1 100644
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ b/media-sound/mpd/mpd-0.20.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
diff --git a/media-sound/mpd/mpd-0.20.21.ebuild b/media-sound/mpd/mpd-0.20.21.ebuild
new file mode 100644
index 000000000000..8bf40077c493
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.21.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )
+	upnp? ( expat )
+	webdav? ( curl expat )
+"
+
+COMMON_DEPEND="
+	adplug? ( media-libs/adplug )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? (
+		>=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) )
+	)
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-4.0.25 )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp:0= )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-cluster/mpich2-1.4_rc2
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	if use network; then
+		myeconfargs+=(
+			--enable-shout
+			$(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output
+			$(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)
+		)
+	else
+		myeconfargs+=(
+			--disable-shout
+			--disable-vorbis-encoder
+			--disable-httpd-output
+			--disable-lame-encoder
+			--disable-twolame-encoder
+			--disable-wave-encoder
+		)
+	fi
+
+	if use samba || use upnp; then
+		myeconfargs+=( --enable-neighbor-plugins )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	myeconfargs+=(
+		$(use_enable eventfd)
+		$(use_enable signalfd)
+		$(use_enable libmpdclient)
+		$(use_enable expat)
+		$(use_enable upnp)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ao)
+		$(use_enable audiofile)
+		$(use_enable zlib)
+		$(use_enable bzip2)
+		$(use_enable cdio cdio-paranoia)
+		$(use_enable curl)
+		$(use_enable samba smbclient)
+		$(use_enable nfs)
+		$(use_enable debug)
+		$(use_enable ffmpeg)
+		$(use_enable fifo)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable gme)
+		$(use_enable id3tag id3)
+		$(use_enable inotify)
+		$(use_enable ipv6)
+		$(use_enable cdio iso9660)
+		$(use_enable jack)
+		$(use_enable soundcloud)
+		$(use_enable tcpd libwrap)
+		$(use_enable libsamplerate lsr)
+		$(use_enable libsoxr soxr)
+		$(use_enable mad)
+		$(use_enable mikmod)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable musepack mpc)
+		$(use_enable mpg123)
+		$(use_enable openal)
+		$(use_enable opus)
+		$(use_enable oss)
+		$(use_enable pipe pipe-output)
+		$(use_enable pulseaudio pulse)
+		$(use_enable recorder recorder-output)
+		$(use_enable sid sidplay)
+		$(use_enable sndfile sndfile)
+		$(use_enable sqlite)
+		$(use_enable systemd systemd_daemon)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_enable wildmidi)
+		$(use_enable zip zzip)
+		$(use_enable icu)
+		$(use_enable webdav)
+		$(use_enable faad aac)
+		$(use_with zeroconf zeroconf avahi)
+		--with-boost="${EPREFIX}"/usr
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.12.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 5eb2c3310a32..9f2c4c07c147 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.6.tar.bz2 919169 BLAKE2B 7b330d67465f332f608fa7efbfbfe1bbe69f8912a5678f72c56080b2deb44407d66bac6af23fb8c1359373eb90966ba67901235555f1776a00dc27e66167b0a5 SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c
 DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203
-EBUILD mpg123-1.25.10-r1.ebuild 2870 BLAKE2B ddadcd912e882997956e200dbedc0d856e8b1de0539afff3ea6a5eebb96cd011be02b3333dbf55dfdaba42565dcbd341c655dc469e312bc6ff2940f4f8510c29 SHA512 36c5c39f5904242f0b271ce87cb0df076da655829c4c59f5d39dc82ab436d9007454774205a43c69518879e5286826643d12a9cfad017cc6a96c2d3c1cd778da
+EBUILD mpg123-1.25.10-r1.ebuild 2867 BLAKE2B 8c76f99991b49e02c35ee366161caf885b8a174e921e0fd549a250aa1fa39f1e3251679a60b61682101bdf10f8f114afdf23218d15bacae63d661931d02f7e4c SHA512 1fd64df75c40f8d8efdaf8723f6a52c0aeb0e785c8f71356c1ad164712a851ee76e28f6edd098d7f2b30c54a9955fd63f4fd33ecc533d3c2d215756cba31f0a8
 EBUILD mpg123-1.25.6.ebuild 2897 BLAKE2B 2c75049f7218b4247dafd05ead9e494d7cefe8dcabac640c0bb96c249c16be6ef0661d98409d0dd4ef1c99342247fbf146bdbeae570dcf199e6cf93c800f1ad0 SHA512 f051bc85bfa74ae50005369cea98f76cd30d92e6345d02b219da0a147c9c5e8a18f88a0b52461d5d14a2ebce5b2f84bf12cbf79fc1d27bcc92aea7a67791c5d1
 EBUILD mpg123-1.25.8.ebuild 2906 BLAKE2B 6f668c24fff43f542baec764d6dcb4f26e2d03361cfc78c91c635ee48f665fc71ad0f00413827b15334b3381f4509d0159d456e36baa5b82bc1c0a6b57f7c47b SHA512 8afd4947959627b1d97285e49753bb44177d1353ee209de8e99e2afe6ed5eba88554bb70cd129a2069e509944cce17b2da4ca8f804f04a035072f1aef3a4cddd
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index 673433c36334..0a537ca16236 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/pavumeter/Manifest b/media-sound/pavumeter/Manifest
index 275f105162cd..b4d151798332 100644
--- a/media-sound/pavumeter/Manifest
+++ b/media-sound/pavumeter/Manifest
@@ -1,3 +1,3 @@
 DIST pavumeter-0.9.3.tar.gz 89241 BLAKE2B de72ed8e18ed705956553f9d134ae128f15fb5fc09d0aa1c477b46d9741f425b7c9a16a8c2c8298cf3f5c9ce57e7db06c52639e2924ab1b9be2459d7e5239c1b SHA512 7aa87e547a26b92d367c8b6d4ca827f9176ceabe4a66e3f4461d7b54ec85a4ac51a42ddd13793052f7948926f5152b5882d726f566176f499eea2d739a510ad8
-EBUILD pavumeter-0.9.3-r1.ebuild 717 BLAKE2B b1bd0d6bfca895341dceb369c87b10777d72c4d371539e8855a30402a77fe354e30368d9af1d053446286b1d314fe989d043b4040243d65acceffa9b7a0fc8ff SHA512 f1b523b9986559c0af5f9c34297d61ae76fefa3b91057aa7a72df1eabd17d03a8d7d8e18e07eaa15c55e7e03fac1908ed1555a2e2ee37cb99a1ea6205b058046
+EBUILD pavumeter-0.9.3-r1.ebuild 682 BLAKE2B d934ea9d541060b7b1aaef1d2ee4257317a8ca6671e372fb2cfe41bb38c316e2a8f859854ba260f34a313306ff6a37e47162a08ec7ed64f69529a5215df8c34d SHA512 43367be8642dc73ef3e59aefdf50164b32ee49143480ffaa3970c96bc88050e0640091c881ff573e478bfa054c753fec7eac143a9bf4ceb9d220d4042165cff8
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
index 6e371695d4b3..85efd70acf71 100644
--- a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r1.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=5
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/libsigc++:2
 	>=media-sound/pulseaudio-0.9.7[glib]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
+	x11-themes/tango-icon-theme"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-sound/podcatcher/Manifest b/media-sound/podcatcher/Manifest
index ddca05689a41..17cffc8edd65 100644
--- a/media-sound/podcatcher/Manifest
+++ b/media-sound/podcatcher/Manifest
@@ -1,3 +1,3 @@
 DIST podcatcher-3.1.6.tar.gz 22260 BLAKE2B 84864a162521ed3d8ca467c5e5f3686ac8107bc263f3ff49fbf88636326049e64b5903c9987459ae29a5a64cebcf5421ea565b5fce57cea5a11b8896397e891c SHA512 5e1ac6771a4d81d2bfbc77c4a89861a976329a77144b630aaa7f6a1663a0dd9021acc71cfd44e6373bdaf4562718bbb3c19ff7cda56be1c7624cf389ff293599
-EBUILD podcatcher-3.1.6.ebuild 530 BLAKE2B 46f85f30ce01bcb2e2053da5c768f665f25de280543c83f83bc9b9fd4e66b601aca63a9279412f73cb74629db2db3a2b3090e77098e64eb240abcfb42f032d63 SHA512 5fa1d26d2fef8bf10fc312339c5dfc83ed967eba1a6cefa9ba69cfc8af0376fac7c83b70fd84b79a4f9721dd6cb1b43a213b85b50244c86230d95b65c50f78e0
-MISC metadata.xml 351 BLAKE2B 793984727af0679c5fee67d4009f27b411daece23a126767c42d169f7223237c34e1b9178f66d608d962dbba9533de00dc9d05e5a117b2837b26d4a16f772232 SHA512 1b84c382924038fe95185b9bc62ea191c83dea26382b28302e5a88682add8fdc381e009d70c54a150940282c79d0ac761cf314ba9b343b23b5a04c080cea4639
+EBUILD podcatcher-3.1.6.ebuild 482 BLAKE2B 8d002cf9b4cb15585fa1f37d4c8e3c29047631eeba59733d80f8d7604f65022456cb1a94df58e798386f8f8c71a9418259544ba6dd9a4c5cf5e04ccb1c265360 SHA512 edf255bca7b9f4ae85d25455cb972fea09b9fa7177530f5acaee51de4d2e31825a191959720ad6d62a50fa87e8fecec84c431875958de9f9cbeb4306e7bfb021
+MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index ec28374bebb2..39626a990be5 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/metadata.xml
@@ -5,7 +5,4 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-  <use>
-    <flag name="bittorrent">Enable support for bittorrent downloads</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-sound/podcatcher/podcatcher-3.1.6.ebuild b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
index 49cbbc3e2063..9392e126842e 100644
--- a/media-sound/podcatcher/podcatcher-3.1.6.ebuild
+++ b/media-sound/podcatcher/podcatcher-3.1.6.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
@@ -10,10 +10,9 @@ SRC_URI="http://rubyforge.org/frs/download.php/76053/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bittorrent"
+IUSE=""
 
-RDEPEND=">=dev-lang/ruby-1.8.2
-	bittorrent? ( dev-ruby/rubytorrent )"
+RDEPEND=">=dev-lang/ruby-1.8.2"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index e44cd185db3d..1c3ee43115ec 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,8 @@
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.2.7.tar.gz 987331 BLAKE2B a4abe4d34c85f541a181e4066d617759a16e9f053e33f266133b328ba6e93d1013ccec33f8468ce60ff3c3b2c487a32dd0a36700348c4d7fbbf2b043193cf65e SHA512 097c1ab4a45b827873a2f8316cd8090992853ddaaa7eaec74eca62564c6e03c36425e495012d8994db43beb2d896fa4bbb8c1cca5fbd0dbd80bfe5f98a266172
+DIST pulseeffects-4.3.1.tar.gz 1058711 BLAKE2B 917bf83014c84a1e2558f471ca93f31db4814f7dc3d09730c24b327f423bdb4f880bad57239bb7555384f12d7a6f03e26bf51b7aec462f8ce26992ccf59cfe71 SHA512 00305c8650e57963674e77b02a4e896f95f59d404901f3a684247ded95becf3c04fab35df83bc043e3f4f0ab601c98173c135b0b01bca22b520cf180f5bb20fb
 EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.2.7.ebuild 1551 BLAKE2B 379412fbb7666ef15c130838bb47d59934756dde1ad548bf045dfe86b6c5a41fd79a2569a47c43a8f291ec5ac5ee24ee5465871611163b6038654134a5df7b11 SHA512 f71084e6030630b9d77030dc798386d0498583a4ac6a3a49dc74410299eb2d1fe65da6dc9121a7048e6c59e778a763f8831d7829a3a9ec30ce74623322f454e3
+EBUILD pulseeffects-4.3.1.ebuild 1551 BLAKE2B 379412fbb7666ef15c130838bb47d59934756dde1ad548bf045dfe86b6c5a41fd79a2569a47c43a8f291ec5ac5ee24ee5465871611163b6038654134a5df7b11 SHA512 f71084e6030630b9d77030dc798386d0498583a4ac6a3a49dc74410299eb2d1fe65da6dc9121a7048e6c59e778a763f8831d7829a3a9ec30ce74623322f454e3
 EBUILD pulseeffects-9999.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.2.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.1.ebuild
index 79ce00083ef9..79ce00083ef9 100644
--- a/media-sound/pulseeffects/pulseeffects-4.2.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.3.1.ebuild
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index 89a14a5d0290..e7429b9581aa 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,3 +1,3 @@
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07.ebuild 803 BLAKE2B fd59619fce8f4e67ff12b97abdb48fb4dcf9a1f504609ddfc9035c9ede2b16ce321e09d79c1bd77c3dfb524b2dc720645e27277e21d88a181cf6e9cd4cb6e3ac SHA512 10206566658037dc84bc93af38ce9c0ab00fa6179f30ebb8c102a06dfd72b1bbe01ff9f6cb141008d99cc7490c3e4174714d75390ed04d618d38d5932498a71a
+EBUILD rip-1.07.ebuild 786 BLAKE2B 95cc417c957dd7dd9995557c0056a0b10d77f0e2b3d63af8570f831a2973a2d2014afde2b58e9c9fe970e7da7b240bebf2fe71e67f6eba098bd4009698847058 SHA512 36cae29e60968c13a5f4d1bcfebf606b2c3ea8dae2ac43cb55b670af735bf6fac1f8efd24b5625bf88ea9045001d923a1c681022a87810ebdd75238deb6a05f9
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07.ebuild
index 718c19991c2d..960ece4d292b 100644
--- a/media-sound/rip/rip-1.07.ebuild
+++ b/media-sound/rip/rip-1.07.ebuild
@@ -20,7 +20,7 @@ RDEPEND="media-sound/cdparanoia
 	dev-lang/perl
 	>=dev-perl/CDDB_get-2.10
 	>=dev-perl/MP3-Info-0.91
-	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc media-sound/gogo )"
+	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
 
 src_compile() {
 	#the thing itself is just a perl script
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index a2c09cca2218..cad876cf2973 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,7 @@
 AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
 DIST sonic-visualiser-3.0.2.tar.gz 5123229 BLAKE2B 767be64ae74a47e2d1fb2e1b9a93384999c3567613f0b9662d3c5063fd0d951398c6bf4f3ce118545f83f707647461a92e152cabb0596a80dae0284f8415188c SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825
+DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
 EBUILD sonic-visualiser-3.0.2.ebuild 2639 BLAKE2B 589b386d5d208d4d93d4ef6a160f233769ff89d9145a46d36426617586bb21176d105122cc94c80dc9b713f0063e69a8d129b59b70f094987a546fac7d378cc1 SHA512 c5704adef2c1ff04ef12e1b20a566e583a0d68deb6ffa1be41a7c0131030f77e329d0d59cd7df97b96f4d008e0684ff18ebe886879b311683738e2439c3153ac
+EBUILD sonic-visualiser-3.1.1.ebuild 2678 BLAKE2B 973202ef9f34738c2ede4ffebd589b5c9a75bf8af6609471e60a0d74b163562493fc469273a30575e4c0ee1fcfda0697d3539af7b7f330cd2c8c2915b7afc120 SHA512 2ae7a8242714a67ee0bb6ff2c2438e1ecb584439ce423b974bbe1c7baa85737a8a6e7d27395dbb57e073671e41fe1404bda4a65affb9b522d5f92b05dccb6d61
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
new file mode 100644
index 000000000000..feed92ce32e0
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop qmake-utils xdg-utils
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2391/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+
+RDEPEND="
+	app-arch/bzip2
+	>=dev-libs/capnproto-0.6:=
+	dev-libs/serd
+	dev-libs/sord
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib
+	media-libs/dssi
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/rubberband
+	media-libs/speex
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad )
+	ogg? (
+		media-libs/libfishsound
+		>=media-libs/liboggz-1.1.0
+	)
+	osc? ( media-libs/liblo )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+PATCHES=( "${FILESDIR}/notest.patch" )
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in . svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	default
+
+	use id3tag || sv_disable_opt id3tag
+	use jack || sv_disable_opt jack
+	use mad || sv_disable_opt mad
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use osc || sv_disable_opt liblo
+	use portaudio || sv_disable_opt portaudio
+	use pulseaudio || sv_disable_opt libpulse
+
+	eautoreconf
+
+	# Those need to be regenerated as they must match current capnproto version
+	einfo "Regenerating piper capnproto files"
+	rm -f piper-cpp/vamp-capnp/piper.capnp.* || die
+	mkdir -p piper/capnp || die
+	cp "${FILESDIR}/piper.capnp" piper/capnp/ || die
+	cd piper-cpp || die
+	emake vamp-capnp/piper.capnp.h
+}
+
+src_configure() {
+	export QMAKE="$(qt5_get_bindir)"/qmake
+	econf
+	eqmake5 -r sonic-visualiser.pro
+}
+
+src_test() {
+	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model ; do
+		einfo "Running ${i}"
+		./${i} || die
+	done
+}
+
+src_install() {
+	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
+	dodoc README*
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins samples/*
+	# desktop entry
+	doicon icons/sv-icon.svg
+	domenu *.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index b0f91e989208..9628468dcb33 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -10,5 +10,4 @@ AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
 EBUILD sox-14.4.2-r1.ebuild 2621 BLAKE2B 15db996f6aea42581d1c2d8744c7a06769e08366d4c017ea1683ad50a0b94ddabed7b3d9f47e69dafaf7df662533e3fa1492724dcace92c054f058286f711884 SHA512 b82bd81d5c58f1d56416ea4a0de453831b8a199d99a59fdbbc79934898f2a33b77ed86870ea26091df91df5ae8211c62b410e14ea7f0d30d8a3fdb9dd1f4f87f
-EBUILD sox-14.4.2.ebuild 2162 BLAKE2B acf1642bd7003f6d19bc454196f4b6cf6fe9e7088363b3c3b530a973d874a3261faca50c26fc6d4e076064ebf10a87d39a5d647e4feccacc49d8c4cc052a1d62 SHA512 8bacb2ece8bc4808ad1b5db0a854e3c4c7eb4febaabdc18675bec344c8454243ba0d5530d87c6ae7b0b8416bf726a1d392cc8d6f0ef936dbd4fea01fe02ef825
 MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
diff --git a/media-sound/sox/sox-14.4.2.ebuild b/media-sound/sox/sox-14.4.2.ebuild
deleted file mode 100644
index ee37ee2ba2d5..000000000000
--- a/media-sound/sox/sox-14.4.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	>=media-sound/gsm-1.0.12-r1
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ao? ( media-libs/libao )
-	encode? ( >=media-sound/lame-3.98.4 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	id3tag? ( media-libs/libid3tag )
-	ladspa? ( media-libs/ladspa-sdk )
-	mad? ( media-libs/libmad )
-	ogg? ( media-libs/libvorbis	media-libs/libogg )
-	opus? ( media-libs/opus media-libs/opusfile )
-	png? ( media-libs/libpng:0= sys-libs/zlib )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.11 )
-	twolame? ( media-sound/twolame )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die #386027
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with amr amrnb) \
-		$(use_with amr amrwb) \
-		$(use_with ao) \
-		$(use_enable debug) \
-		$(use_with encode lame) \
-		$(use_with flac) \
-		$(use_with id3tag) \
-		$(use_with ladspa) \
-		$(use_with mad) \
-		$(use_enable openmp) \
-		$(use_with ogg oggvorbis) \
-		$(use_with oss) \
-		$(use_with opus) \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with sndfile) \
-		$(use_enable static-libs static) \
-		$(use_with twolame) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-}
-
-src_install() {
-	default
-	# libltdl is used for loading plugins, keeping libtool files with empty
-	# dependency_libs what otherwise would be -exec rm -f {} +
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-sound/split2flac/Manifest b/media-sound/split2flac/Manifest
index 95db4092e356..0e7ee093bccb 100644
--- a/media-sound/split2flac/Manifest
+++ b/media-sound/split2flac/Manifest
@@ -1,4 +1,4 @@
 DIST split2flac-122.tar.gz 9468 BLAKE2B 605001d92b3de52def98db28aeaba8a48c9c4ac5d621d27cbd7637d337f18acb50ca33f46b898def94d8259ae97c5cae534334df6ed5f6ccf267103a9023da36 SHA512 3be5d8f5a55107a6230108bb49b422303504a1b16ebf458759122b27effb492353f92f95c00bcfa52b45fad24a4e08fa638df9922288bc2844e3a971d3734ed8
-EBUILD split2flac-122.ebuild 1374 BLAKE2B 3d1b37464f6185d8d6cc4bed35b81a217c26fa16f06edd5020b59c8abdec6a254018a71ed1bd1964414513940f58ad7c0e72fa51535a93ccc699929fafc25d3c SHA512 61bb802ec97594ec49853ebe37a3cd97ead2f5987e6c2a61196d52a5f4c89d442869d5878b1aacf993608343f6456560056c1c2e84a40d02be4d73576b3c3783
-EBUILD split2flac-9999.ebuild 1354 BLAKE2B b625095ba515c2eb5f57dbe7698f336b06d75fb9481ad083d99deb6adf8b44391d5b6cee1629a25c7d83c98ba8aeee1266daa8442110118b8cce9dafef013e3f SHA512 273f804d359531b2158c3572a2e9a71f54437aa5274f2f2ac8c12c5a1518401360074d9edc2356bcdbddfea6bda35fe4c16c31264563630a15b1ac2da8b97d1b
+EBUILD split2flac-122.ebuild 1343 BLAKE2B bbe540f2e48f0328093f7ced967503d78506dfd81e922b92beebd145dc124bfde4f9a5b00749c36236ce343f1f0ff853ea134de45a9e9f2c1f869b85045f4b82 SHA512 98b00280462ee540979541c459ea39a5983793526677a3f90ea7e890d2d6e0cfea1ab22beb9fb263e812ccfaae3cd0702b5ff2232d3931248a3b8193c19b9696
+EBUILD split2flac-9999.ebuild 1323 BLAKE2B f21a79760e5a73e64fd07e87dce447b3861a05aae9a209573e505fce450714b77d49a8d24badbfb3b7529c2d5c4fd624da8817e9adbd198706569c7ce9fd837d SHA512 493314c27d28666409d346afac45aaa8539726845e45a256fd558e4502ed7073469e9681376224e2bf38db338290b3c4194dced60cea938b635e2633b0f90d83
 MISC metadata.xml 1246 BLAKE2B 7a2df038b155c1dfefbfbc3897409de32e21b0e32e543e1c4d5cce58e6d5fbefd5b341b53fad2d81c0e5a114953be7462ad736dd2206f8a3ef6113b076ab2d3c SHA512 ee36cd39bb98e817542a6292f70e8867508eaae58e4b6a14fd1874bbeb8f21422385d07cfb1f9280852c40b3cdf87a1cde895fb327230e93a5c67a2e8f478cf4
diff --git a/media-sound/split2flac/split2flac-122.ebuild b/media-sound/split2flac/split2flac-122.ebuild
index 16367b13e346..b93363779abc 100644
--- a/media-sound/split2flac/split2flac-122.ebuild
+++ b/media-sound/split2flac/split2flac-122.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	replaygain? (
 		mp3? ( media-sound/mp3gain )
-		mp4? ( media-sound/aacgain )
 		ogg? ( media-sound/vorbisgain )
 	)
 	imagemagick? ( media-gfx/imagemagick )
diff --git a/media-sound/split2flac/split2flac-9999.ebuild b/media-sound/split2flac/split2flac-9999.ebuild
index 1f3c0218f1be..fd0a7bea8998 100644
--- a/media-sound/split2flac/split2flac-9999.ebuild
+++ b/media-sound/split2flac/split2flac-9999.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	replaygain? (
 		mp3? ( media-sound/mp3gain )
-		mp4? ( media-sound/aacgain )
 		ogg? ( media-sound/vorbisgain )
 	)
 	imagemagick? ( media-gfx/imagemagick )
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 94aa87523b03..096398c86381 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -5,6 +5,7 @@ AUX timidity++-2.14.0-CVE-2017-11546.patch 1005 BLAKE2B e22fba2c36f8ff3dacbe6797
 AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ceaab0832db0b2f1571ec3e23d276aa77464fad58c5db9de9a07507ecefed08840dc9ef6e9c5ce30b90188ae150536fc4fd3fdc8f3 SHA512 48083c7a59196c0cf4e82cf53ffd92edf995347a4e49e2450b2ea3ea2e6ad014d13b3881c54ca0c7ad312dd977c64d836cf543c66fc8367038271f3888c294c8
 AUX timidity++-2.14.0-ar.patch 822 BLAKE2B ecd76b6297cfc6fa04fdc1760dad9879a2835db79378df98a224e758d22aaa08fa7cd6f82c16b394e6d6b4bd103b9f69b7ff84b2c7ebb1b0c82c487cc8eb5dd5 SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b
 AUX timidity++-2.14.0-configure-flags.patch 4241 BLAKE2B d1d083ad5e397aa0e827cd21eb98b4143638559c31d38d9541f41a6d4dc12358a1c17c8115f956e177359f9ca122ee44e775abd7b6009777ca1eaaaeeadd59a1 SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17
+AUX timidity++-2.14.0-gcc5.patch 1575 BLAKE2B 553ea15356aa070583b270dde7bfa8b92d3522a8c28baf6fd6286c99522436f7bc0f84d53a90de6e7b553bc7ca22a9749c9f63c83b2bd93edb1cf03626e91a7b SHA512 e4df5f5176915a21675cb0e833b88f87c7b766fe6c32beb715b538174b7118e0a80a7e0059fd32c16a4bdeabb3ecab2b8d845df805394a2f84052a894908f7bd
 AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
 AUX timidity++-2.14.0-pkg-config.patch 3836 BLAKE2B 64757187ff860fbd4359dca0f567e7b71ad11ffa060e736deccd4994e0409bcc86f1f5151414e532e22f07e4dc9a6b5d75b1617c21deab616a319622a3ced0c4 SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d
 AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 701 BLAKE2B 32fa47b354cc3d9aedd0b3466eb69de08757f731c39d4b11fd8377d607918eedaedb0747b63ab031479790460303e971ad153875b448166632e90cab2af95598 SHA512 096ec664e401446bebe2395309cbe57c61c711a1ce4c23984ba668cdc9aef1a23a1c5d4f9111c0a2bb4e634368b57093f2dfb0aa1c60e281098bac646b8b9214
@@ -15,5 +16,5 @@ AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cac
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 EBUILD timidity++-2.14.0-r2.ebuild 5120 BLAKE2B ea61c55377c185c5b8f5ef21f65805903ab81a816932fe356d438bc91e06768ba93a2e0742079322aaef32870350999f1a8dac5898626e07b3c09cc00c4fdfd3 SHA512 331162f1be948e0ad0f8c3d05ace64d654991225cbb654957519b932ed4687a79234381bcdcf6ecd0cad9add9c3575b3d019d10f8725e76ffee8c2992a7ecf16
-EBUILD timidity++-2.14.0-r3.ebuild 5252 BLAKE2B 8ec893135153cd67d3984bbb1637310f66c7d55352627cec8918da4d9979316cc5a420b33c87f7b7fe71fce97dc4d81670e6eea722d12511996731dc26f2c536 SHA512 bb33e53402ba0eed094cf7921ee49a5b593ec5fa25b8968695e63b3524ced2eb695a1dc2c6d37930d932345d268d6db7d11554d4c3730267e50bed51efecb8ec
+EBUILD timidity++-2.14.0-r3.ebuild 5295 BLAKE2B 0e30f8152955babe3937c6649323d63948e2b0934cb3236e81a75fc03c78a68ac2ffee3eee7260d8ef6286c3fd7d0da314e7ba191f63c24b0dd07da1769b1050 SHA512 2f7555e7f481b071169f983f1a8c6a5a3cd08fd3e9f89b8f7bda729315e7738b16d2288fe785e3f90205ef3afa705332c882575eb3c5e1dc5025472c1873967a
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch b/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch
new file mode 100644
index 000000000000..50d64e3bcbb5
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch
@@ -0,0 +1,31 @@
+Upstream commit 6e189f6073e979ceccaf05c3bb5f495a1b9ed87e
+
+inline, defaults to "extern inline" with newer gcc versions
+
+With newer versions of gcc, "inline" defaults to extern, and not static if
+not specified. This causes linking problems at the end of the compile. Most
+of this occurences are fixed (or #ifdef'ed away) except these two small
+ones in timidity/mfi.c
+
+Signed-off-by: Stian Skjelstad <stian.skjelstad@...>
+
+--- a/timidity/mfi.c   2004-02-17 17:02:18.000000000 +0100 
++++ b/timidity/mfi.c   2017-02-14 04:41:24.000000000 +0100 
+@@ -344,7 +344,7 @@
+ #define SEND_LASTNOTEINFO(lni, ch)				if (LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
+ #define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch)	if (LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = NO_LAST_NOTE_INFO; }
+ 
+-inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
++static inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
+ {
+ 	info[channel].on = time;
+ 	info[channel].off = time + duration;
+@@ -352,7 +352,7 @@
+ 	info[channel].velocity = velocity;
+ }
+ 
+-inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
++static inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
+ {
+ 	NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, note_name[info[channel].note % 12], info[channel].note / 12, info[channel].velocity, info[channel].off);
+ 	MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, info[channel].velocity);
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
index 5a1770ebcfdb..a26a24cc91ef 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses"
 
 DEPEND="
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-configure-flags.patch
 	"${FILESDIR}"/${P}-pkg-config.patch
 	"${FILESDIR}"/${P}-CVE-2017-1154{6,7}.patch
+	"${FILESDIR}"/${P}-gcc5.patch # bug 606894
 )
 
 src_prepare() {
diff --git a/media-sound/vitunes/Manifest b/media-sound/vitunes/Manifest
index 05f4319ac833..4090ddd85d19 100644
--- a/media-sound/vitunes/Manifest
+++ b/media-sound/vitunes/Manifest
@@ -1,5 +1,5 @@
 AUX vitunes-2.3-asneeded.patch 571 BLAKE2B a310f4f7e7314774cea1ace842b9f80afde44c6ff4af4a02ff2d85223e80e9b54fa844125471b47bdad0adc92e0673b1659d5919a25b47ddb5c0eee601460da4 SHA512 fb776fdd39fceca384a805c8ac0eae43c563a2799ce18adcd083534822f98fa00e5320266f9177f452ba63e8cab3bb709df50d027b31eb408eff2fde1b96af0b
 AUX vitunes-2.3-time-header.patch 222 BLAKE2B 90c724bcd281651dc5d300eda24ca35569c35ae21e1792611b6c2355a358abdbfb16f344a47a775514e3ccd7b98c52b3356d8cb6d8527dd46a404ec76a99bee4 SHA512 555b360cb82e5700ddabe0a6bfc1b50b5662fcbec1d24eb56679b146863e41fd9caf478261c103b1669bf08697c2490cf68b2a014ee6f930c5ae4957ad95e2d7
 DIST vitunes-2.3.tar.gz 77978 BLAKE2B 3c01cf1a52402421f672b8b84182a3ccca99c64995846f741996243b354e1280df92a0ed6892aea893aabb4712e3a584d4b70151bc0ceaa3d50785d073269804 SHA512 5e795d802937e2f529421b3c0c3df333298608b419fcf955f4ec32ff47b915f1b82082f283ded1879869d7ae9875e2699e70fde6ee5d953d13c2e39cc12b7a53
-EBUILD vitunes-2.3.ebuild 702 BLAKE2B 803f3887febd48e28bed6d1ec6a6aac81b157da39e183bddf93bb2040508eaa9715d3e15da35dd57fc51d3d7dc90812a0f2ce36bb38b97fc00d4ce02546ced9d SHA512 0debd8a719b66ddae7bd4f658a1bad6a83e134b0d8ea5ec8d8b235a4bfbcfee66ac079007be82552fe4912da8322d809a2719189a55c0e63e5c70a14bfe82034
+EBUILD vitunes-2.3.ebuild 674 BLAKE2B b67bd890dfb10ab08014b944ed6bce1249bec104ede79adf5b2feafffdb0b628b16f32f81dca78397876058f583731b4babca4554fe80eee8d3bc6268aab2d69 SHA512 8bbb5ffaa7739e7551746cbd7cf95653e97fe128e9c507eedce229d7d9d5d8f441f7bb74849fc8cc6d3edc3605cb5da2d17e309dada865b39bf4974ae37df715
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/vitunes/vitunes-2.3.ebuild b/media-sound/vitunes/vitunes-2.3.ebuild
index 3d7c9a5bacc5..51c9a8c5324c 100644
--- a/media-sound/vitunes/vitunes-2.3.ebuild
+++ b/media-sound/vitunes/vitunes-2.3.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=""
 DEPEND="media-libs/taglib
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
-	|| ( media-video/mplayer media-video/mplayer2 )"
+	media-video/mplayer"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded.patch
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index cfb700a1ad4f..c99cc7c78c96 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -6,6 +6,6 @@ AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b6
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0-r1.ebuild 997 BLAKE2B 3563eac75f1091ce749baa151e0acfebd2c8022b1bbdd63aa07eda77b6a280d79676751d1662091ca3007e06d1636762cefe14ab044460afebe5d78fe0adb0ca SHA512 4c35bbec32c0f4609b06d26c93ee9af0011e24be897a422d8fd68adf426436178ce51f7615e3b9bbb3637a5b11c8389a27426fb21c2521f555dc1002f3c543a6
+EBUILD wavpack-5.1.0-r1.ebuild 994 BLAKE2B f47a7af550f64a0fe89db81e1265ef704834a58aec2dff772ed7b043dc09134cc8024e508e98f8a83042238d7ae10712fd160bfcd3436463b8fb2b33361f6713 SHA512 559edac7d7a26ef740c981c53f50fa180299f83b2ee9fe8bf6cd4332950efcd23cf2763477c75cb3b04affbc21e299f2bb415ab19468787c3c8b48b0e7f5bbc5
 EBUILD wavpack-5.1.0.ebuild 752 BLAKE2B a519797a235fbc6d8d0f99accc418475058fb08491cac1018efc50acf347d707bf270c7cbc11c34ebdf4ae19e7d2584bf08c857152c5b47d6600e170c2d16b9c SHA512 033c8ab3e49644faf65709af4048a5d673c33c00f5df6c1128a08358d93808fa0ad1e88ae73ea0262f838e56223b8232e3bee41759ba1837fbc0ad376da79a32
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
index 6022c6a2c024..1c6e4a0825d0 100644
--- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1"
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index bc868fe9b12a..4d96290fbfc1 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -5,7 +5,7 @@ DIST wildmidi-0.3.6.tar.gz 105534 BLAKE2B 4c2a62ec61333c3d9dc7f26e981389f22c6b2b
 DIST wildmidi-0.3.7.tar.gz 121501 BLAKE2B bae856c00449564f9199f977a4881d51c19769da10bf554a8baf681454a50b67b70feeda19592be91beda65131d4f241e661524f9c65163fb95a8570fee7f779 SHA512 b4d40404891161cb55a71dd790e2dbd2c4ec21730c8aaa6f3a68eeacd36d939f859b55ab535bee2feb9ffed04337332ef1eedcffbff6ae02d7499fec97f7a42b
 DIST wildmidi-0.3.8.tar.gz 121690 BLAKE2B fd11315e930a30f89ca57af0819116f8385fa1a7ecaedf7df1decc39774fa0a98df6b12e47bc8254a6c856bf41083571effa3aa70a448c1fdbcc0bbc7e848178 SHA512 883c5b2db84bee85f14a98729496aa9e15f5c1414dbaed6108d07e649b34937cbd3e8a8823a2b6519fcc7fdd354219c0667615c7b31e8952e13f8635e5284f50
 EBUILD wildmidi-0.2.3.5.ebuild 1108 BLAKE2B f1e1c9d2b7f38959cb423ffafd5ca17c6d979fc73e5ef810112aca00dd23a547dbd7e354bb1a86207dea79a42074475e705386b5fa3badf38f2190bcbe063487 SHA512 3937c9b2f532cd09dfcd656b516d396ec0acaeed010ca09ecf8f3609f71b67591e6aae5b009b8810d2f5684040e64de2ca0000b1404666b844dff78888eebb53
-EBUILD wildmidi-0.3.13.ebuild 1856 BLAKE2B acf289834ba609868e79d8463e42c008bedff881b83bf09bf3a87cc1aa097c3a654381abc1aab2a23b147ddfe0db331b19f14fa2916fe0cd0a8ed7d4185985dc SHA512 18b6b93c2e97a7a5a2a703681af8495b5447b0ad83891c2d945aeb95decc9f75c8c4836840cd7555ede5c0c30235d68b4bfa3ac65b08d2444d67f3af8b3d5e29
+EBUILD wildmidi-0.3.13.ebuild 1854 BLAKE2B a38851de7af3f8dded960ffb79f3ad3a4c611ae4b46c5916b1125a20531f5cd268e07f8266205c15e82b80a14870e437e57d5fee88f1630d1e0cb9ffa9d44e21 SHA512 b2598534bd32924a3ac3281b78e3a4be9261919b238c9e664dcb631d62019b9414a7f55235e1df8d3c1e1a6d7a757203fe58e1ce66036b45ebc852863cb670ce
 EBUILD wildmidi-0.3.6.ebuild 1870 BLAKE2B a024316067bde1b90b6397c9127238198cccda88dd958fe9063257030dd58d00ad1ae5c6a11dc4cec0d4c7134be7df3fd878efe8f043213f84a574f0fd61ae32 SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738
 EBUILD wildmidi-0.3.7.ebuild 1843 BLAKE2B e3637544044e1b73f9c597cdc3a759d3c6e206f8523f7703cb465707446543c728b58dae5910c0049a9216e62701a6feae5cc56044fb98d2d53354d43781479d SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092
 EBUILD wildmidi-0.3.8.ebuild 1870 BLAKE2B 1930d55817f98a070c49732ac393829e9a6fe628bd7e458d67fba4c04be42318186c9be8b6a034a97a4b1e3b93ec66721a4db0da712f2de4b64801c6a9065adb SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a
diff --git a/media-sound/wildmidi/wildmidi-0.3.13.ebuild b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
index b75eb52da3d4..306ba26b72c8 100644
--- a/media-sound/wildmidi/wildmidi-0.3.13.ebuild
+++ b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="+alsa openal oss +player"
 
 DEPEND="
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
index 1aec516feab5..aee060a69fa3 100644
--- a/media-sound/xnoise/Manifest
+++ b/media-sound/xnoise/Manifest
@@ -1,4 +1,3 @@
 DIST xnoise-0.2.21.tar.gz 3222030 BLAKE2B c58561f4e042ccf7d7fdeb271801ccc2d447138cf5c1afb2f8f0bb098135d957aa289799e59f2c96a76a01ccfeeb9574d87f0d987b1e3ace9d22a3ced8ec88b9 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851
 EBUILD xnoise-0.2.21.ebuild 1599 BLAKE2B 84d3713b2bc0d3c0a1d8eb4993800524db138290004c9a8ea6019fdc779627e395e54c3764d45f15821db5f2906df25349e6b8afb31a0c0ba6d9b6f74584e7ec SHA512 00cff72964cb19620995e0dd7816368ebe8d3e2e8f55d0d9b314d736986921d9da030b63759a013e15fe110402aff91923a5d3ed7b506160f585e765ae6a4bdd
-EBUILD xnoise-9999.ebuild 1680 BLAKE2B 770803c8b6cc2de533c8b273a2bcf6a9f234e8759b5cfabbfb0d1853fe2aa90c51a54f45929827ebfb8987513e8bb7ca44a80be1a62b8c6f2692d0578a8fea62 SHA512 e0f8eff722b27f3e952895818617d9bb8739f10c07b628fd751b53e97fe9f3ad09e9a80c236a1a29d923f2acf1fe4b2e6e7655f57df712dd7c673060dd5cef1f
 MISC metadata.xml 507 BLAKE2B 45efdf6c0fab90d05dfcc0f601d2de99bce91a80539b6a50a5bfdaf2d64f6f808843f90817144efa6c6dc5f47ebd9427d4fdcf283e1189fd814bd1e72d20c395 SHA512 06e64ff5b075eb264ebfea8d77a95cdcf901e08df501abcdf4383dca64314185abc0d539df5d306e83bc4e26488ae8182cbd5c21cb39cf8314d70f070463b446
diff --git a/media-sound/xnoise/xnoise-9999.ebuild b/media-sound/xnoise/xnoise-9999.ebuild
deleted file mode 100644
index 386d1f993e88..000000000000
--- a/media-sound/xnoise/xnoise-9999.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-VALA_MIN_API_VERSION=0.20
-
-inherit xdg-utils gnome2-utils git-2 vala
-
-DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
-features"
-HOMEPAGE="http://www.xnoise-media-player.com/"
-EGIT_REPO_URI="https://bitbucket.org/shuerhaaken/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="ayatana +lastfm +lyrics"
-
-RDEPEND="x11-libs/gtk+:3
-	>=dev-libs/glib-2.34:2
-	gnome-base/librsvg:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-plugins/gst-plugins-meta:1.0
-	dev-db/sqlite:3
-	>=media-libs/libtaginfo-0.2.0
-	x11-libs/cairo
-	x11-libs/libX11
-	ayatana? ( dev-libs/libappindicator:3 )
-	lastfm? ( net-libs/libsoup:2.4 )
-	lyrics? ( net-libs/libsoup:2.4
-		dev-libs/libxml2:2 )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	gnome-base/gnome-common:3
-	>=sys-devel/autoconf-2.67:2.5
-	sys-devel/gettext"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	NOCONFIGURE=yes ./autogen.sh || die
-	vala_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable ayatana appindicator) \
-		$(use_enable lyrics lyricwiki) \
-		$(use_enable lastfm) \
-		--enable-mpris \
-		--enable-soundmenu2 \
-		--enable-mediakeys \
-		$(use_enable lyrics chartlyrics) \
-		$(use_enable lyrics azlyrics) \
-		--enable-magnatune
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	rm -rf "${ED}"/usr/share/${PN}/license || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}