From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 17 Jan 2020 22:43:15 +0000
Subject: gentoo resync : 17.01.2010

---
 media-sound/Manifest.gz                            | Bin 61751 -> 61743 bytes
 media-sound/din/Manifest                           |   2 +-
 media-sound/din/din-43.0.1.ebuild                  |  16 +-
 media-sound/fluidsynth/Manifest                    |   2 +-
 media-sound/fluidsynth/fluidsynth-2.1.0.ebuild     |   4 +-
 media-sound/helm/Manifest                          |   2 +-
 media-sound/helm/helm-0.9.0-r1.ebuild              |   4 +-
 media-sound/qmmp/Manifest                          |   4 +-
 media-sound/qmmp/qmmp-1.3.4.ebuild                 | 167 ---------------------
 media-sound/qmmp/qmmp-1.3.6.ebuild                 | 167 +++++++++++++++++++++
 media-sound/qtractor/Manifest                      |   6 +-
 media-sound/qtractor/qtractor-0.9.11.ebuild        |   4 +-
 media-sound/qtractor/qtractor-0.9.12.ebuild        |  67 +++++++++
 media-sound/qtractor/qtractor-0.9.9.ebuild         |  79 ----------
 media-sound/teamspeak-client/Manifest              |   1 -
 .../teamspeak-client/files/ts3client-bin-r1        |  13 --
 media-sound/teamspeak-server/Manifest              |   3 +
 .../teamspeak-server-3.11.0.ebuild                 | 119 +++++++++++++++
 media-sound/timemachine/Manifest                   |   5 +-
 .../files/timemachine-0.3.3-underlinking.patch     |  25 ---
 .../timemachine/timemachine-0.3.3-r1.ebuild        |  41 -----
 media-sound/timemachine/timemachine-0.3.4.ebuild   |   4 +-
 22 files changed, 381 insertions(+), 354 deletions(-)
 delete mode 100644 media-sound/qmmp/qmmp-1.3.4.ebuild
 create mode 100644 media-sound/qmmp/qmmp-1.3.6.ebuild
 create mode 100644 media-sound/qtractor/qtractor-0.9.12.ebuild
 delete mode 100644 media-sound/qtractor/qtractor-0.9.9.ebuild
 delete mode 100644 media-sound/teamspeak-client/files/ts3client-bin-r1
 create mode 100644 media-sound/teamspeak-server/teamspeak-server-3.11.0.ebuild
 delete mode 100644 media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch
 delete mode 100644 media-sound/timemachine/timemachine-0.3.3-r1.ebuild

(limited to 'media-sound')

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 753a2107b40c..df5257dd30f4 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 0c0461318a11..7d591d234b19 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,5 @@
 AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
 AUX din-43.0.1-makefile.patch 552 BLAKE2B c73746b64789dc54f4186777d507fc77c9a0b25e025be4adb48c4620adf4560ef600a445a8822ac045b0a39b4003c5b9007b5a36ed97fd61cdc6a1b8d96bdf74 SHA512 408d71e3b1e262eb83cc6cf0cd3ab4ee164bb9a6fda5244a6445d627c53b23e3d3d3e64bfb9f2c69e8168ecda0a46f8b4768100710f219a8b78325d238af4207
 DIST din-43.0.1.tar.gz 3644254 BLAKE2B 6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6 SHA512 14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
-EBUILD din-43.0.1.ebuild 1129 BLAKE2B 7cf6804cb88ca8b101a13083316377cd845737469eacf2c2c5382f4ddb8f7e0771858620e14a762d17a272bfd280ac2e7141642972ac66c5ecd1fb32d6b56817 SHA512 bded33507a5b15c1688a8c61ba3b114a5c7a48f0edc57646f7940e4c652d9c2b2f5e3edbb16e48f3ece033637351206c08f2a9200e10c2f37725fa128ad85c5e
+EBUILD din-43.0.1.ebuild 1064 BLAKE2B 835426d6c379194d6a1a9463b227107c18b56dfdc2c6eaade8363bf80303ceb7418d708dae2f4b9f708e28a961facd1b9b1fb1af0e5bcf043ffef6479abf4c28 SHA512 d451623afd2bb66c7b3f5945aef5421de8db11273d755515e428129133281bfdc87a36d00989890a4656e4844f9c4f78a79858755fdf03f17eebe1632202272a
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-43.0.1.ebuild b/media-sound/din/din-43.0.1.ebuild
index 1dda28bdfe0a..b8471d76fd37 100644
--- a/media-sound/din/din-43.0.1.ebuild
+++ b/media-sound/din/din-43.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools xdg
+inherit autotools eutils xdg
 
 DESCRIPTION="a software musical instrument and audio synthesizer"
 HOMEPAGE="http://dinisnoise.org/"
@@ -14,21 +14,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+alsa jack"
 
-BDEPEND="
-	app-text/dos2unix
-	virtual/pkgconfig
-"
-CDEPEND="dev-lang/tcl:0=
+RDEPEND="
+	dev-lang/tcl:0=
 	media-libs/libsdl:=
 	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 "
-RDEPEND="${CDEPEND}"
 DEPEND="
 	${RDEPEND}
 	dev-libs/boost
 "
+BDEPEND="
+	virtual/pkgconfig
+"
+
 REQUIRED_USE="|| ( alsa jack )"
 
 PATCHES=(
@@ -39,7 +39,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	dos2unix pixmaps/${PN}.desktop || die "Failed to fix desktop file"
+	edos2unix pixmaps/${PN}.desktop
 
 	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
 
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 86dae483fa76..a8ff8e6f5bd6 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -3,5 +3,5 @@ DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e670
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
 EBUILD fluidsynth-2.0.4.ebuild 1960 BLAKE2B 3c837ac65f448c3706e9e12e34c39c6bace524b33e521e36a2d8c86c34a57e6d6361ec4fec27c585418b91e399ba502cf076e6f45442673db9b793f11b47bc6f SHA512 6d092fedb5994a354d0002412775d3ef5729394692ee944248d2e89e0bc15d76dd17259b7391bece108a11cd956808573c3d68a44dd0529b555cca6ff4269a44
 EBUILD fluidsynth-2.0.7.ebuild 2538 BLAKE2B ce7275797d9a3fb38ff3b95e753d4ba81d5c11f3cb84c9213cf96847d2c6dd408f3039eb928218e999b9e358f2e92c2b79f3f12dd85174eb53ae6eaf5ed9822b SHA512 9529008829a8d0829404d1ef85aa622cd833d034bafba538d527a9c0a380513ef8483eb8c8d4e40b096ecc16841ec70381546e0f0f06e165240ba8f5d93e15a1
-EBUILD fluidsynth-2.1.0.ebuild 3309 BLAKE2B dc57c8cfc6e0118e3cb4d8f5f0c8dd1ff705cab6bc48e53294d92b581dbb70c3d0f84fa0c0537a277f1792f76ae66ef8cc7c4399a642ad1403b05b8157d3e889 SHA512 671ee7daf9c7f650dcaeec5674a79e47c477e6243305e1c88f8de29656dde31e14b60e80f1b958d0c8e4f93282d49ee557af2a998cd9622c9a97aa99f512ca5c
+EBUILD fluidsynth-2.1.0.ebuild 3304 BLAKE2B 379b54d6ab6066f0440c94de9f583ef8463e996ace6467ed42451db333ad4ea98a2ad84def772107887a944c1b1362a8290fcbc7bdbcf5a5228ce157521cdf38 SHA512 4f5ba4a3305dd07278c4fd6d0fa40724c1a50e49520043b39084cd30faef2689f143a375bbdd631ffbe8b2f5a522dd0c56cc1f4545673cad17199e4f2091e4b2
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index 48e460715cb6..b6712b9612e5 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
index beb4b64561b5..11b87752b5e8 100644
--- a/media-sound/helm/Manifest
+++ b/media-sound/helm/Manifest
@@ -1,5 +1,5 @@
 AUX helm-0.9.0-fix-gcc91.patch 6514 BLAKE2B 54c3c5baf336ee1c2739922be6040d69309db94394967be335103fe325c96afe69f05fbdde0516c153bc47763fc3686c9e0461c6b12dbec59476c85a003e4397 SHA512 4c12575c6a58c6a03644b9c7d560e3a794fa3575ac10eb9301ca911a58a86eb5c721f0e4c8c1c5bfcf81b6efba25ed7bdba2a12fe68ec49eb18581067cec06bb
 AUX helm-0.9.0-nomancompress.patch 698 BLAKE2B 3b68312c117fb8c1e8496ae02145a66466849de77d51159064b65e51b208b503530ac5b92c1a50e4e8fdc6113121bd26ca20e491adde72f1f1b5b626258c92ec SHA512 e2b0143be141e26a093369c151a87d002508442543482d81e4b67f67475232ec53bc80e11ecad096952e4941efc82889b8cf267a0bfebb13104204b02a50aaed
 DIST helm-0.9.0.tar.gz 15544141 BLAKE2B 1b6811f32cf36a1c1f954cc071cd64f3dca656ee0bd420c01d0be3db516210a92adc3694ac49731cf2d7cf057a9eccf2c2dcefc14d24cf8582a3eb69efe1d0e1 SHA512 241c6bf3aec422e9ccaf7c7113eec7e30a11baadd30fe8f05f0abfac9c41d0c8a9fb284f0cae49bcaf0d3d08aa952737f6ff3eb7d48c2b2e22c60932738aeaa4
-EBUILD helm-0.9.0-r1.ebuild 1083 BLAKE2B 38b265a113f4d5c58ed5cfdf3b3417c73e3b4574ecf3c1459bdbde0d3101eea18722aac7c8f094ec32a446c894c9ded20e3c6ba032d7b485e14f3bc57e2b3631 SHA512 1127924b80d77682b174b9fb0e0e91b39061fe05a144e25b98e38da2c0175dbef7057658595e68cea6322bfa215d87c1ad15f74d0bb0d8523d2238b8bae0d022
+EBUILD helm-0.9.0-r1.ebuild 1082 BLAKE2B 369e46465cebda9688ce332d36cbeb42a5f1c21d1b90a43bf0853744fd7e64618b58d40825a94755794e9fcf98b4278bfac4595ead361b35070aff1625a6a3a1 SHA512 674efef8d4fc8d579093d551f7df10b4d0227f89e2595bd53931ddadd837fc9106f98322887ec6ba976350f352916ff3f315ee2a31a5247d040b3346a32098b1
 MISC metadata.xml 345 BLAKE2B d09e73c628cf4bd16d554753a7dd3b46be36821bed7e601ab0b2e73ef49a5c102b9330379ec24409c6b724f05271b5319a7fe334b800dd8f8e8baa8aa2b58c03 SHA512 108d91618be46a32b2c316336b1a109494a19882ca250d92a0c189093ebae632729bc67cb023370ae0fc7ff5f32d5d6bd32a2d64a985f1c66c7eeed1eec12176
diff --git a/media-sound/helm/helm-0.9.0-r1.ebuild b/media-sound/helm/helm-0.9.0-r1.ebuild
index 96d0ee253468..eb8bb1120649 100644
--- a/media-sound/helm/helm-0.9.0-r1.ebuild
+++ b/media-sound/helm/helm-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtytel/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index d6ff68f13850..9e1a5492aee5 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
-DIST qmmp-1.3.4.tar.bz2 1246048 BLAKE2B 8108e1b5f0098ee1338ccb72889614d6876855f22159e48cb54a3000a855e843d623a3a491ebcb2e7b627c014946190117bfed586729b424dd5a3564cfdc5ba0 SHA512 520a7b50a3e0bd17418bd3137a4e73a52f644ad38d7fe86647a8781ed3036cdbbd14d5311b9471443f8a2cb42422b5fa11e22acee72ff5b670a7508b55364bb5
 DIST qmmp-1.3.5.tar.bz2 1248522 BLAKE2B f59b948fc2805b376784cef429693bf2d70ba21af8699959a31b74e2c4aad2499927b48f4e5ae6166c9d9f35132418717dff8f3f9d9d447af411d97700932236 SHA512 fbf4173e6dcd78e02ee52e53d80f4477bd840047f96ef8c0bd23f56eec5efa11ac52cc458cfeae65b46cda357b986ba30e1ec4e06d35f4f96cab9a915095d735
+DIST qmmp-1.3.6.tar.bz2 1250131 BLAKE2B ddcce7f55dddfb667c2a2005172c5b8de2f11babb8cd18114099416c1c916048e525262fb25c5e994d0b21b4fa23a308be973bf4cb731e64ee300849700a7d70 SHA512 83600b3116a62200d6751b4c6a526cd0af842b943d8d2979e16803ad788ee826a52a25ac0736f337a8fa739affcba361e6cfd1947c5135aef963d128dcb7e3b9
 EBUILD qmmp-1.3.2.ebuild 4252 BLAKE2B 5561eaa7842a14c91dbd9cb598070a50e49e5dda9ad0ba8fdab3375bf5488b8b0228f8ee7be75be545b550dbc3300efafde5debc5ee2f4bad37ce9fd6850c654 SHA512 ec4cec2bd3cc50f17ccd0c0458ee5c3ebc1fd9c12bfb8570d84bb551a2b97f50d7aaeb2d2865c164695cd9a9c03c0bd9331d427a7073984587cdd4febec9104e
-EBUILD qmmp-1.3.4.ebuild 4226 BLAKE2B 60498c6cf02b25e503af9823d6202e41aa5948f15ef3e136ed2aea58eb9292a627bb6a760fd86ee7c9bbba6126107556468b6907f7e7dfdec0e763c4f1393868 SHA512 ffd356b2f86e658164b327d4f2877745c8ac1bdddf4aa04362f27786857da3a8ddbd597fbd32063d069c7c542fbedfde4191dbfd4b2b7a11c51512efe5b2a8a8
 EBUILD qmmp-1.3.5.ebuild 4226 BLAKE2B 60498c6cf02b25e503af9823d6202e41aa5948f15ef3e136ed2aea58eb9292a627bb6a760fd86ee7c9bbba6126107556468b6907f7e7dfdec0e763c4f1393868 SHA512 ffd356b2f86e658164b327d4f2877745c8ac1bdddf4aa04362f27786857da3a8ddbd597fbd32063d069c7c542fbedfde4191dbfd4b2b7a11c51512efe5b2a8a8
+EBUILD qmmp-1.3.6.ebuild 4226 BLAKE2B d9d03e556a0ad3c456267ef336fb7a4ed301e292c4332de0fe1f4e27dd1afed28c2462d3f4f9b1b640839818e41251dc0ef5fa1e057fb350bc8213a08c38bc39 SHA512 ca86d4fe1ef1a10be95343305039aa3891a204554dbab612be737bc0d526ce85922ae1c77e5a9f6fe63e84f03f67a6b457299239a793e086f1929d4e8903be2e
 EBUILD qmmp-9999.ebuild 4226 BLAKE2B 60498c6cf02b25e503af9823d6202e41aa5948f15ef3e136ed2aea58eb9292a627bb6a760fd86ee7c9bbba6126107556468b6907f7e7dfdec0e763c4f1393868 SHA512 ffd356b2f86e658164b327d4f2877745c8ac1bdddf4aa04362f27786857da3a8ddbd597fbd32063d069c7c542fbedfde4191dbfd4b2b7a11c51512efe5b2a8a8
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
deleted file mode 100644
index b403c47023bc..000000000000
--- a/media-sound/qmmp/qmmp-1.3.4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.3"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.3.6.ebuild b/media-sound/qmmp/qmmp-1.3.6.ebuild
new file mode 100644
index 000000000000..94c74d0ad006
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.3.6.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index d4800261b5e3..edaad9236b1c 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,6 +1,6 @@
 AUX qtractor-0.9.4-dont-compress-manpages.patch 801 BLAKE2B 27ee7fd8711b87e8e8b32e3f40ed37c890c072e9d071d2011041af7b4d9bd1c1763f6b0f8326ee3a9e6a780f6abf418d52f8bcc894490adddcac05ef973eb86b SHA512 bd78649eb6f0616a4129d5851c997cc3fa233a86d9b7f98f5685b0999bfd25d536b38b539a9a7b2589d709004bd63042c41eae35fcdaa78167f071b0b8a2e5b9
 DIST qtractor-0.9.11.tar.gz 1849813 BLAKE2B 747916fe45285b00c837af5868ebdaa6b9bf5812b8fa58c4bfbd8662c5519106cbb0a9708121f3391ca4f45bf0af0715994ad8400edf01fa8bd0dcec848aa438 SHA512 8c6cb7ce5f5b5162c4a233aa733f0cb8424f4f84a91546fbbe7af35d534ffc3db6a583712d8ca906adc7edd5e92d28cce6927b340ec4750eafe14500eb8dd8c6
-DIST qtractor-0.9.9.tar.gz 1831016 BLAKE2B caef9b7a29ae30661dd08c302b16a2f12c66e2f1ffd63ca847ffd4272bcd114ecf74f1dddde1c37788e635896f25ca62283adc773734754d65ea12618248368b SHA512 151a3a92cfb98b9c9b19d18730109bce83744d4c24d3ca200f53a04938cbab1f33dd8080d3faae47b5026eebbbb750a74f64a5a046b0967278e848f424ff962a
-EBUILD qtractor-0.9.11.ebuild 1551 BLAKE2B 665ec33050b6cc226278b0b06a12c0d219fac871d5a9fe45f58e34e3bbea0ca0f82919196ad33caf00ee48fc111d732cd2767bed53212db2fb21cf919f2137e6 SHA512 2f06e4884397579384388c96e72d40bfab3e2cd0d1d8ba5ec12d1245e651b064029ecde89fb2e9e7266135ffef778a15caf5f5ccd75605f655f94e598ec84a4d
-EBUILD qtractor-0.9.9.ebuild 1757 BLAKE2B 8aa9ac5e63fe90e2f4eabf36edeaff039db8e9deee4cae6e4b34e36e23b5b8233786f695372303d5292248a8c2b8382d3b674a3beb18867a795eb10838e1371b SHA512 a7df58679f54bca3ae7d4e6644155327381ff0c0962fb466dc3af495594e0d442b87b29e5258d255a388a432d26668678a11c978d50fa7eb784601069ef7ec5c
+DIST qtractor-0.9.12.tar.gz 1893356 BLAKE2B 221062e1557fbfa209a3a55b3eaa8c80a5026886d33bb1c27de2fa410f0ab301bf3323cb7b451e2b326d26c9de9904e19578c02f602aed681fa9100b6124842e SHA512 cdd7414e2b287272164e3876603f4b051f22399e14aeb61c0e8d30a159a146d0028d36463400a239630cb31ba66bcd96302fb522fd8304342e533fd9d420cb2d
+EBUILD qtractor-0.9.11.ebuild 1549 BLAKE2B 57a9324b495f76c3be5672c7c958b4fb4128fd4125957c445cb55b52bd9c6e277bd31f3af2f2bca9ecbf05d4dedb7b1aa4133da32740ef7776c6d4a8dcc836ea SHA512 ca3efe3ec38521ed21ecf02447f68e505a383deb3ccb8aed12f2f29e922b4f25117742f7752743a1ee97fe58197a03427bc862f2c22901d1d9e813cbf288f9d5
+EBUILD qtractor-0.9.12.ebuild 1551 BLAKE2B 18d426bd732e69b3a35130bfd4731181b2db1b6ad0a24097ae77ed1cb66cb903a347fc78352685868cd7f2e9811c6aa2256a4df34150e627b1283262fdce479a SHA512 4a41922e0811640752ecc953c004c2a41bfd827f724e8d63d7a7872dc470c8a9ebbd63d87eea93d768de7e5166d3bc0ce5e910230d38e2e36cba6e2030d4f2cf
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/qtractor-0.9.11.ebuild b/media-sound/qtractor/qtractor-0.9.11.ebuild
index 341ded2f9c0e..1a712fa3ce0b 100644
--- a/media-sound/qtractor/qtractor-0.9.11.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/qtractor/qtractor-0.9.12.ebuild b/media-sound/qtractor/qtractor-0.9.12.ebuild
new file mode 100644
index 000000000000..ac61f7e78965
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.12.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/ladspa-sdk
+	media-libs/libsndfile
+	>=media-libs/lilv-0.16.0
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.4-dont-compress-manpages.patch"
+)
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		--enable-ladspa \
+		--enable-lilv \
+		$(use_enable debug) \
+		$(use_enable aubio libaubio) \
+		$(use_enable dssi) \
+		$(use_enable libsamplerate) \
+		$(use_enable mad libmad) \
+		$(use_enable osc liblo) \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable zlib libz)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
diff --git a/media-sound/qtractor/qtractor-0.9.9.ebuild b/media-sound/qtractor/qtractor-0.9.9.ebuild
deleted file mode 100644
index 44ee88d9cae0..000000000000
--- a/media-sound/qtractor/qtractor-0.9.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.4-dont-compress-manpages.patch"
-)
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--enable-ladspa \
-		--enable-lilv \
-		$(use_enable debug) \
-		$(use_enable aubio libaubio) \
-		$(use_enable dssi) \
-		$(use_enable libsamplerate) \
-		$(use_enable mad libmad) \
-		$(use_enable osc liblo) \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable zlib libz)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 4bb277716648..21ef48dc8a9a 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,4 +1,3 @@
-AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f2500c3e533433a31593cb9d32e82cf9fd305d2d9c04f7d6df62295594397eb447ffb9a6d3396541872f SHA512 27b6ac42ec3ca05868786ee62d0f9ac4900ed2db9dfed0f2fe9cb951669e7abee7e0d2f8d07db76b03c3fc965fb48f46d94b4e64a5e8dbcd6c24d22e724db938
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.3.2.run 95632176 BLAKE2B b1a418e6af6c364050a532063b3129e27d03ac36ec325ab5f2044896f5eae02fb4a251e71b23bc125d41f169aa35d8dde340b333a67b845ebaca7faefa49fe70 SHA512 1dd8912120ba0e9e84849fd793d54aee56e98396f6228a4bcec5c79485b9902398eeefb8f276abd46bbe627e7bd3c8fc5d740d05807342f837ac226f475510d7
 DIST TeamSpeak3-Client-linux_x86-3.3.2.run 94323084 BLAKE2B f3b0317e8cbc7143d9814a52c8a8c9cd04aa012a40172aca59e6d4db956a19ae5752bffa102f06e34ad0dd5b211082e00ca06056c05a4a2dbbd8adfd76a0c0e7 SHA512 56b7b231ffa5195418823da435fd4daef2cbdbc653d3cfd328f60881a1370b9dd6f99479e9093216d0768ddb04bdd6c6cf1a7019d836abd89806518eeee23496
diff --git a/media-sound/teamspeak-client/files/ts3client-bin-r1 b/media-sound/teamspeak-client/files/ts3client-bin-r1
deleted file mode 100644
index 3edbc2e7907a..000000000000
--- a/media-sound/teamspeak-client/files/ts3client-bin-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Sets BASEDIR for teamspeak3-client
-BASEDIR="/opt/teamspeak3-client"
-
-# 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}"
-
-# Preload the library that provides calloc@Qt_5 and such (gentoo bug 675874)
-export LD_PRELOAD="${BASEDIR}/overrides.so${LD_PRELOAD:+:}${LD_PRELOAD}"
-
-# Launch teamspeak3-client
-cd "${BASEDIR}" && exec "${BASEDIR}/ts3client" $*
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index fa4c7c411f73..29ae63c5f291 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -4,6 +4,9 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
 DIST teamspeak3-server_linux_amd64-3.10.2.tar.bz2 9242362 BLAKE2B ad275eac241182aa15410ba32983bc1e598f55090eb35559fe6cf3f18fd6b3a1395a36f320dd36ea3fa44390afd698f6734b034536cd48d049028e09943df7f4 SHA512 3be39004d557fb58efd272dac3e005c08db8ae05e04cc5cfdc146296bca7b0a02d7011bb77d6d45074056b458e14111dbd79882603b4be9fba58de7c9b384b84
+DIST teamspeak3-server_linux_amd64-3.11.0.tar.bz2 9245357 BLAKE2B ae40cb8d651d2dce71590836a72e9798b312e54363416a863926924be7eda0327f03349cef0006633661d8789c3f8495b700a8d278255cde59d42e8d0c79ce52 SHA512 e72d042e971f98a55f53eaf55d716c85db28f67fd72be545e47bcef8e4c8bd03281963eb757a0b1293bcc2e37630769b66f4c3daebf2c3510fd323dad849dbc0
 DIST teamspeak3-server_linux_x86-3.10.2.tar.bz2 9049720 BLAKE2B 86f854c2b18397bde3cbb02b9d0024af8d3fbbdc695dae0f7f950fb5670cc6c983e8eb20dee97409a87b6cd572772cf72cfddee0254857023aa4e8446ea71068 SHA512 5ad16efc1a0b8dad6696d4121560cc793a35b15473391fcb18a8edd72031415775fb10d0c686a2af550f36748c17db03ac8caae76b0ef7e4ffa528d3ab416951
+DIST teamspeak3-server_linux_x86-3.11.0.tar.bz2 9052940 BLAKE2B 6b045232734e7b19e2f2acbeaac9d254bf9c58f26cbb2cbb3f8bd1992492033694201b8ea0386e397f0237a9cc43ba96c181ae450615a64f607b6799654afc0b SHA512 18deaeb10f7753f68ec1c3cd6612f04d9c057fe4c4f566a3d1f0874836d554d602630d0890540d7e0f7a5c150bd098073eba7f84f4c3aed7e002a3677304c654
 EBUILD teamspeak-server-3.10.2.ebuild 3083 BLAKE2B 7ff9e60bd939dc15804ce5912786a43f545d0a93c8b9f14b9a1c91dc544233f1e4274929d1d40054f40eaf448073e968787a26a1d92b338f8727464e57f9785d SHA512 971f19bfd38d0080d75329fc10163ffcb7f2f7900e7e922abe898032413abe20029b8f8054e50bf6b80c05a734374d28590c0384d4257b7db262c4d048868047
+EBUILD teamspeak-server-3.11.0.ebuild 3085 BLAKE2B 7faeb26ca5fc3ba156c8aa2eada593993af15ea2d3562a7092dc11cbb72084ae1a8cbb1f06c6390e679bfd73a7f1595468ee4f2a24cce57944d88e5da6f3e207 SHA512 d397bdd12f0ba68cbf419733669d24de022a804af92b7daa2b995f4c57b0046ad14188d64972139db36600795ebaab19126c89945767a28a898a6b8208bf0a2b
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.11.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.11.0.ebuild
new file mode 100644
index 000000000000..bf9ed2742678
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.11.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql tsdns"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+"
+
+QA_PREBUILT="
+	opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver
+"
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r1 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.txt
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r1 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	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,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a license,"
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
+}
diff --git a/media-sound/timemachine/Manifest b/media-sound/timemachine/Manifest
index 263ed7a9850a..4767b54b5d5a 100644
--- a/media-sound/timemachine/Manifest
+++ b/media-sound/timemachine/Manifest
@@ -1,7 +1,4 @@
-AUX timemachine-0.3.3-underlinking.patch 713 BLAKE2B f1d4e9209009a59aa452a55cad9bf34a1b6d543c8e45bfe75d2317def1a13b3dc3655a832f6b42c8c6bef165ff2cf5988cd469a45badb7ceb35ea9384ee3464f SHA512 dc7e8c11e0633012a61d6a20a94046d624024b47e45ac32b1ec90740d4fbca9ba9928eaf6caab1a4e3dd4cb42bad41743e0481e91f41551b0ec5b89e7fa386a2
 AUX timemachine-0.3.4-underlinking.patch 680 BLAKE2B 78d03ea5ab14a059404de0f3326725aec856cff1699713ceb57ea431d1b8af77ffdd9b2224744b9e7455e533fb50d8961b1ec4d9529873418e912686ee5f2748 SHA512 6fbb15368bd8b9a02cfaa0febfe9f620a0f0ff58535f43e13b0a63bc57e9f6d232c8f37093c43b4bd5f1133ca036f991838ee9a31315d304f097c8cddb43ee10
-DIST timemachine-0.3.3.tar.gz 169021 BLAKE2B db94419dff0b3778e71296c9bc855714a0cc14e2d0c56d00eec53c7337ba6883aacb107d5da4310937b6bf520b65efd3874f652710020a30dcd25e828d399eaf SHA512 9fd079d3be2a22ebd7a8afe6eebef9d2adab743c8d3c0124adcbaed78fb1863c5a087e95763185745f1d2767a939583814d0c889147c29742c39ab860c96748f
 DIST timemachine-0.3.4.tar.gz 91171 BLAKE2B 047106d22f7659a223f8d2cad9dbf9c224850951e19336866dd312840c67a09b5326202b832aa29f859b5c8cbc8f644750772ad32d4d1785dd6aa61890611a18 SHA512 1469f91290ab10232b469b8320cb80cdc9e6c47e922251ab4439ecb0e10a1b18066eccb221269e966a11477d3cf0d4acafca3f5aa3db574d3d1d6385235abba3
-EBUILD timemachine-0.3.3-r1.ebuild 817 BLAKE2B b403770bd6f8dee11dfe68ca0742815c3db318970e0fe697fe04443bc85616e4420ddf6e9cdc1d43fbbc6bc3b8dd36aa6f9ed015a219b1181c0b52341648768a SHA512 3d2c293a55f1d96af7921ed9fc73561c00354d0983079c80eccf9f21d5eed76174cbc2633cb6b0befbe97106a59d82888dca84db5ad5413ad58dd0884cf51373
-EBUILD timemachine-0.3.4.ebuild 1006 BLAKE2B 810c0e859ef28e5cbb990c0b509bcef993aec394cd4150722380d56fd82289161cb85bd016b9b2219750f9a015ef0383f66ff590afa42742f4b50406d9ef056d SHA512 4a854c0be50ad41b1ca6c1d1620f91d1c2d5046e05bd3c75ae14a41d8c3bc4aed885a7158cbe358fb32143d0020fc464c20b66ffd8a7b1b40628baf62ff5770e
+EBUILD timemachine-0.3.4.ebuild 1004 BLAKE2B 711028b12c075cc3eecf0232b0f3f0106bc3abb7adace0a0aee471dc6f048b70481e93c1f498748ffb958f1a504234c48574f6d961c3f153bcbb6162aa1158c2 SHA512 770d7e5cfeea760310abdac49d3867a3b3bcf98f08b1f1837d23076696250e730aa00473291dd00dc6464d95043c160722fb69034fdec3a728d1579c9a1766f8
 MISC metadata.xml 408 BLAKE2B dc77a81f0c8692c4ff9540f1ebf8576dee0fad9c374c3dde1f39c401088cb32e12fe73a3840ce7db7ea2118d3e0e8c517a1049f9a23012e221126e991c33b8e0 SHA512 76c92f4068084f4e9f3112236d2b9161d64a2d8de33e17347a34d7b1e1453e7a0d599a6255e23fdf71b7ea625be7e4f54129b05ecc9f181ab7a2c3ef183097b9
diff --git a/media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch b/media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch
deleted file mode 100644
index 033484e593d0..000000000000
--- a/media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix libm underlinking.
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=508132
-
---- timemachine-0.3.3/configure.ac
-+++ timemachine-0.3.3/configure.ac
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_INIT(configure.in)
-+AC_INIT(configure.ac)
- AM_INIT_AUTOMAKE(timemachine, 0.3.3)
- AM_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
-@@ -10,6 +10,11 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
-+dnl Check for libm for log10()
-+AC_SEARCH_LIBS([log10], [m], [], [
-+	AC_MSG_ERROR([unable to find the log10() function])
-+])
-+
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
- PKG_CHECK_MODULES(JACK, [jack >= 0.80.0])
- PKG_CHECK_MODULES(LIBLO, liblo >= 0.24, LO_FOUND="yes", LO_FOUND="no")
diff --git a/media-sound/timemachine/timemachine-0.3.3-r1.ebuild b/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
deleted file mode 100644
index b6483d46ab41..000000000000
--- a/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="JACK client record button remembering the last 10 seconds when pressed"
-HOMEPAGE="http://plugin.org.uk/timemachine/"
-SRC_URI="http://plugin.org.uk/timemachine/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lash"
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.80
-	x11-libs/gtk+:2
-	>=media-libs/libsndfile-1.0.5
-	media-libs/liblo
-	lash? ( >=media-sound/lash-0.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable lash)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog
-}
diff --git a/media-sound/timemachine/timemachine-0.3.4.ebuild b/media-sound/timemachine/timemachine-0.3.4.ebuild
index 459c251e230a..15f01e392ab6 100644
--- a/media-sound/timemachine/timemachine-0.3.4.ebuild
+++ b/media-sound/timemachine/timemachine-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/swh/timemachine/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lash"
 
 BDEPEND="
-- 
cgit v1.2.3