gentoo resync : 22.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
commit: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree: b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /media-sound
parent: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)
76 files changed, 480 insertions, 601 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6a3e32af40ea..3bf95d7d2067 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index ac385287768b..0fd237c97326 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,3 @@
 DIST beets-1.4.3.tar.gz 1428494 BLAKE2B 29adc617c4efbb304b05c6bc027a09fd34c11af70b22a86a329fe9048de31828f729114db929e97b103a6f6d8210c0b74716f327f8b4f853f745433fea5f1e14 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d
-EBUILD beets-1.4.3-r1.ebuild 3042 BLAKE2B b230f16612bae8f27f67ddfc47fa4af66b9599114ac760383ebbab4a966d048ece071ed1a44eca736524a649d8c759f57a3064868ff23ca9badd1e7724848d43 SHA512 09a5013a8102033066e218785ef74d456ee8b1f81146cbcff26ce71c039d49dda5b8ba436a4e7bcce4597712fab4cd1c5c83e0194f619b1af05b4f0c24025414
+EBUILD beets-1.4.3-r1.ebuild 3038 BLAKE2B a8a3b385c7d22aa27c77729d66a3a525feabda1dbc9b8a9071aa2ab199afa6c5b4b238eb69633c4ef39b8ec786aa28df2feadb1a9108ec2b5a49c5f593dec148 SHA512 0f731ed3addb024699e7a020167bfb5816e11d993aa0d48c37d74c1ed2a587996fbfcce703e78dc5d9bef05eccde5ec2e2ce81bf977f7b72771d30d02803b581
 MISC metadata.xml 2577 BLAKE2B dcd49b8888d4e54b9a6ad53f18864773285aeb4d98dd98bba680968d217a474d141d2730126c27f7778a4d984e113445c390a538ceaa7961227289916905aebf SHA512 7a6178f3e0f60ac36bbf2408c2a5b98ddbb3407d2aa6e44317c7b71bba917079bd71b777d837e2921f5eb4dad7cee35a276aab020db610551b5da314810e52a5
diff --git a/media-sound/beets/beets-1.4.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
index 80af3567acb7..d5491b02393d 100644
--- a/media-sound/beets/beets-1.4.3-r1.ebuild
+++ b/media-sound/beets/beets-1.4.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.python.org/pypi/beets"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 0b39e6b87a6e..5a5f483798d7 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,4 +1,4 @@
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1466 BLAKE2B 12607bee26e04667e19a174fb4034e5e58d0b3c019717883859300fad9b31478704ed87909f70628a05f906fb137a7688b052324e3fd7a57a9492098e4131553 SHA512 ba102e1a866f3818b411a024a4f36523ade02febc9524037c0ed78a19ab23baffdc779cb1f66b337edb83bd15d951782089cd9cf7fbae89db16b4410c4f31076
+EBUILD cdparanoia-3.10.2-r6.ebuild 1334 BLAKE2B 450059604c1253c1549cdd9e0c68332f9b350b023c22ce0e775afc45943685a5140429ba67770dc30e39d19d82a1b931cc59555b2ee7df16f4f667ecceb2beac SHA512 2a7d68d6ba47f8155b8f8d8f366d8f6fc77df09c75a446df5f1acc5556923880720e4066cefecfa9dc0e515adedd82390a73b3f060e3cc79fb686a52c1672054
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index db2ce30179e1..900c6be96bc1 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="app-eselect/eselect-cdparanoia
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND="app-eselect/eselect-cdparanoia"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 9e8367151b7c..7b6e8d4d081b 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,6 +1,6 @@
 AUX denemo-0.9.6-desktop.patch 297 BLAKE2B 4b65468d50aa35068dfcfb107efcbf1f4b42c516bc6e1eb4b2abe4c3d36ab28047ecd8dfb0c5e4b5e9564cf079e053ff62b9f3d35411f85fe652ae1c36aa34e7 SHA512 0a9bc51fc0cd45a1c3e4f5d88f6ea5b147dd733a364b756d02e112ad0254b1d3a6de3217b71ed4aa26699c9961f1c3206777363ef861a924c65912d9b1f563a2
 DIST denemo-1.0.0.tar.gz 13810392 BLAKE2B 9d402b93ea5001b4a43ba15070e778831747d8e23060aec79c28239a3f754beea83fcc78f3884d06d8d612168fd2e7efcf62d0b7fa25bb03b9f007a66e3a26e2 SHA512 38a1b8d8a08495e0103b88802843465148a1ec6aaf49c5b2d71e58c662579f5ab25e06eba1e6855e3eb21f6f4a11efeb97196a6759a587ec5b3f3fac698eef30
 DIST denemo-1.0.2.tar.gz 13923398 BLAKE2B 488dd3e29d190cd2f1e5f7ad401118fc67ef5211357ce64081c9b601bd1ecf67b282a283d95968e9ae30c64deaca85e33c0fe0825defffe8f3c2175db58e4352 SHA512 f6f642af1385a8020f8d64a7c9da31d8f61e1dc01f221709b31c081640f99b367d2bbb5b6dffb6be6cef21fc2b423618ddef8965398850d60a5f0113f98d1f55
-EBUILD denemo-1.0.0.ebuild 1486 BLAKE2B 26ee8b1a0151efaf5d297a1592a28717ee0d1ad1bc84ecde2d627e9877d6f0e88184be521db8ad8bf895a8965a3bd3a6a6c84552a427646d6e3900aea604ef95 SHA512 611856732e9a506fe8111b3e367aeb1055b5554c8835851f41ae08f164138f3e169d9f761cfcdd87e76afb58bd895401093080076ea8a087ad8ffa6f4a3a5736
-EBUILD denemo-1.0.2.ebuild 1486 BLAKE2B 26ee8b1a0151efaf5d297a1592a28717ee0d1ad1bc84ecde2d627e9877d6f0e88184be521db8ad8bf895a8965a3bd3a6a6c84552a427646d6e3900aea604ef95 SHA512 611856732e9a506fe8111b3e367aeb1055b5554c8835851f41ae08f164138f3e169d9f761cfcdd87e76afb58bd895401093080076ea8a087ad8ffa6f4a3a5736
+EBUILD denemo-1.0.0.ebuild 1477 BLAKE2B 921ce867315b09288a437a88aa6797557221e0f9f2654d6dab88711ee2dbc0956d3378367e094758d08f810679bd8168a76b0c4fdcd9aeca576f262fd3969285 SHA512 2efd6eeca52473ef558c4a86aa644e685919815155d61e92d46957548df7ccc8311fa55c94653fba3432e6cac04a7ebd809780469ec9b3eb46183adc02381ce7
+EBUILD denemo-1.0.2.ebuild 1477 BLAKE2B 921ce867315b09288a437a88aa6797557221e0f9f2654d6dab88711ee2dbc0956d3378367e094758d08f810679bd8168a76b0c4fdcd9aeca576f262fd3969285 SHA512 2efd6eeca52473ef558c4a86aa644e685919815155d61e92d46957548df7ccc8311fa55c94653fba3432e6cac04a7ebd809780469ec9b3eb46183adc02381ce7
 MISC metadata.xml 406 BLAKE2B 93cafb9333d1a39417a0b209cef62e1b94a38834aa6b64630caf911f8d6bd0f7fed22086129d3c23027b696bd5b9a77e1f1867adec03d118dd0fd601194e66a5 SHA512 61df8bac3cda4177ab47ae946ad4241ee4f281554ec4c00711c1a4eee10b2c729941002a00fbb54db9b2088d489fb72bda8b816d431799d1be24076d95d56d4b
diff --git a/media-sound/denemo/denemo-1.0.0.ebuild b/media-sound/denemo/denemo-1.0.0.ebuild
index de6b3f32da22..c502a2cb9016 100644
--- a/media-sound/denemo/denemo-1.0.0.ebuild
+++ b/media-sound/denemo/denemo-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils fdo-mime
+inherit eutils xdg-utils
 
 DESCRIPTION="A music notation editor"
 HOMEPAGE="http://www.denemo.org/"
@@ -60,5 +60,5 @@ src_configure() {
 		--enable-x11
 }
 
-pkg_postinst() { fdo-mime_desktop_database_update; }
-pkg_postrm() { fdo-mime_desktop_database_update; }
+pkg_postinst() { xdg_desktop_database_update; }
+pkg_postrm() { xdg_desktop_database_update; }
diff --git a/media-sound/denemo/denemo-1.0.2.ebuild b/media-sound/denemo/denemo-1.0.2.ebuild
index de6b3f32da22..c502a2cb9016 100644
--- a/media-sound/denemo/denemo-1.0.2.ebuild
+++ b/media-sound/denemo/denemo-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils fdo-mime
+inherit eutils xdg-utils
 
 DESCRIPTION="A music notation editor"
 HOMEPAGE="http://www.denemo.org/"
@@ -60,5 +60,5 @@ src_configure() {
 		--enable-x11
 }
 
-pkg_postinst() { fdo-mime_desktop_database_update; }
-pkg_postrm() { fdo-mime_desktop_database_update; }
+pkg_postinst() { xdg_desktop_database_update; }
+pkg_postrm() { xdg_desktop_database_update; }
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 02be0f289c5f..2b6c685b58a7 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,5 @@
 DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
 DIST drumstick-1.1.1.tar.bz2 1011275 BLAKE2B dff36487a1cf79512150638c793c471fb410c3563184e9acdbd9d441c53596a0bc611d4ebef2b4dc0214c0fef5324443fe0dfe4158f45521762abf4e838cf716 SHA512 f3278be71b1850bbe742ff46b65a656443a1d655c5bcc1e289d92492db985ab185ed140b88ca68f37235c07926be5b82cfe97ae2f95ca7e3a7f48a7c95c61654
-EBUILD drumstick-1.1.0.ebuild 1775 BLAKE2B 45349cbbad2e23ac95c05e9ec36fda08cc6d230aefcd1edbd9a41c33e4356fd8d5fb220cd1b2185ad60e6f4cb682920bdd515f26b58bb27d751e54bfb470dda5 SHA512 25c9e95e3359c648d3a9b9af17cc5b2db2f4f576598c1de13b9936ba2ee736d1a7b89c7730015a64d4adbd58869cd167bd978b290db782d4c01b724bc78b5284
+EBUILD drumstick-1.1.0.ebuild 1764 BLAKE2B 2c42c5d81f55c43ad019db34a15765ed2578541e69550c6871898a1b2568fd3b5ff3dfaeadf46e9a5803b284020463f1f7278da2fbcfd9266fe070169d84077c SHA512 26f6cbb97288f9d1b0413f5fc7545491e68b725a9633898b2147d846855bb01411ab3a28b3a39113d277048e90b53e6416104b75ec45fbc15bfa294ed3f2312d
 EBUILD drumstick-1.1.1.ebuild 1730 BLAKE2B ed1ee5f692adc0d0bc23edc6240064e24646a33bb7a7e2048665df46a951aefacfcefe9af4fa6701907fb4dbaf718b76b980cc32362cfe634ce32118efea762f SHA512 4bd7f70a09d328a13125827f5bf76f37e4fafc83c2d88cb74db9f3b28d24a955bdf0422bb3f6272d6cce3995b8fd0a9860cf8eda15b351c9a7f1cd1755c432e4
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.0.ebuild b/media-sound/drumstick/drumstick-1.1.0.ebuild
index 88fb5aae789e..3c51d0d2cf4b 100644
--- a/media-sound/drumstick/drumstick-1.1.0.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils fdo-mime gnome2-utils
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -82,13 +82,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index ef6aec8be4ce..71e7635fae9c 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -4,6 +4,6 @@ AUX easytag-2.1.8-taglib.patch 398 BLAKE2B 1019cd65b2814ebfa069cbec329e9a389a43d
 AUX easytag-2.1.8-werror.patch 547 BLAKE2B 5b3a07bae07084ba9e73660052cb78332d8230a273ec2e1fde01278a08ff777b67fc4561431731870fd8c2f0ccb8b197ce0b56b9d8bce1348aa8c023d80152c7 SHA512 0367944be501f741e75c61872840282fddbd2503b3bc25f5d5f392a9cb05fa451623acc157dad2f3b415af0f6c396aab23f4927306c15fea5f1b10435a200e2c
 DIST easytag-2.1.8.tar.xz 2459496 BLAKE2B 4ba27728071a3a87af72a37cd0337d361ae690c42a70690ef935d4a0fdf27904c0928b448f64fac61194e02f18e04ea26c600f65365e8ea7aa4d76128f7a5d82 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.1.8.ebuild 1452 BLAKE2B e9e0aa31375741fcd132ec9d1f0ca812e087311179a58652c3df6c093b3e6a8b090e6713a59f38aef76ec4eb9e98b49c140d9496911ea9fc7b85ea94d8c2fed7 SHA512 12bed0206871c56e53329684127283ef36c7f3f3418537a59a5d4244883c6c407e8a88c15d21294b2363334030c2438a1843c4c84a50af2df96958d4258d56c3
+EBUILD easytag-2.1.8.ebuild 1443 BLAKE2B 4e6892fd7c7df21400e032c1863af21ed09106a3aa24498a6da1418a26cccf1ff77de76de2712ea10a2e7724727b7472adbb6336cde5e8417e9a7d96547d8459 SHA512 c55dc94db97b55b0f3f50c1fe0d40749e87ad8620e460a4422dce3cdeabd0ca2c850fb315a40168e0802146ce0f1b6db18152db88183972efd950845c58d5568
 EBUILD easytag-2.4.3.ebuild 1645 BLAKE2B 8ba8ed176a87b9189d6ce6c5ea0cd09cc0b01a3d1e4b5747e5c763f1af5e4bcd241d901470924f3a20518df36f8bfa1b7d6a6a942f7b3fc52970b843d5c2ab80 SHA512 c722d39fd6f08e9999b71914af9e6efe8f263bde9063707a330cfb26c1e200f54e50a2a344f2056d62ad316df8576b00cd5c389078ff7fb26e5771c4cfa12404
 MISC metadata.xml 565 BLAKE2B 74adbab18a112ed8cd165f2947ba5bc6b5bf2cfa231ae3139510db65ecd22dd39fb1f69890c789c51257aa8dabaf96b82edb696a5e9e5e91ccd65d5d26117e6f SHA512 20baf00e8f0315ff490b5379d9c6dc14f66c46837d9d3eea073ff85596370e48356a80534e795f3023b7251a79e749f04a575a1d4e7deaba1e909f6038f7718a
diff --git a/media-sound/easytag/easytag-2.1.8.ebuild b/media-sound/easytag/easytag-2.1.8.ebuild
index fc78c472d7c2..b7b085725ffe 100644
--- a/media-sound/easytag/easytag-2.1.8.ebuild
+++ b/media-sound/easytag/easytag-2.1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools gnome.org fdo-mime
+inherit eutils autotools gnome.org xdg-utils
 
 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
 HOMEPAGE="https://projects.gnome.org/easytag/"
@@ -55,5 +55,5 @@ src_configure() {
 		$(use_enable wavpack)
 }
 
-pkg_postinst() { fdo-mime_desktop_database_update; }
-pkg_postrm() { fdo-mime_desktop_database_update; }
+pkg_postinst() { xdg_desktop_database_update; }
+pkg_postrm() { xdg_desktop_database_update; }
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 8622b932e256..5fef4686dd0e 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,3 +1,3 @@
 DIST exaile-3.4.5.tar.gz 3662446 BLAKE2B 13343a5468a4f7f309e173e5195d356d62e10efc20c99cc70a1f0215fafa073eeec19b4e35ae52e11a62575a72263ad11ebdf105fcdd066654f8d6c2b1ff6864 SHA512 9337b86ed2f6a13071615bd46a7a05a6564011a4e1fef4cb42925336864c07854cfe497d8defe65c4e287fd9546de6a51543180c5ce6a84525506e57209914be
-EBUILD exaile-3.4.5.ebuild 1284 BLAKE2B 3317a842b855f130c0985aa5f8781b956b2fb65db60307cfe09ec6df7fc160145a577266c53d32be9be6139570cc8b6042d6521272953270896c021303d0617e SHA512 3af1d3389aa7d54a81743130efa5414d1cfe717445d8beb13232d54e82e81ec67451c5491f9af96c5de8ab3cb9d8ed03b5b426f3cdef532e72d4c58151648634
+EBUILD exaile-3.4.5.ebuild 1273 BLAKE2B 54243b0c4cfbc5cb3119c210c83f89601ba4ba6ea9a0ffe0d862127e9ad7a2f27bd1fd8ade89a5abe36ee12686754542c4412a9d70f1378fe9a0cae616f95737 SHA512 24f7d166b92fb42b02449d2df27299972b22bc91ca5d62ed4cdcef7c6aedf0b9e262040bb3fc9477dbd810e503c52e013b91ddea627f0cb681215c32cf91b5d6
 MISC metadata.xml 380 BLAKE2B 9d0cff24c31104dac5ff1d9911df1bc67c25f6765b723591ae1a0849f539c44469d10956105dddefdb377375a01099331eb0b223627fbcb3459c6994b4db2507 SHA512 763f538de48767038faac1b7ffed4ac1422be573b6e2e01ff6679e8aeff00f2d14a3fc6bcf40e742a639f36f13cfe893fea77e5fd4f8a273af5d8cfa8db529bf
diff --git a/media-sound/exaile/exaile-3.4.5.ebuild b/media-sound/exaile/exaile-3.4.5.ebuild
index de353fde214d..7f6bd3b77284 100644
--- a/media-sound/exaile/exaile-3.4.5.ebuild
+++ b/media-sound/exaile/exaile-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit fdo-mime multilib python-r1
+inherit multilib python-r1 xdg-utils
 
 DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
 HOMEPAGE="http://www.exaile.org/"
@@ -54,11 +54,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 3665ab46f381..2896c19cfb9a 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,6 +1,6 @@
 DIST gmusicbrowser-1.1.15.tar.gz 2349451 BLAKE2B 8967e404360dd59b8cb59bfdfde8a9b8771be9deb2d449800fd2515b65c5b06d935db828030aeb8e839305781f799e1fd2ee8f975c1ce479ed0211fa71a84731 SHA512 9176be8f2b1b6c832099feff87a7a526efaa3c512c9b7b6d433f1a157ac1185adb05185f52f9ce1b3b41afc967c37345d216a090b472927a661747e25479cbdc
 DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
-EBUILD gmusicbrowser-1.1.15-r3.ebuild 1683 BLAKE2B f318607739966158d52a3b065d6a2fb729fd81ccc5295041f3a248e6c8b63c9b51ff537bab4b30d15f0fec7b97133515fd58957a7cc4cc8b47fc59bfede1f8b1 SHA512 8936dcbf217f9e12b041a8197ab47c16617624ab94668f96fc22ca305f6cb3efb9ac8c14a23e2880a0917bcd5b41087ec988baa0e27f84f5f805a0e41e88639d
-EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1744 BLAKE2B fa338b5221097ced136ddabe53a0d71bf981a18f2c5cdf155b6dd8dbd3e7606fb91e26592d85293e57aaa5b49c4e2542ac2b2c2bc145a56ad8a3ca5c0302cde6 SHA512 5a1a91e86e095ffb5c41466c27796b2e6a5158029bf57c8ce61c0f7c557bfa2bc7fc07c4009ae97d4b91964e6c4b46c6f053c358fec06210ce2d2f3e134a456b
-EBUILD gmusicbrowser-9999.ebuild 1744 BLAKE2B fa338b5221097ced136ddabe53a0d71bf981a18f2c5cdf155b6dd8dbd3e7606fb91e26592d85293e57aaa5b49c4e2542ac2b2c2bc145a56ad8a3ca5c0302cde6 SHA512 5a1a91e86e095ffb5c41466c27796b2e6a5158029bf57c8ce61c0f7c557bfa2bc7fc07c4009ae97d4b91964e6c4b46c6f053c358fec06210ce2d2f3e134a456b
+EBUILD gmusicbrowser-1.1.15-r3.ebuild 1674 BLAKE2B a3e1f4009928db8f10561e06e353e0d706533060d0c9ac2b5fff97872da89822aca223fbd6e1ce59eb347751132eea2a2743fc2d112c81871a773dbc6e720f37 SHA512 02c101547fc328b22c4504e3be3d089e5cbef29b104d1cb4ed1b5fa697d6d6d096384d3585d19118d5413c7fbd044549800c6ea90fad99ba6fddf075d54d8ef0
+EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
+EBUILD gmusicbrowser-9999.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
index a5010ffa36b2..439186eb3b9d 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="https://gmusicbrowser.org/"
@@ -50,7 +50,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 
 	elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..."
@@ -62,6 +62,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
index 0484ba50fb50..3d144fcc11c7 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils fdo-mime gnome2-utils
+inherit eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
@@ -61,11 +61,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index 0484ba50fb50..3d144fcc11c7 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils fdo-mime gnome2-utils
+inherit eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
@@ -61,11 +61,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index e1476737750c..a2235abd9c9e 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -2,5 +2,5 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1630 BLAKE2B 91b009c7b0cb32ce884c8e0ab26687d219229f660ad636cc6fbbe76c8468402f6657e8157abcfef985d8ad5c8d2b5f19ce0dc7fe1a227e5596ca47e7d854ca80 SHA512 79e96349d42b7e0cd7c4fd81d1851c9dfdcad7838a0d973fc51b6ac7e263566249f68bb083b065ce22d0017662ee8f3a7b7d352c423e0ccc88f6f7a3fea7b25f
+EBUILD gsm-1.0.13-r1.ebuild 1528 BLAKE2B a72475ebfc63d3b44e1043424d589425495901cab5c5032a1b290199ea1c51c45486ae1100d97729a0424a4a92e5f8bae201a1bd2e6c932f93f692ec550936fe SHA512 4190283c89dda514b5bd36f96d58a87d91aabdfe659797f28884384a856373d2c5c6ac60badef73480226ebd16f3e1a56f4809e7b6b9ec1e76d86d61f6a31722
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 897d7f112012..ef87e2afa1a6 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -12,8 +12,6 @@ LICENSE="gsm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
 
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 71833895c4e3..b5147e1c86c0 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -4,7 +4,7 @@ AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 BLAKE2B 3a7856f80c04921419
 DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 BLAKE2B 0fab3329b191e90e8961994fddb407dd635c09a389e56124734338e78803c63687595ff9ff6f4223713b7a13f79a1f17877e9e37890fafbf94bf631c2f9afe84 SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f
 DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 BLAKE2B 2f845de92e19f164ecf5caabdfb4b1870d93050b5027c814a342b6abf826d9b70637c5c169159ae4647b0ab49fe2e2f246441214561dc828c6d049189a9f6c3f SHA512 9c885da516f2ca246edba94db26c851229d063f1557ea91ec76ca57d675a510d16cc4baad5adb316cf46aaaa8b8d7579b484a53b9a803b34fc9bb34c983a8fe2
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2433 BLAKE2B 89d3f2ceedf99f5702b244a59b3708ed772e21248bf37b04b6edd266adc83b80bdcd53102ce68af912b055f61fa4aad96c36bd6c5155859a65e83863d28e6e6f SHA512 e0aeef4456bcee0452c3cdff0489fa0616d350c41b0a311babfc3889a15795694dd3b68ede5a02725fbfeaad20471ee77647e714148380464c7464a09f80f0a5
-EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2236 BLAKE2B 632ee6e07b7445497d6af2857d6946a8e5fefc5973004e668935e6b71e64271b8f338fac97a94ad90db9636734422bb3a31777ff9f5a7b301661e29bff35d93e SHA512 16590aaef08b6aa3ecac4127ee773437f13fd1d549dd82ba97f2bbadc1d99a6804fe8018cf6d379f368e9ca53f8305b33608d9a82d4f6c61443de8d59b5b4d99
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 2204 BLAKE2B 40d266ca868d25f64730811c98d27c2a8330350318da8910be958fa9f5ef2fbbb8a9d7f63541a213139883a8730802af9dd506f81f0ba6fec891e021f37a93e3 SHA512 74efbaf316bf34a5424c450f2c84973d5ee04a96efc74c638cf02c24f4f6131eb8af36adb60125a91392eddb3d56273f4ec140a4f1e82e02e4dd46cc97290614
+EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2301 BLAKE2B 365da2382795f4c6378159e803f67dbbc3e54fa6b5a1723ffd4aaeb2999943783fcd72048f7cf3f5dde0058c69494e43c2f1ead08e2c56dce6b535e8dcd98a34 SHA512 32ad14f0be41c45f096a5dd35c05107c1ff854df1e1e6a2803b4c3cf98f8cd156a0d3aec2d092d6786749e5820edd143463d331dca752c48479d282c2ac65672
+EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2104 BLAKE2B 4364186d40279df43927e9ef57ac6ba16de4943444dcbf4e39fc7cb7716232a37d43e28a57765df7ed0ec80106ceebb661f2bf9be7c9dfc241656e6d4061ebd6 SHA512 1b0769d43bc619f0dc41ea307519b7118adfa265af506b3e8a6b11b0bce4fb89ef0d8fe0f69cd1de888097b17c474836b1b95f1e412bf82a99e0592b3ec7fddc
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2072 BLAKE2B a0f6460a846454dd8ff0fec3ad83153f744384fd23c93534530fbe3161b7b1ab457591a90079a043ef87414b46de96579fadc619c3be537dce4c194dec28858b SHA512 dc0c8c665481f599538aaa448745f51de3b335e99116195aad17004ac50c45966bee1b1fa16d90bfb64ccb430a7310155b5bc495e3aa87cb38c48ef414d7b041
 MISC metadata.xml 514 BLAKE2B 920e43b1a4ee5e4040d05a3dd62f677943ea7166a013e82d06f255d9a0d79d99af927bc5428517232dd7d21392f74b15c40c2d2e781d720abe1c153bc85ccadf SHA512 1fc2dd1efb39c6c002c5ad647a4f5134c841138546f66300db8ce93c979522ee29c4e74cea86e6bba4fe8d5414dfd5a25cb1d98803511450cbd22933ce474c1d
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
index 0046819ee8b8..3081514a92e8 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -21,9 +21,7 @@ RDEPEND="
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!media-sound/jack-cvs"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
index aad1c0fff8f3..5a1fa3d1b5ce 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
@@ -22,9 +22,7 @@ RDEPEND="
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!media-sound/jack-cvs"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index ef695a4bf571..6686a549bace 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -22,9 +22,7 @@ RDEPEND="
 	>=media-libs/libsndfile-1.0.0
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	!media-sound/jack-cvs"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 511a5c71104d..8d00d4ebecae 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,5 +1,6 @@
+AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2150 BLAKE2B 43a1df14f3ae4593eeca4cc28db864e6e1dfedb9a25a572303e622e0b06c344b73eb5eeadf0c1e05293c898ffe487c0e8cb104a438f635f64360d1ddd6560c7c SHA512 8fbec8b83319e7b6c6f719ff9cf27cae859b0dcde115bb50ddcbf62aef90d12f533211f59ec548a39270b6817300b0fa27b611d7ec133204e0384a97509bb18c
-EBUILD moc-2.6_alpha3.ebuild 2272 BLAKE2B 2d2e89e68010a53f36b8649dcc1050e90fa61251c05f99cdb63e914438b20d121d14e9a367906dbdcd847b0acd7a8988fb228cee14fb7ae43c4a01a0eb3d1193 SHA512 87e8d9e59ba0de11fb9a2ab04b016e07082faa3fb79451cb577e70ee7e016d8827cf04286cdfb993c6e8f095426f02f1984c6c109c58ba5a65b538cab393104e
+EBUILD moc-2.6_alpha3.ebuild 2312 BLAKE2B 8f7b06032d1e68608980d417798a9ecfe274e88abd942fc6eb2e635d8b51b977c96f2eb3bd2f85a5910c1f010d18bdc01ef215dfb9df5f9abc4da04ac6812eb4 SHA512 983f878411b05b3345afa643cd3a8fb7a45a8441565cc9a770b16e315136c016b1400c050f80e33d7ca0d2adf0169f1fa852de7a4cb73d6d97176b9f56cb9ada
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/files/ffmpeg4.patch b/media-sound/moc/files/ffmpeg4.patch
new file mode 100644
index 000000000000..28b688823470
--- /dev/null
+++ b/media-sound/moc/files/ffmpeg4.patch
@@ -0,0 +1,33 @@
+Index: moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- moc-2.6-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -697,7 +697,7 @@ static void *ffmpeg_open_internal (struc
+ 	 * FFmpeg/LibAV in use.  For some versions this will be caught in
+ 	 * *_find_stream_info() above and misreported as an unfound codec
+ 	 * parameters error. */
+-	if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
++	if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+ 		decoder_error (&data->error, ERROR_FATAL, 0,
+ 				"The codec is experimental and may damage MOC: %s",
+ 				data->codec->name);
+@@ -705,8 +705,8 @@ static void *ffmpeg_open_internal (struc
+ 	}
+ 
+ 	set_downmixing (data);
+-	if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+-		data->enc->flags |= CODEC_FLAG_TRUNCATED;
++	if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++		data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+ 	if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+ 	{
+@@ -725,7 +725,7 @@ static void *ffmpeg_open_internal (struc
+ 
+ 	data->sample_width = sfmt_Bps (data->fmt);
+ 
+-	if (data->codec->capabilities & CODEC_CAP_DELAY)
++	if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+ 		data->delay = true;
+ 	data->seek_broken = is_seek_broken (data);
+ 	data->timing_broken = is_timing_broken (data->ic);
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index d68ba88aa230..b2d3b3643bd9 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
 "
 
 S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
 
 src_configure() {
 	local myconf=(
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index e6caeb3fb588..8e87f26a9f3e 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,3 +1,4 @@
-DIST mp3gain-1_5_2-src.zip 129435 BLAKE2B 39ad12a09e58375c23602939097622fda0cb6b7487e95947d5443fce55f4d2163c15df619f96b1839acf99bba9ed8ad1990bab287e1392c30813d185d823d734 SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388
-EBUILD mp3gain-1.5.2.ebuild 728 BLAKE2B a93caa57abf577406eac807d879f53f375868cb34ab11fc637f9affcbed6a4233af42f671f3277764c52dcc2b4fc2c3f30a68ab6ae549dc1ea6ed0dee62978ca SHA512 99741719ade948434a37842839586b51b72634fea2cf642162be076f1042ba03b031b6a3148889ee073e8fdea88e7fc7ec8d6b5e93918203f00e61c193bf9841
+AUX mp3gain-1.6.1-CVE-2017-12911.patch 2804 BLAKE2B 71d410abe4196cb47d4f006af7d8fd73a0308280ce57aaa955434c9f7b1bb8bf3363eb1ad8dbe0da3b5dd79e4ac5a355b796cdc253608c5bf2ba7c03527c3b32 SHA512 b5b093f18160cd4205870952d8f092c300f66d6fa025ac09114f55b1e5b37af6ab8ea1b505e33446f6c7153a5ffad04c001b67f9a069db8d3418c6fae3e73002
+DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375
+EBUILD mp3gain-1.6.1.ebuild 676 BLAKE2B ecf7bddf2ac065af612287123bb04fde4adbf04221c4dc409a59f22213ed1c6ee04dd1e8e0b8922d3f465a90f3ed34f312b5acb8329efa332215dd79e9b9cc22 SHA512 52fe2d39c153bfa0d83ac36fb89f3a694b881850c3c69bfbd6f1af6599abb6fd665bc9d94effb25146859d297a32580a4841442a10d37e5a594bd06666e777c6
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/files/mp3gain-1.6.1-CVE-2017-12911.patch b/media-sound/mp3gain/files/mp3gain-1.6.1-CVE-2017-12911.patch
new file mode 100644
index 000000000000..0b5a32280963
--- /dev/null
+++ b/media-sound/mp3gain/files/mp3gain-1.6.1-CVE-2017-12911.patch
@@ -0,0 +1,77 @@
+--- a/apetag.c
++++ b/apetag.c
+@@ -49,6 +49,12 @@
+ 
+ static int Lyrics3GetNumber6 ( const unsigned char* string )
+ {
++	if (string[0] < '0' || string[0] > '9') return 0;
++	if (string[1] < '0' || string[1] > '9') return 0;
++	if (string[2] < '0' || string[2] > '9') return 0;
++	if (string[3] < '0' || string[3] > '9') return 0;
++	if (string[4] < '0' || string[4] > '9') return 0;
++	if (string[5] < '0' || string[5] > '9') return 0;
+ 	return ( string[0] - '0') * 100000 +
+ 		   ( string[1] - '0') * 10000 +
+ 		   ( string[2] - '0') * 1000 +
+@@ -86,12 +92,14 @@
+ 		free(*id3tagbuff);
+ 	*id3tagbuff = (unsigned char *)malloc(128);
+     memcpy(*id3tagbuff,tmpid3,128);
++	if ( *tag_offset < (128 + (long)(sizeof(T))) ) return 0;
+     if ( fseek (fp, *tag_offset - 128 - sizeof (T), SEEK_SET) ) return 0;
+     if ( fread (&T, 1, sizeof (T), fp) != sizeof (T) ) return 0;
+     // check for lyrics3 v2.00 tag
+     if ( memcmp (T.ID, "LYRICS200", sizeof (T.ID)) ) return 0;
+ 	len = Lyrics3GetNumber6 (T.Length);
+-	if ( fseek (fp, *tag_offset - 128 - (int)sizeof (T) - len, SEEK_SET) ) return 0;
++	if (*tag_offset < (128 + (long)(sizeof(T)) + len)) return 0;
++	if ( fseek (fp, *tag_offset - 128 - (long)sizeof (T) - len, SEEK_SET) ) return 0;
+     if ( fread  (tmp, 1, 11, fp) != 11 ) return 0;
+     if ( memcmp (tmp, "LYRICSBEGIN", 11) ) return 0;
+     
+@@ -167,6 +175,7 @@
+     Ver = Read_LE_Uint32 (T.Version);
+     if ( (Ver != 1000) && (Ver != 2000) ) return 0;
+     if ( (TagLen = Read_LE_Uint32 (T.Length)) < sizeof (T) ) return 0;
++	if (*tag_offset < TagLen) return 0;
+     if ( fseek (fp, *tag_offset - TagLen, SEEK_SET) ) return 0;
+     buff = (char *)malloc (TagLen);
+     if ( fread (buff, 1, TagLen - sizeof (T), fp) != (TagLen - sizeof (T)) ) {
+@@ -285,6 +294,7 @@
+ 	(*apeTag)->originalTagSize = TagLen;
+ 
+     if ( Read_LE_Uint32 (T.Flags) & (1<<31) ) {  // Tag contains header
++		if (*tag_offset < (long)(sizeof(T))) return 0;
+         *tag_offset -= sizeof (T);
+ 
+ 		fseek (fp, *tag_offset, SEEK_SET);
+@@ -355,14 +365,14 @@
+  */
+ int ReadMP3GainAPETag (char *filename, struct MP3GainTagInfo *info, struct FileTagsStruct *fileTags) {
+     FILE *fi;
+-    long tag_offset, offs_bk;
++    long tag_offset, offs_bk, file_size;
+ 
+     fi = fopen(filename, "rb");
+     if (fi == NULL)
+ 		return 0;
+ 	
+ 	fseek(fi, 0, SEEK_END);
+-    tag_offset = ftell(fi);
++    tag_offset = file_size = ftell(fi);
+ 	
+ 	fileTags->lyrics3TagSize = 0;
+ 
+@@ -373,7 +383,11 @@
+ 		ReadMP3ID3v1Tag ( fi, &(fileTags->id31tag), &tag_offset );
+ 	} while ( offs_bk != tag_offset );
+ 
+-	fileTags->tagOffset = tag_offset;
++	if (tag_offset >= 0 && tag_offset <= file_size) {
++		fileTags->tagOffset = tag_offset;
++	} else { //Corrupt tag information, simply default to end-of-file
++		fileTags->tagOffset = file_size;
++	}
+ 
+     fclose(fi);
+ 
+\ No newline at end of file
diff --git a/media-sound/mp3gain/mp3gain-1.5.2.ebuild b/media-sound/mp3gain/mp3gain-1.5.2.ebuild
deleted file mode 100644
index f97e02d40f50..000000000000
--- a/media-sound/mp3gain/mp3gain-1.5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-MY_P=${P//./_}
-
-DESCRIPTION="A program to analyze and adjust MP3 files to same volume"
-HOMEPAGE="http://mp3gain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	sed -i \
-		-e 's:CFLAGS= -Wall -O2:CFLAGS+= -Wall:' \
-		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin mp3gain || die
-}
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
new file mode 100644
index 000000000000..87dce052e2ae
--- /dev/null
+++ b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P="${P//./_}"
+
+DESCRIPTION="A program to analyze and adjust MP3 files to same volume"
+HOMEPAGE="http://mp3gain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	app-arch/unzip
+	media-sound/mpg123
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-CVE-2017-12911.patch )
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin mp3gain
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 6c1b35804e33..8cf276f2f64f 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.ebuild 3038 BLAKE2B 66ede65ec5bcb5386e528453f4de90d1281a612e5553c6664289a90fa5ad364f0a30744f551e836f5e6bc3115c7fe6acc9a7df3a82187d3f9bedd93afecc743e SHA512 227ded390109efe7112e6766cb0ff0ebe2d9043d0c5b9c3fccc1aa1889d0a6d03fa9290173a9d1c104399ff7ea147e7c2925c2e02ad93fb9c235d93254414e28
-EBUILD mpg123-1.25.6.ebuild 3030 BLAKE2B 186e3eacfe1aa802b5a63f823fe5d68a2306cafa6574a8f0314ad01cc10912460a3cd94d0dbf023a2f17b3c26cff8f527889621f1ddea6bc36b20078c8a54acf SHA512 ff19843589d37864e210114b1d69a5246bd62222e3572f07853bf356c6932898a6a9afea2ce88121261d4c2b641f67fe7225a6715d65733a07031e0915f7218c
-EBUILD mpg123-1.25.8.ebuild 3038 BLAKE2B 45530f1d7820be57fd588ae39f4348d97c9c925975603adc7ccc98b109e3e885c42b021118cc4f4bc2e1bc6ebeed430b7f58d3e996be3ea81679b1b5aa2cd796 SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441
+EBUILD mpg123-1.25.10.ebuild 2906 BLAKE2B 36462309ca3efd27d94b9788da674763b07ca21c70e0a8cdcfa7465b714dce07ee2d05ca5c3a133ba68178bf3db8c4ce826f9adc2b0e6bdd54b81274ea079bdd SHA512 1bec3fba575532df6b2fe44a87053c7bb7c7d87953589d4aa0491ff936911bf3b4a384d9a083b7b4a734d485c43e80e812a6c34ae65b098cb204032e1177baf8
+EBUILD mpg123-1.25.6.ebuild 2898 BLAKE2B 97ceefb25b80c5b12247d6cc20f41adc156e65abbed3c6504dbcb0a24751e501c078fd8a913cb7320c7404966d9f4675541d3b97ba0da30d04bffbc1e4fcb54f SHA512 054be057d7e194797b2cf4e79596d93982cbc47edafc725f3972a8edf9fe1e5b322f80faf76c61260005e80e757a38eacbf97e1d25d6b0250f444c9f29d130cc
+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.ebuild b/media-sound/mpg123/mpg123-1.25.10.ebuild
index 8882ebf1b0d0..9ce3ffc8c792 100644
--- a/media-sound/mpg123/mpg123-1.25.10.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
index 30e10ca885c7..3de21c6e036b 100644
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.6.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/media-sound/mpg123/mpg123-1.25.8.ebuild b/media-sound/mpg123/mpg123-1.25.8.ebuild
index 34770e816b60..5cb30beae9dc 100644
--- a/media-sound/mpg123/mpg123-1.25.8.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.8.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
 	nas? ( media-libs/nas )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-	)"
+	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	virtual/pkgconfig"
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 96c8bebedf12..edc9430da367 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,6 +1,6 @@
 DIST mps-youtube-0.2.7.1.tar.gz 78128 BLAKE2B 1883ac93ec06b657f72463291d4844b4cf5c1edfb14088769d32bb7590ea676c06a1022724c40b94230ee5469864b402a07c56e535ac3001d57c87cf6937d370 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.7.1.ebuild 595 BLAKE2B 04662825aa2b74998ba8a1b0fe8d29250246663d269632cc17336228008a2db3c685596cf34cc5ca116257d30ac3c347156e0af800beef79b2d121ca5f16f569 SHA512 943e533d9c73d2973d13d16b996eac6202ed7133d65475451fa586f0c9fc870483f03d87d09eac74c35e5aadb8b920ea26bacb82dff4eeaa957a4c1353d4abc7
-EBUILD mps-youtube-0.2.8.ebuild 718 BLAKE2B f9245b0ef224040e69fe84f0e3e28056e2b844d5f09d5ee615a9fd81f4aebb0a4f241d95b4b2eccd33168125f4d9aab34f16cabcec9251699b0a50c9e8c5cab9 SHA512 6f9e527323e1c52505df7d4da8963695f288b0d8f3b44b734d2c85ae66f750e1fabc1657f3000b52994457b96624584bdfb40f8789f83999fcdc27337b72f69b
-EBUILD mps-youtube-9999.ebuild 718 BLAKE2B c2a4bd4cb6a5060468e6f5a992cefaed4f8239f00ab058fd293074af3c50e89ab9ecac1602f618cd647cf4666ddf5862cf744bdfde62697b630820f422104378 SHA512 588eb771d1cabe9fa622987e87ed7e9a088eb29916d8fe99e6ca61f52b1e533cd49f9c1b8a4894bda852f9d7f1e031dd6de0275c9cbc7709b9a0ea571ce261bb
+EBUILD mps-youtube-0.2.7.1.ebuild 591 BLAKE2B 0c23f71d2cb64dd2f40d133948def4262f8f105eee1b40d9f2abcddb33a4b655fa6bf403bb2d77a13df51db4aeca0a8470674a1cb2a9e507fcf5773e75aa21eb SHA512 d12ef8d8cd26a280d7bb3b611f5657bd26347d1cf8a8329f266fba097aa141f9946632d6c781bfc477d91869a2701953d6f6d03227d08d0d9abd11ee71d3ed17
+EBUILD mps-youtube-0.2.8.ebuild 714 BLAKE2B 0ca8c38c08a7b0a80cfe5714703481400e9e0baca220e3b5d6eda9a37dfb505b642174edfe5f550f1fc5ef508cb9769e8933518f9ee5820f21d9147a5ca0a303 SHA512 a00a6e0286e16d22bb05a38b796fc2a16df4a7e5fcd3cd8b8ae689aae1abfc3363f458e724d26f9d3bb7c9be9b3d9d4385a70fb80c2242a7b3173327b5a170bf
+EBUILD mps-youtube-9999.ebuild 714 BLAKE2B c47bff55d839ae0a35a63995a89978662d90879e0f3014c2ed4fc5cd799d17f88d2812bf183cc721e9605ad85ccdd89df3c1f74545837016454ce16a3545a73d SHA512 2bcb0b3f4119158b006b326f664673dc3fc850f71f518ac783bf7b68609c6b192ceee8945a5c27aa070224c1812d576709fc85f951601f0f390c8f4e9250a553
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
index e729cd979b07..ad159c9c7952 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
index 40c962d0e306..c08548b41d71 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index b79a2339dbb1..85dbd24601ff 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 00c864850661..8e9660de6f6a 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,4 +1,4 @@
 AUX musepack-tools-465-gentoo.patch 1550 BLAKE2B 8366eb045ea252e3c375d6ae17a485e4fb1d35bf3768a4c3335cfedb1a7e8d9a9d210a18f09d2800d8a26ec008cba7ac74751dea76257327e37f97ecd8662dec SHA512 464513d49a290967b1fee8f9c27569e4b0b7004ddd5856f80dee9935a8ed4eeacabe48021f403136df0079a216b7da149edfea5079fa41eecd8caeaa13344369
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 961 BLAKE2B 2399ffff95ebf923006c73ad1880769d520257b9b558451bd43ab1443266c8622d4df1e5592c837a44bd42a8a9a37b600d5482199a98dea0a7c697a53364cdc6 SHA512 813c509d4d404a44771f03530674e5d9f06bad42d81f34e84b4040c88d05076d7da7f1005d3dae9aada74894a20f28f21689f79cc88e7880e9e3e499c901209c
+EBUILD musepack-tools-465-r1.ebuild 829 BLAKE2B 2e218114b9d16693d01abb12f81b0412c2b03e81b2ab5ea741b1641c79d527950d6df9c7b64dbc2bcc8b0ba15632c7635071f3ccb2ae6d53f38687d8f8a9196a SHA512 dabc121e5154fad169adcfbf91f50f5f68afec703c5b01758fb24ac147f5fd8be652cd9c2a1a30184dc855fca4f52d0ae2ce1599794d63b2771d697171a0f612
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 696f54ef075e..f4f7e4eb5104 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -18,8 +18,6 @@ IUSE=""
 
 RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
 	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r5
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 	!media-libs/libmpcdec
 	!media-libs/libmpcdecsv7"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index a724bf46e464..8c36340cbd74 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,12 +1,6 @@
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
-DIST pulseeffects-3.1.7.tar.gz 610153 BLAKE2B 64746f1eb8f16613183bac30d8e132d8001cfd9183f735fa262a02c1313f452de5cfffde33543dd0a38a629af898ca264a6864c3f005a45a6da18c00079b9f18 SHA512 7812d4b8c3fd88b533d86dcc70f3e219f3c1fe879bd8731741983c53ed00be2d3c39bc1090a674cb1347ee30a9135c86306ea1d3cb46dce7f45d1cc21fe1585c
-DIST pulseeffects-3.1.9.tar.gz 610367 BLAKE2B cb22786dd830ee80c6562eebe89be9e58c0ed4fb0c9dd1b0e1152467aee61251c50bca6516adadf7254144b42cb538e12f5e4ed1574666f5a17df702cd481703 SHA512 774830516ca078bf2286294575a7f7d96c2b6eb0c33cc83340606b187b5b757e6df58befd3386bde58efa0eaeac31bb5aab182ca729c9104577679467159001f
-DIST pulseeffects-3.2.0.tar.gz 612008 BLAKE2B babb92f3186bcb2eb3c4a8cb130d45486fa2e3c72cc2d77d0eb8f7356203f5acc45dcdeb72615c1583e10dcc9ec5c55b0eabfe4740f0eb46e4d2b79f57643552 SHA512 b34412ef7037db30b7467b1f3125bee8be5813075bbd641f9144d5519c568b7e25a143b6a922550cdbc20c8954cc9a692d295238f137a11510707746d40a2147
-DIST pulseeffects-3.2.1.tar.gz 614923 BLAKE2B fc6f382c60bafedb5439c0e395c6eb3e54548537e5190d4600d63d952addc32f41db9331d43678209ea856cef5a49fc5b85a1065f4832693d8e329097042961c SHA512 624c30dbf3510a4271bb83292cb76b4473ea2e16578a1bdf574f5a0ba6a63ae3cc9a93cb8e6808e810fe7bcfaa5f2cf5b981c6d2f1666f71cf397afdd1513480
+DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 EBUILD pulseeffects-3.1.6.ebuild 1475 BLAKE2B 95ea87508855071328eb7edd3084cbd37073a26961521f8e904d38ef251e75cf153f55ab5eb51abaeb3846d5c039dc383c221add04ecaa41fa50f2db0ac19b89 SHA512 a87f42554f3447cf2f19cdbd005f45c60ade186b3c72e24442b4e8fefb2665be6854fb80a74ccccfbdfadc7edd0fdd70649bc028a61eae826d5400340f07431f
-EBUILD pulseeffects-3.1.7.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
-EBUILD pulseeffects-3.1.9.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
-EBUILD pulseeffects-3.2.0.ebuild 1521 BLAKE2B bf6b2765bc7f35a774bc81c93a4554439fa0f46c914a8aaca8d8e9a352aa180fec2565f617113da8b6e8199753017812a289fa967b332b7d2bacd97ebb75391b SHA512 04c6f8ec7a4ddcbfe4ad4184f759790987efcc15e105f486ca7ec74cabca5a92514af0dff4f041cf9e196b92f615a2df2827a8fe4bf6deb4f0270e006a1c023f
-EBUILD pulseeffects-3.2.1.ebuild 1521 BLAKE2B 6e43feed3592c0a1d546c943fc7c29ac334d159764e35208e1556ce6c0c74a2d258451a622f6e5d6aedbdd92f8f1703d0f7c858cd0cb097c279bf79f436d0e45 SHA512 886c14d9e24b9f8962154f777f4c69be6579635588dd2af9a961e996bc3c174de67823c42d854da436a236e149291ddf77cc2eabd39b8d6d295a263cd9e6af69
-EBUILD pulseeffects-9999.ebuild 1544 BLAKE2B 5e0bec359f4174b10bb6f5f36e509e62c228d4c06cd2a9c8fe9f49bfa9c76fab5632f826f8215995c60f8f66e40018fe803c6c7354408b271595a92fe51eb969 SHA512 efd6c381fa9a153de8f1adcc1b5e2dbcb74cf4d26b6c2ed112d5d3b0164dcbad755c12ee9e4b482acb923640114ffae3c90155d5867f4d2fe418291f1d5fb580
+EBUILD pulseeffects-3.2.3.ebuild 1494 BLAKE2B 50d9920898df0e33cd9b4770ae851e66b43e4b8dbd530f64aacb2420709b2905f64bc6afbec2c9e2f3d6d2cd8503e7b418ce120ac13ed57d7cbcaa1cf09e2bdc SHA512 3e3749edf661307c397250fe6dc62b6d4d211f603c7c4aa5d09765b80bf8df16bf179bb3d6be3572e021b04f64561086280cbaa3579448d35cc1857ac8ca28c3
+EBUILD pulseeffects-9999.ebuild 1517 BLAKE2B 61c46ec631b877ca88ad25ddb887467895a924d5112d54d7fe239609f85c0b213811277dd26d77aaa3bd35f5e9582e28f218d3a4795044fccde38b15684f74c3 SHA512 6d22aadcdc20b568fad4a094e3d01c613d9b7c7be3151d7da40597270133e76ccf7424a28c4e4abe9f87b2f60baac830f2dbd58251ca107444895c14c41de007
 MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild
deleted file mode 100644
index ca67c805047b..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
-	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.9.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.9.ebuild
deleted file mode 100644
index ca67c805047b..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.1.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
-	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.0.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.0.ebuild
deleted file mode 100644
index 5913eede3e2a..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
-	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-bs2b-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3.ebuild
index 51e0313a1223..7ab52f61f1cb 100644
--- a/media-sound/pulseeffects/pulseeffects-3.2.1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3.ebuild
@@ -30,7 +30,6 @@ DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
 	>=x11-libs/gtk+-3.18:3
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 7ef4925c701a..94b01c50ed02 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -30,7 +30,6 @@ DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
 	>=x11-libs/gtk+-3.18:3
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 25fe73398398..65daed0ead21 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -4,5 +4,5 @@ AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a
 DIST qtscrob-0.10.tar.bz2 132507 BLAKE2B 168bc3747bb48e7c5fedbaeb66cf12c4d7230fb240fb9b034b576f739ef55c497cdb6d8383bace8a00ad54890882134598777acc826d8ced195488b932123e92 SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
 EBUILD qtscrobbler-0.10.ebuild 1403 BLAKE2B b3d9506261ad3564f472c8ab2c99576614b78b8e5d5990b941007e1ee40b98020c9dc482bd0e2f1d48d7606f07468474ae1a7bdd4b3fa414f2200c81d1c90dc8 SHA512 37d29012f2666a44ebb8ecca08b65d5563c9ca3bf7c6b0404315c989159af5ac2818b046f7ab8da674b329fff066361099ea6489ab71ce756f866a8679f8d6ff
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1253 BLAKE2B f2247ef2ccd99c3f228a4af0f283bbb3dcde7e335ef37b202de5c18b6e52d1574c00bec42549456c42df902f368eaac768b1a9856e0a5e2fee1394fee4826e39 SHA512 6434c7fe29af3ea55c4b46135d91e7ac15fc6effdc509a75cb8f367eabac864e6809ae0f024791aa6a7bfabbfb85e89d9928885dcfc8bb18c8a03116228143b5
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1252 BLAKE2B fceac0322c37322d68121758065c75a0cd2365f8f1ebfe065d6b3825f02c028e08b1470d98d8e58644c16236253377bc63cd25148739893e47c2358d7483ca35 SHA512 13ba696cdfa8a564144107a61af46ee764edbfdc8ec4e0cce22c21709771d0afe23a58905caf8fef1928fe6fad988912e0abae64133df67e922313e53d249955
 MISC metadata.xml 410 BLAKE2B c410c23c16a0ca646666e5eb4e6569661b340b90c0dd824cf43be35963aac14f099aaade7cb2f188ec4d9b9dbc75015ed9afc062a53be92060c775ac31f72140 SHA512 66998d7596e0dabf7b01af9fa59bd2b4b9d74b5cdd6e902ecbabf81683ff5f84ebf0d4d3dd876d19e510c886ceff741f9ebe163a5214c7f845f256b73601a401
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index 6a3e9163a25b..da8847b4c40f 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/git/q/qt/${MY_PN}/code.git/${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest
index 1e104819ae65..59e289f250db 100644
--- a/media-sound/quark/Manifest
+++ b/media-sound/quark/Manifest
@@ -1,4 +1,4 @@
 AUX quark-3.24-build.patch 2865 BLAKE2B f865860ff7ca15881097bdf8ad2ebee003cff0f5fd89fad3c7cd130d775e9fbf40cb3e75c7ab70fc41e4e6f7ab778d4a990e8f06778bc292b850781e4a3a7ee1 SHA512 11212f9ff12f192645fc41a7f1cb17e94c649db03dfe46fdbcc7cc2ff3f40826954b603d1b1aedb97f8a5443e7d3a1d9b9103ad2d7eca7fee6ac395ee554e132
 DIST quark-3.24.tar.gz 215417 BLAKE2B 496f9055a1f92861f61aee020b6f6a3a09cc0f6f32ba83357c13ffc3d9096bc0b73df0704e08e3204c8baf4d74d1c0d3702e358be05fc5b6b4fa230b7ec3f38b SHA512 a34a3160ab4cfe976cbabd6b2d94cc21ca263c069c53ad6244ed23674e17bf713dc759af998d4ae74720c91ba5e452e3996408d6ae11305bf581eb9a71876a01
-EBUILD quark-3.24.ebuild 1379 BLAKE2B 14d920e43855e6130647afd41078e9a094a448df83fa1322b6d0ffb940afae192b2c4a66f305fda514a495167052603bcf6a22bbb8d39d28d38267c1871db6b7 SHA512 f4544169c56260c373a96684d114cb9e9d71c78e7b873fc79e3d61cd6e271a415adc5cbbb94edc3bd378a315b6d1b4754bc9320c358fd1e5c23e7bd9e985548b
+EBUILD quark-3.24.ebuild 1370 BLAKE2B eedf6590d6c8485657e3bb1cecdcc0c245d956afd66317629e59611a4b94742e3d7505c0b6efc822a1d134b9acdb4af0ecf33e9cb3e429152a95b88d76f62e73 SHA512 adfe0367d2056a8dcee5e5f622a405a8eb9fc9468e4fe108ab4a1b5c320f1a8d18fbf7157910dea96b853c218b71982c9e6b053ae67fb73a656a5fe484c945c8
 MISC metadata.xml 341 BLAKE2B 819d04dd2bb7ab3c7839b0201571c768ac73eff6029ca61ee222924f6d29bb9bc4119713ad8ef337081b40eb9dbe398b1129bf8bbdfc3d8df6d62ad76b9571ea SHA512 acf7dab27e45ec4a03cfc7db8c8728f64830e5b715203f810fc10ad942c1f9b7f1fe149ff8909e842f095bb15334a2665922c2b1430930691e1eec309107abec
diff --git a/media-sound/quark/quark-3.24.ebuild b/media-sound/quark/quark-3.24.ebuild
index 71a2a4351eeb..a64bf6649081 100644
--- a/media-sound/quark/quark-3.24.ebuild
+++ b/media-sound/quark/quark-3.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 # I don't want gnome2 eclass
-inherit autotools eutils fdo-mime gnome2-utils
+inherit autotools eutils gnome2-utils xdg-utils
 
 DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
 HOMEPAGE="https://hsgg.github.com/quark/"
@@ -54,12 +54,12 @@ pkg_postinst() {
 		gnome2_gconf_install
 		gnome2_schemas_update
 	fi
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	use gnome && gnome2_schemas_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 4caa11363958..95c8775d5a50 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -2,8 +2,8 @@ DIST quodlibet-3.7.1.tar.gz 3651908 BLAKE2B dd221aae3af83e7f7b1c535c5294a5262b8b
 DIST quodlibet-3.8.1.tar.gz 3697363 BLAKE2B 67c56281a998d93b2ea457656473ab7fc45a1d4d80aa561fc1946e129ac91a01c65fdb34bd314b5742756708714ac043341cae6ee38e93e37a7a16e3bf481c20 SHA512 5f8f7ba3157dea83782c64989114ad38295c660300284b72e825eba46eae053120c96e60518d573b4010dd49e396a4fe8d04788e632e61e38fa6edd953014275
 DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72708f7b6e260a68e2cfe6e949f44e08df5884f3613804955b18b7284f0140f9d2d409833bd0a139732728903ae978 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563
 DIST quodlibet-4.0.2.tar.gz 4730188 BLAKE2B abe5cdbb6302bf381a7426145c25f6c1e205a2be8ffd801b93ed47e0a23764c142b59cd8de001458ef378fe70523308035517b82bfacbc1213eb7f4a86dcdb7d SHA512 c8c1f823ace03f69fab848f8e312edf9aa1e1e417a843ad2e08d75a0e26a0e095b7050e737be450e5b0b72c7c51b16d1d2143e297dde67bae310b9cdb6f85e3b
-EBUILD quodlibet-3.7.1.ebuild 1673 BLAKE2B 95ff784ef3739dd4f2a11d030af79ce32eb1037730dbda30eb4130304682401141d2632241e33eaa2fa72937190b76e1de78944280123c02824d04959ede06cd SHA512 9c31b63c2387b8b3f57515b5d6e35127f488af5c2308bf9470fa649ecf3819c8a4a391f8cd6c3148a5fd72685bab1f88ba86359881d380dde0f1dbbc458383f1
-EBUILD quodlibet-3.8.1-r1.ebuild 1726 BLAKE2B f713a0edf937ee70567d2ab9dcaf90c138c94e1345d6037ea51620332b4e902aaf0c8ebe674c5b62dc10d3a9b70338f4883f82fdd7900631057a5a27ed2837cc SHA512 96f66cf45c75e536b9ddd55c81baf932e9dd58c356eea676a4011032eedd3456b1a1ea226f36df5137db1cb31ac95d1a9bccb6ab7bf6aef2b23c383ba604544d
+EBUILD quodlibet-3.7.1.ebuild 1664 BLAKE2B 2b21f56d7273061f1c20388896b64ee93b5ade1bbd98dcc7446b3e24094a92a79ece88499c436998c84e12fb532709590e9471620c857d96a457b4d39718d644 SHA512 22b3a19022cfc91dc77fadbfa87e579a938af73e7805df4d304d191ebc3bd1a0d1f6b6624bdb1c4908cf175590b950ab6060fb99937afa83023e38b87d7ce450
+EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
 EBUILD quodlibet-3.9.1.ebuild 1776 BLAKE2B ea30c039fb930d1480943d3e3311318bbc615489833615dacdb20076df7c2ad9d934af518f90b19d7f925cc0e40b2c801ecc12b7fab116bf6e5282be33812f40 SHA512 f80e1e31c053d01dae188726ff2100a2c819e2108119e88374ecd1cee2dc5cda3cb4756f59ad8f442ca0dbcce44394f6c456a37bee84ccfbcea9bed46f869941
 EBUILD quodlibet-4.0.2.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-3.7.1.ebuild b/media-sound/quodlibet/quodlibet-3.7.1.ebuild
index 3732b05d0912..a92aed014d81 100644
--- a/media-sound/quodlibet/quodlibet-3.7.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils fdo-mime
+inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
 HOMEPAGE="http://quodlibet.readthedocs.org"
@@ -61,11 +61,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild b/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
index bbdb1c99bb4e..3862b250cda4 100644
--- a/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils fdo-mime
+inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
 HOMEPAGE="http://quodlibet.readthedocs.org"
@@ -62,11 +62,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 49e2e5b4a8f8..6ba9358d39dd 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,13 +1,11 @@
-AUX server.conf 337 BLAKE2B 9733300367c7ea7da499f494a02bee8fb1a14203746972876b982b953e45b9b0046d931133e0a8d7bbf4bf0de6aaf078dab141dcb41b83a3d82f744f39fb016f SHA512 870acb2cc74b3a48fece9502cc09dcb8a63db8671721c642f1648a305b08b92cccdd883b08e33e28165bf52fa59b5b745f18401ca115deef8fd9f3b190bfc750
-AUX systemd/teamspeak3-r1.service 505 BLAKE2B 4fee78f7f5d2d33a53b5314894ed7a0665bdd7cfdf8247fff29d0c020b457181c45c03d5dc8498fffd9462a844573f487d177e26ba1adbef162b1bd1b239a8d4 SHA512 28b2b0b1d7fe0b0ccb185446711e98ddb464360061597a90283513f122076fecac47198bc08c4c12e920f008472a4e8f6db7d79a27c711202a7167f05bed78ad
-AUX systemd/teamspeak3.conf 133 BLAKE2B 0bde30391dfb09a37c203ad8440b279cac89e9fba37522bc1fb6a71c1d8ec746f39c1f260b7b456d1c8e05aa46117f3a06f7ceb7319211219e5dc4e4c44c7e5a SHA512 49dab025ab37bb29e14a14fb070568c5710fe257a35fe6b887aa404847fc828e9ffecad7c5d10e987128934c433c3b464b8da0e4891ba3b48868b73abb4b9a4c
-AUX teamspeak-server-bin-init-r1 1025 BLAKE2B b380910b0e1ab728f20d7d2f84fad258586a3df322246034eaddb6fe93a46251881c46877f36f213b0929fe7d152c0303db1788f108067d52bcbfa36385d5d36 SHA512 8aed2b27a658ad62389b445cf8ce4b6215ca106d58ebad378a0c403b4a2b9c41f2b0f3129ba020289b878bb96dc65b50974fd30f56e90435fc8a0903f1557f48
-AUX ts3db_mariadb.ini 98 BLAKE2B 3b47d9a4f85c60e2d660e4790357ef9f3b2fc75aed798e518e48159407188aac912e2159bb2537a3f489557121ddc3cfd0859224269eb66604e00bd776768b73 SHA512 d2d1ef64c90638fde3cc587d351987b16e96d8cfc83672dee43c0294ab297b83106e682d834008f0213b67b975dadcd4f77c63332c39d155a4125a28206ba7d4
-AUX ts3server 267 BLAKE2B 54b6ff156cd6889deebc6443f55ef08d8a05c51d3a2ccb83f141202412dc23d9232027a200731ca9ef75bf15be8ab5fd5af966244ff4673b8fdbca06ed105ecd SHA512 632297afee021b1603efff9c4070ddeaa10531cab4faa21bc61e259e9109f4d9bc338347da2a435492f509628baf7a8876b3bc7c5a91cb5f81f0c97f8d634c57
-DIST teamspeak3-server_linux_amd64-3.0.13.6.tar.bz2 6492488 BLAKE2B 4cad8545968423c2e65853d73f99a46cbccce628982c0a4418eaf34802d6a171f7e89a4ffc2fbd9fd82afdd9ffcd58d214c894ad88862c2927f1aec72f2d3087 SHA512 95271e5a44c7a14b8fbe134b855973c1af53ac76e6ba01089116b1f63c03bae25f5abfd176f9e26207aa4da8501d646298128078ab5b475458a7ccaba2a48e9c
-DIST teamspeak3-server_linux_amd64-3.0.13.8.tar.bz2 6916065 BLAKE2B 0ff4d86a03c910739f27b624d023ba3a5f323f4d56bca6a29a5ce8a737901372ff22cf18f2cc589af07b373fd17f952896ae2aa623571fc004a653125772aa0b SHA512 d8985f5850602660a6c037c1768a97c79b5842640d618ad00d242035a12820b52ba959545f3e668eb3d6079b1a228ff648c569e7d1fc64be6743ee77995ab0be
-DIST teamspeak3-server_linux_x86-3.0.13.6.tar.bz2 6367104 BLAKE2B eeeefe664018e6072e1832d1fc22c24604cf230166269ac63a73cde02fc3e78cbdc3cf6e28dca37d8152e146bbb53489af1e3706fc98047c2389ad97053116f3 SHA512 a35e0fffe320206f2ca19153bd46a910bd1690541c83ec3c784fe1f4aaf8dbe430556990f6ebe0efbe71e52d3887b725da4e659db9d1e3c96fd6fd46e6dcd40d
-DIST teamspeak3-server_linux_x86-3.0.13.8.tar.bz2 6772664 BLAKE2B bde804a069a2700981656860f10d70a45511793370c978c0fc0c3926f039df367d61536657db987c6cc57e8aef543210527e9ff6e8316a5e78319dbd2f874c56 SHA512 7ef5d5d0fa2a1244011c2a68662481e4859aa1660e967b203a508497a4fd3c54db44a9f33116ed4932745942df4b5e4c646658346f288ce6191e3e5629d9638f
-EBUILD teamspeak-server-bin-3.0.13.6.ebuild 2589 BLAKE2B ed81f294c9f15a6d58bc29bdca432a1bcfd72bec8b84c7df524a4116a458f32ee390552be00714346c5e8396a124e028ac98e03b87c3185cbd80af2a806771e9 SHA512 52c6c4cd6eab65c1354887024e45875e975effbe003a60b49c21b101df7abc90ada71984f8000af4221b897a71734fb8274a392527e555245d715c6d972224f0
-EBUILD teamspeak-server-bin-3.0.13.8.ebuild 2589 BLAKE2B f66cd00c651ca5c000b64fbcb5a2b9ae30039455789eeeb6b14a7ce2cb54f3af66f7812a008b4a0269aab6acaa3c1e684255fdefe06be752e7a808efff4c723f SHA512 26688cca026f2d9aa6c5bad4bb540b4f0bf85ca267c3a67e6d702d9e73a8d227b86c68a6bdda966ca4aea9025c99ad09bbfd280bd2e6dc866a9ee3cd0912f35c
-MISC metadata.xml 523 BLAKE2B 633c679661b79b125ca2c0fbdb0ba66ad96e62e66dc2d7e68b75ac800568d2fa1b495385ca4eaf0a0209e6afbec59c90bc3490eea2964c28c6d6df035c6204dc SHA512 c3a7d1accdf12312319f7cf573dc82454b3ffa5201e3c243abcb1f582267f0523e250954cd4894954bcd729d272d0f10af6bf76a73aa421c3fc6a9d438a4d897
+AUX teamspeak.initd 1094 BLAKE2B b9332ff2e24922992a2ea6bf11ddbc7ab07d5c3e61de59ddd2be2343ce38facb529b81c86fc7bb45eb9b3ead0569201accd259c07c52b20da8368f1beb7873bc SHA512 f7c2b3f555bab16caba59d501c64e5cf809ec4fbd81fe9bfbea3f5db0d9689a1cc89f5ebebc631d4e67b24ad5c4bba9343267746b0dbbdd827f00f5444eb6737
+AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7d01c8931a18bf63615b0a125dec420f35e2517dacfd760750957997fcf58e69bcd2ca0721b4e2054ae SHA512 a31633591ae97224f3aefef25ed9d50e6cedf252c94559f7c424065ae815e0724c75e1c71337283933283cc77626d106ba5e15f3cce5c5dfddfc74a1f99160ba
+AUX teamspeak.tmpfiles 131 BLAKE2B a6bad602a95e98b46f55b06dc398bd9757b9e4b3aacc511295c2121790e8decd63a6ccae9d60ff915959cc4bbdb494eeeb5eb42f182f1b24b32bc7c5cceee3a7 SHA512 ecede9a97cf7701cbc96508ab8ed7cee0c4c041c45e48e3e53d5c3696458540ea00c81fb9a57e72d09839a96d808c287494b2a0629f143b6686f0291e046ec79
+AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
+AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
+AUX ts3server.ini 538 BLAKE2B 10dd1ca73bf81fb53832f1e6d4e763aae965102f93ff12b057672b3b201a281bca009cf22481bf5b1fcf09af49b120f7eda9b21c85686f15af25d1968c62c23c SHA512 bd03d3de15625009aa2cfb49b8dc0f2a4832ee8cf1d76b869a8c1da7882e500df8d07ab19a94035ffaaed32a9bff6545c42d8dd25086f60dd7804f72b8f36974
+AUX ts3server_mariadb.ini.sample 556 BLAKE2B e7ea14b839f4e41c67726f9167cab198673d5a1109085b44fbcfe87e1c7f4a79670cec512b59c16fc4d08bc8377de9ba3802b72695bbb564b70405b783ba99e9 SHA512 ee74ef7e4bd7ceec81584586a20fe688d74171541154a13db55ae9fb7cfd210a13b6821aa3668edb76a13035263e30ffa94abbfa55ccc390315568663d6e6e2d
+DIST teamspeak3-server_linux_amd64-3.1.1.tar.bz2 7798155 BLAKE2B 4962968b33eaaa07043cfaa23d020d3d7dcff19b9e380f797196d382a4d004fb0ca2a56246eedf246f796e1bea8f719e80e715b2eda67e5340b7042dd1111a57 SHA512 8561cbeb16a44889ddaa6ab054b47abaaa6a5c942f39c308f6afd2687110bc9e142a8711afe557fa22fe92d1395b844a0eff8c8043921aee4e8070571bee6e44
+DIST teamspeak3-server_linux_x86-3.1.1.tar.bz2 7658201 BLAKE2B 1625200a625ad7615241341846e992de8567c7fa7f6fbeb5234953ab696d60809591f870157e947b06953cb421019c7d0cf920bd0ba65968c4178284b0154206 SHA512 952e2e5d467f68b6f5f0bfc0e4f5a71917c2c14809aeccc64038679e6fd7a20f0794e0662f7a2fec1827a5a99249d1df3a673fb53e324524b4320c64083608c6
+EBUILD teamspeak-server-bin-3.1.1.ebuild 3646 BLAKE2B d6b39d6fc98dbd4e0e407d07745c5a90e6a937abf294a34037e741b17884956fe870bf11a8f421dc3546959baa3fe76ac668e980bfcdbaba4b209776c344f61e SHA512 af844cb9889a8bdc9c0156a9619e2499efac40c8bf5fa3e7e88d961e771494d822fa5c231b33cfd6c7204722c9f89012d2a54e5fee927efbbd1dd920342b9364
+MISC metadata.xml 659 BLAKE2B 77a9ce51277977d958712db9e729c1c6517ad29a3c87b0f775fe7c414273cf3fee43ca070894065949f766a22019af72e7a1a23fcbacd4641fa8c43571aa6a7f SHA512 2404a4075934843c4599d42c99e6042f99d9131066c9ec4a36ca08f361d01c9c15050676dc7760a34eff1a173be41cfd91c270fe616696dd36b08cae4f7fda53
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
deleted file mode 100644
index 435325bb89f7..000000000000
--- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=TeamSpeak 3 Server
-After=network.target
-
-[Service]
-Type=simple
-Environment=LD_LIBRARY_PATH=/opt/teamspeak3-server
-WorkingDirectory=/opt/teamspeak3-server
-ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
-ExecStart=/opt/teamspeak3-server/sbin/ts3server-bin inifile=/etc/teamspeak3-server/server.conf
-ExecStop=/bin/kill -15 $MAINPID
-StandardOutput=syslog
-StandardError=syslog
-User=teamspeak3
-Group=teamspeak3
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-
-# vim:syntax=dosini
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1 b/media-sound/teamspeak-server-bin/files/teamspeak.initd
index 44b7b7c6f946..cc8393b58db7 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.initd
@@ -1,11 +1,14 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+command="/opt/bin/ts3server"
+command_background="true"
+group="teamspeak"
+inifile="/etc/teamspeak3-server/ts3server.ini"
 name="TeamSpeak Server"
-command="/usr/sbin/ts3server"
 pidfile="/run/teamspeak3-server/server.pid"
-command_background="true"
+user="teamspeak"
 
 depend() {
 	need net
@@ -20,17 +23,17 @@ start_pre() {
 	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
 	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
 
-	checkpath -d --owner teamspeak3:teamspeak3 --mode 0700 /run/teamspeak3-server
+	checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server
 }
 
 start() {
 	ebegin "Starting ${name}"
 
-	start-stop-daemon --start --quiet --background \
-		--pidfile "/run/teamspeak3-server/server.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/usr/sbin/ts3server" -- \
-		inifile="/etc/teamspeak3-server/server.conf"
+	start-stop-daemon --start --quiet --background --env "TS3SERVER_LICENSE=accept" \
+		--pidfile "${pidfile}" --make-pidfile \
+		--user "${user}" --group "${group}" --chdir "/opt/teamspeak3-server" \
+		--exec "${command}" -- \
+		inifile="${inifile}"
 
 	eend $?
 }
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak.service b/media-sound/teamspeak-server-bin/files/teamspeak.service
new file mode 100644
index 000000000000..0c77e4cbe756
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=TeamSpeak3 Server
+After=network-online.target
+
+[Service]
+Type=simple
+User=teamspeak
+Group=teamspeak
+WorkingDirectory=/opt/teamspeak3-server
+Environment="LD_LIBRARY_PATH=/opt/teamspeak3-server"
+Environment="TS3SERVER_LICENSE=accept"
+ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+ExecStart=/opt/bin/ts3server inifile=/etc/teamspeak3-server/ts3server.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf b/media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
index c83afe3137cd..1b1d7f0e9902 100644
--- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
@@ -1,4 +1,4 @@
 # systemd tmpfile settings for teamspeak3-server
 # See tmpfiles.d(5) for details
 
-d /var/run/teamspeak3 0755 teamspeak3 teamspeak3 -
+d /var/run/teamspeak3 0755 teamspeak teamspeak -
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
index 7cdc6d6075ab..0a8ebc47df1f 100644
--- a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
@@ -4,4 +4,4 @@ port=3306
 username=teamspeak
 password=teamspeak
 database=teamspeak
-socket=
-\ No newline at end of file
+socket=
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
deleted file mode 100644
index 261b47171b3d..000000000000
--- a/media-sound/teamspeak-server-bin/files/ts3server
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-BASEDIR="/opt/teamspeak3-server"
-
-export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-
-# work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
-cd "${BASEDIR}"
-
-exec "${BASEDIR}/sbin/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/files/ts3server-bin b/media-sound/teamspeak-server-bin/files/ts3server-bin
new file mode 100644
index 000000000000..3deb9dd87e5f
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server-bin
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Sets BASEDIR for teamspeak3-server
+BASEDIR="/opt/teamspeak3-server"
+
+# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+
+# Launch teamspeak3-server
+cd "${BASEDIR}" && exec "${BASEDIR}/ts3server" $*
diff --git a/media-sound/teamspeak-server-bin/files/server.conf b/media-sound/teamspeak-server-bin/files/ts3server.ini
index 0fd2db66c508..962c8b80f0ad 100644
--- a/media-sound/teamspeak-server-bin/files/server.conf
+++ b/media-sound/teamspeak-server-bin/files/ts3server.ini
@@ -1,14 +1,23 @@
 machine_id=
 default_voice_port=9987
-voice_ip=0.0.0.0
+voice_ip=
 licensepath=/opt/teamspeak3-server/
 filetransfer_port=30033
-filetransfer_ip=0.0.0.0
+filetransfer_ip=
 query_port=10011
-query_ip=0.0.0.0
+query_ip=0.0.0.0, ::
+query_ip_whitelist=query_ip_whitelist.txt
+query_ip_blacklist=query_ip_blacklist.txt
 dbplugin=ts3db_sqlite3
 dbpluginparameter=
 dbsqlpath=/opt/teamspeak3-server/sql/
 dbsqlcreatepath=create_sqlite/
+dbconnections=10
 logpath=/var/log/teamspeak3-server/
 logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
diff --git a/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample b/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample
new file mode 100644
index 000000000000..94cea8bbe9d8
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample
@@ -0,0 +1,23 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_whitelist=query_ip_whitelist.txt
+query_ip_blacklist=query_ip_blacklist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=ts3db_mariadb.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_mariadb/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index bde7c6989faf..67ae94b5f922 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -11,6 +11,8 @@
 	</maintainer>
 	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
 	<use>
-		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
+		<flag name="doc">Install TeamSpeak complete documentation.</flag>
+		<!-- <flag name="mysql">Install TeamSpeak MariaDB support.</flag> -->
+		<flag name="tsdns">Install TeamSpeak DNS.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild
deleted file mode 100644
index 8f9f1fcb9fb1..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib systemd user
-
-DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="teamspeak3 GPL-2"
-IUSE="doc tsdns"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="installsources fetch mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
-
-QA_PREBUILT="opt/*"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	# Install wrapper
-	dosbin "${FILESDIR}"/ts3server
-
-	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-	exeinto ${opt_dir}
-	newsbin ts3server ts3server-bin
-	doexe *.sh
-	doins *.so
-	doins -r sql
-
-	# Install documentation and tsdns.
-	dodoc -r CHANGELOG doc/*.txt
-	use doc && dodoc -r serverquerydocs doc/serverquery && \
-		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
-		docompress -x /usr/share/doc/${PF}/serverquery && \
-		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
-		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver tsdnsserver
-		newdoc tsdns/README README.tsdns
-		newdoc tsdns/USAGE USAGE.tsdns
-		dodoc tsdns/tsdns_settings.ini.sample
-	fi
-
-	# Install the runtime FS layout.
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
-	keepdir /{etc,var/{lib,log}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
-
-	# Fix up permissions.
-	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
-	fowners teamspeak3 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
-
-pkg_postinst() {
-	einfo "Starting with version 3.0.13, there are two important changes:"
-	einfo "- IPv6 is now supported."
-	einfo "- Binding to any address (0.0.0.0 / 0::0),"
-	einfo "  instead of just the default ip of the network interface."
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
deleted file mode 100644
index 60875a3cb837..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib systemd user
-
-DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="teamspeak3 GPL-2"
-IUSE="doc tsdns"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="installsources fetch mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
-
-QA_PREBUILT="opt/*"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	# Install wrapper
-	dosbin "${FILESDIR}"/ts3server
-
-	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-	exeinto ${opt_dir}
-	newsbin ts3server ts3server-bin
-	doexe *.sh
-	doins *.so
-	doins -r sql
-
-	# Install documentation and tsdns.
-	dodoc -r CHANGELOG doc/*.txt
-	use doc && dodoc -r serverquerydocs doc/serverquery && \
-		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
-		docompress -x /usr/share/doc/${PF}/serverquery && \
-		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
-		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver tsdnsserver
-		newdoc tsdns/README README.tsdns
-		newdoc tsdns/USAGE USAGE.tsdns
-		dodoc tsdns/tsdns_settings.ini.sample
-	fi
-
-	# Install the runtime FS layout.
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
-	keepdir /{etc,var/{lib,log}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
-
-	# Fix up permissions.
-	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
-	fowners teamspeak3 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
-
-pkg_postinst() {
-	einfo "Starting with version 3.0.13, there are two important changes:"
-	einfo "- IPv6 is now supported."
-	einfo "- Binding to any address (0.0.0.0 / 0::0),"
-	einfo "  instead of just the default ip of the network interface."
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
new file mode 100644
index 000000000000..94b2f7e25561
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user
+
+DESCRIPTION="TeamSpeak is 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-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+
+LICENSE="LGPL-2.1 teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc tsdns"
+# IUSE="doc mysql tsdns"
+
+# RDEPEND="mysql? ( dev-db/mariadb-connector-c:0=
+#		<dev-libs/openssl-1.1:0=
+#		sys-libs/zlib )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}/teamspeak3-server_linux"
+
+QA_PREBUILT="opt/teamspeak3-server/libts3db_sqlite3.so
+		opt/teamspeak3-server/ts3server"
+
+pkg_setup() {
+	enewgroup teamspeak
+	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64; then
+		mv "teamspeak3-server_linux_amd64" "teamspeak3-server_linux" || die
+	else
+		mv "teamspeak3-server_linux_x86" "teamspeak3-server_linux" || die
+	fi
+}
+
+src_install() {
+	# Accept license
+	touch "${T%/}"/.ts3server_license_accepted || die
+	insinto "/opt/teamspeak3-server"
+	doins "${T}"/.ts3server_license_accepted
+
+	# Install binary and wrapper
+	exeinto "/opt/teamspeak3-server"
+	doexe "ts3server"
+	doexe "${FILESDIR}/ts3server-bin"
+	dodir "/opt/bin"
+	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
+
+	# Install libs
+	exeinto "/opt/teamspeak3-server"
+	doexe "libts3db_sqlite3.so"
+
+	# Install sql
+	insinto "/opt/teamspeak3-server/sql"
+	doins "sql"/*.sql
+	doins -r "sql/create_sqlite"
+
+	# Install config
+	insinto "/etc/teamspeak3-server"
+	doins "${FILESDIR}/ts3server.ini"
+
+	# Install init script and systemd unit
+	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
+	systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service
+	systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf
+
+	# Install optional mysql
+	# if use mysql; then
+	#	insinto "/etc/teamspeak3-server"
+	#	doins "${FILESDIR}/ts3server_mariadb.ini.sample"
+	#	doins "${FILESDIR}/ts3db_mariadb.ini.sample"
+	#
+	#	exeinto "/opt/teamspeak3-server"
+	#	doexe "libts3db_mariadb.so"
+	#
+	#	insinto "/opt/teamspeak3-server/sql"
+	#	doins -r "sql/create_mariadb"
+	#	doins -r "sql/updates_and_fixes"
+	# fi
+
+	# Install optional docs
+	if use doc; then
+		local HTML_DOCS=( "doc/serverquery/." )
+
+		docinto "serverquery"
+		dodoc "serverquerydocs"/*.txt
+
+		docinto "ts3server"
+		dodoc "doc"/*.txt
+	fi
+
+	# Install tsdns
+	if use tsdns; then
+		exeinto "/opt/teamspeak3-server"
+		doexe "tsdns/tsdnsserver"
+		dodir "/opt/bin"
+		dosym "../teamspeak3-server/tsdnsserver" "/opt/bin/tsdnsserver"
+
+		insinto "/etc/teamspeak3-server"
+		doins "tsdns/tsdns_settings.ini.sample"
+
+		docinto "tsdns"
+		dodoc "tsdns/README" "tsdns/USAGE"
+	fi
+
+	# Install docs
+	einstalldocs
+
+	# Keep directories
+	keepdir "/etc/teamspeak3-server"
+	keepdir "/var/log/teamspeak3-server"
+
+	# Protect config
+	# if use mysql; then
+	#	echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die
+	# else
+	echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die
+	# fi
+	doenvd "${T}"/99teamspeak3-server
+
+	# Set permissions
+	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
+}
+
+pkg_postinst() {
+	elog "If you have a Non-Profit License (NPL),"
+	elog "place it in /opt/teamspeak3-server as licensekey.dat."
+}
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index b9f75b7f2a1c..a8a570718c42 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
-EBUILD twolame-0.3.13-r1.ebuild 1278 BLAKE2B c05844c52abfcb8efe905b6dce55f1edd0debbebf9bb34045868f14668febdee46b2fcbd4e874187b6063ac398c73becacceae53197819a7ab5b9aa2ff097f2d SHA512 7bd73ac55b501c24bd9d46946412bdd784e3d11036863b185f81f8a91d1ebdbbc0a12ab9567e8dc5cd1335f61aa6276c976db34464d474905192835cb2a4e8c3
-EBUILD twolame-0.3.13-r2.ebuild 1393 BLAKE2B df7c0109fae2d4b9d6fb357145dc32bf4fd9cef3363c96511affab105f8503f03ee93a647fcd40b6fa49e5f72a2132bbcf6bd81ee339a3dda37be2441aa97391 SHA512 a0d18fe1e99b965372f5b30e3f5fb16e6120155c479c4ab8b21ebbadeedcd70ebef8a50731333e70c9b38a588f7daa434c8ecc8e34fde418175651dd6cb3a463
+EBUILD twolame-0.3.13-r1.ebuild 1146 BLAKE2B 6c17c95181b776543a337aa300a3625af37a28175b8b243a1b88b54f87c6389a892bf81f91d94940e8ba149dcd20bf4b5da56cf96d08bedb5a2f60125a84acb1 SHA512 4735e199fa1b0482db53b121de62f4078d0dacacb46878fa380ebb75f627aeff7b28cf90c0f8486b2fedc34ba5e1f5dd8fff9c0dff5879bf3f44a1e1f6940e5a
+EBUILD twolame-0.3.13-r2.ebuild 1261 BLAKE2B 20a6322e8e62e9f8a4d7b5cd26db1278062cd3079821a161fcb61c83136cf0441e47a2fc9671c05b4e608d4d9b083db68014d5dfdd6866e015b3a4577e315479 SHA512 3287ad1c81f237be46ef79a2197e0d7d22edf805da6cec5360be8319c46edc9a5144e944b388f82d3fb0a0813705bb62ea037adf4fb841b36f486db741a550a4
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r1.ebuild b/media-sound/twolame/twolame-0.3.13-r1.ebuild
index 72f6a6d3ffdc..f3080949bd24 100644
--- a/media-sound/twolame/twolame-0.3.13-r1.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r1.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm 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="static-libs"
 
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index d2ba75d3fbe3..e9b23313266b 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -14,9 +14,7 @@ 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"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 365e4c44ce3f..0457eb2e50b6 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,4 +1,4 @@
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0.ebuild 884 BLAKE2B b356fee5d8b7006854806c5584e204307714468c3b6aa315337cc409497f63696d43b2d6cf184ff2abbfad35f188bb91ad3797da55bf026b032bc87b8e4a85b8 SHA512 fd4076f6c43c366065059ae0184a8e067cb7e532a9a70b90e51988fe4d95f944db3c1c33d203c4e5146be6e9652d8bf170d909374886792151c5e773ab0bc040
+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.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
index 90e2d630992f..acc5b7de9845 100644
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 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
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
index b32d3c1f5c37..1aec516feab5 100644
--- a/media-sound/xnoise/Manifest
+++ b/media-sound/xnoise/Manifest
@@ -1,4 +1,4 @@
 DIST xnoise-0.2.21.tar.gz 3222030 BLAKE2B c58561f4e042ccf7d7fdeb271801ccc2d447138cf5c1afb2f8f0bb098135d957aa289799e59f2c96a76a01ccfeeb9574d87f0d987b1e3ace9d22a3ced8ec88b9 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851
-EBUILD xnoise-0.2.21.ebuild 1608 BLAKE2B 4848a52526f1fa241013763531a4f222bc0a769fca88ec3cf2a6e7200d6f2ab813f65a980f4584293231a8c5bb98d3416161260022359eb0cc6ad39fa5e32dbe SHA512 e5dee0cedd451ce78f16ed0a8628ad84e5ab07a1893dace4b6932ead1a1f68f436252f80b834ecf7988438928ab3e3b372f64dea91c79080358935e72378126b
-EBUILD xnoise-9999.ebuild 1689 BLAKE2B 11380209dc78f8cd4e9dcfd76b61a1879a034bf51aa2e55fcaffc253f9e697ca7a39a02b98c526ee0a54ff4d9dca62de2cd050e7644893c38f71e62fa465f77c SHA512 23462598c5cbd82c32e072bcc6eba82e2ffd2b8798d386aedc96844ff6d0e9ef535dc2c4113eab98dfab3ed80b0ced6305b14cc2296eb3530c17ff03e4c089d4
+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-0.2.21.ebuild b/media-sound/xnoise/xnoise-0.2.21.ebuild
index f5abf7d7f05f..d5590f18edb4 100644
--- a/media-sound/xnoise/xnoise-0.2.21.ebuild
+++ b/media-sound/xnoise/xnoise-0.2.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-inherit fdo-mime gnome2-utils
+inherit xdg-utils gnome2-utils
 
 DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
 features"
@@ -63,11 +63,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/xnoise/xnoise-9999.ebuild b/media-sound/xnoise/xnoise-9999.ebuild
index 9d103460ed61..386d1f993e88 100644
--- a/media-sound/xnoise/xnoise-9999.ebuild
+++ b/media-sound/xnoise/xnoise-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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 fdo-mime gnome2-utils git-2 vala
+inherit xdg-utils gnome2-utils git-2 vala
 
 DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
 features"
@@ -69,11 +69,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
commit	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree	b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /media-sound
parent	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)