gentoo resync : 11.05.2018

13 files changed, 311 insertions, 46 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1cf38486ff61..4cbe7b944a14 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 774692135c08..d0652796e6cf 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -11,5 +11,8 @@ AUX mixxx-2.0.0-sqlite3.patch 345 BLAKE2B 2c06cea5358df63d0c5e690fb700766b8a3631
 DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
 DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00 SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
-EBUILD mixxx-2.0.0-r4.ebuild 3655 BLAKE2B f32545f7134a60415587c30738d3f128161a39ffa3ea85aef2fbd292d84d86c9b1225c069969066a499cf8b0ba51518e9bf72bf08a4a27344957504dd4060d6a SHA512 f5c31c079f440b381e5f9407a97ce3738789345052f764b997361fe1af5098c3d081d6a7508631f897651be52da58a3bebb14d6e4e0c2951c4072e89015ab463
-MISC metadata.xml 549 BLAKE2B 20dba66bc128eceb037f39f0bd04ee4f4dafda37968f90f09de12d6485b37f1391963d1bcf343755da69a74c3d3f72218e97b9cf13e9e699bae4ea098fbcf9af SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296
+DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
+EBUILD mixxx-2.0.0-r5.ebuild 3717 BLAKE2B 3e838a7dff793c2ef3bb4c99803746e3dd85fc19e837f4022d15189b8527eb6c775627c8e95c8dda42c875e33e1e89737791469f0df17784c2f15f318adfde6d SHA512 429289d7d632a723bc3919740f9f8fcde60707923e1c4b384ce4dbeea843a110b954c95519b3e91bff5fa7084179982736008e5ae207a4b018af2a087a32be21
+EBUILD mixxx-2.1.0.ebuild 2873 BLAKE2B af6a8c6f07aede897cc7e43c57aaaa5bd6f82837f4a4429f5e52b57af65e5ea58544f5fae705d5efd668ddf6999058206057bf699f51977d106282b38f2d974e SHA512 72000f7ff37fcf0955a342744b7bb4a88cab8021fc8d7c24d3b9805924b97cbe762b079bb79d3618b752ad5103406ab6bc54b3d2b80d3a13a1b94961cb2812b3
+EBUILD mixxx-9999.ebuild 2986 BLAKE2B 33afc804015de16f29df83796c47f27be5ef2e24026885e816d6e57a27a62aad2b688348ad4545bf84d5e7a7c03312472c31d10e1823c22b1be2605e4b6e3b5d SHA512 b8dbe54fa89cca6aaaa348a34cde7573f5ea5b4716ae7bd9b1318a6edf69732b9d20d4e18be422b8d76e233cc081579528234ebc2f6f39effc8c85f795eac2e8
+MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 4627d1b0b257..3c563007a7bc 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
+		<flag name="opus">Enable support for opus codec via <pkg>media-libs/opusfile</pkg>.</flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
index d8a4bb179981..a8fcb5ca5c84 100644
--- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772a
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 opus shout wavpack"
 
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
@@ -56,6 +56,7 @@ RDEPEND="
 	hid? ( dev-libs/hidapi )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
+	opus? ( media-libs/opusfile )
 	shout? ( media-libs/libshout )
 	wavpack? ( media-sound/wavpack )
 	ffmpeg? ( media-video/ffmpeg:0= )
@@ -120,6 +121,7 @@ src_configure() {
 		m4a="$(usex mp4 1 0)"
 		mad="$(usex mp3 1 0)"
 		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
 		qdebug="$(usex debug 1 0)"
 		qt5=1
 		shoutcast="$(usex shout 1 0)"
diff --git a/media-sound/mixxx/mixxx-2.1.0.ebuild b/media-sound/mixxx/mixxx-2.1.0.ebuild
new file mode 100644
index 000000000000..ff679b823489
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
new file mode 100644
index 000000000000..6ab9fb77f7c3
--- /dev/null
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index ebc4f42c8f40..dd3c79c3320a 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 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 674 BLAKE2B 1c387f1c09c730edc6fc1cee1839afab6b7442c6438a18ffbdbbaaa0e8899f5f066152b09aed28f548062c1fee226e63a253dca0946974c7f5d6ada099274fc7 SHA512 f910267f3a4c42215714fa5371b0e475ddfcd0b84a6ff319037b840f0068c91f6ee76dff2a43d685c0210eff0105569c7f0a6d80fdf2d41c68596c581c931507
+EBUILD mp3gain-1.6.1.ebuild 673 BLAKE2B c319bf9335ba1a7ead43e9ed85d67ad8d941be8689031ecd9467eb111b59564d9d3dbfcdb42db3a94bc653a713bfe63157da0b2170ef4e5dcf248a6638cdb0a9 SHA512 9afdbbfd439edfb4edded5b815029f8a4e6a9c1be12e03fbe9177c6ebf501fd751bcc507c05b0df4ddecbd5ce39bad6a47b9dd5420a0f9906951e07d8d824cb9
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
index 8999596cf533..ac0cf8381c3d 100644
--- a/media-sound/mp3gain/mp3gain-1.6.1.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 8cf276f2f64f..2357b400d740 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686
 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 2906 BLAKE2B 36462309ca3efd27d94b9788da674763b07ca21c70e0a8cdcfa7465b714dce07ee2d05ca5c3a133ba68178bf3db8c4ce826f9adc2b0e6bdd54b81274ea079bdd SHA512 1bec3fba575532df6b2fe44a87053c7bb7c7d87953589d4aa0491ff936911bf3b4a384d9a083b7b4a734d485c43e80e812a6c34ae65b098cb204032e1177baf8
-EBUILD mpg123-1.25.6.ebuild 2898 BLAKE2B 97ceefb25b80c5b12247d6cc20f41adc156e65abbed3c6504dbcb0a24751e501c078fd8a913cb7320c7404966d9f4675541d3b97ba0da30d04bffbc1e4fcb54f SHA512 054be057d7e194797b2cf4e79596d93982cbc47edafc725f3972a8edf9fe1e5b322f80faf76c61260005e80e757a38eacbf97e1d25d6b0250f444c9f29d130cc
+EBUILD mpg123-1.25.6.ebuild 2897 BLAKE2B 2c75049f7218b4247dafd05ead9e494d7cefe8dcabac640c0bb96c249c16be6ef0661d98409d0dd4ef1c99342247fbf146bdbeae570dcf199e6cf93c800f1ad0 SHA512 f051bc85bfa74ae50005369cea98f76cd30d92e6345d02b219da0a147c9c5e8a18f88a0b52461d5d14a2ebce5b2f84bf12cbf79fc1d27bcc92aea7a67791c5d1
 EBUILD mpg123-1.25.8.ebuild 2906 BLAKE2B 6f668c24fff43f542baec764d6dcb4f26e2d03361cfc78c91c635ee48f665fc71ad0f00413827b15334b3381f4509d0159d456e36baa5b82bc1c0a6b57f7c47b SHA512 8afd4947959627b1d97285e49753bb44177d1353ee209de8e99e2afe6ed5eba88554bb70cd129a2069e509944cce17b2da4ca8f804f04a035072f1aef3a4cddd
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
index 3de21c6e036b..39a7bcfda214 100644
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 333d63c6e9ff..25561d2ebeb0 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -5,7 +5,7 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 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.2.tar.bz2 7816668 BLAKE2B 4421a439e07ce6dac2556a95818bae7be91622ceea5c597f1fd02ee13815f760086dea13a3ac11a55c928ccfc4b134bb97c0f3092def85ff765e311d6ef69459 SHA512 42993b4cc881ca2bc7d7deb5eaf4e7a9cc3be462abba0f174d6074f0ca18bf59cbe8607dac5a9750331d28ac1984527a8210f53cf6cf077be86b26d141c7bc78
-DIST teamspeak3-server_linux_x86-3.1.2.tar.bz2 7676301 BLAKE2B a4b7557e215612f11bd4ee892dff199d0017e6af7a24bc3dce83a4ac6ddbe807b3960b66c9948298c4463ad2d08aedf27468487f91b15d197d0e2c01b7771956 SHA512 04dce6831332e44ff0edfdc664f422616522bb342338a2b6bb2cd73aba5cc5965dfa4c77fa7c041c06727a3f50fd842142198fd99568c1db6c9810f07accdb48
-EBUILD teamspeak-server-bin-3.1.2.ebuild 3423 BLAKE2B 175a99ff927642828cb40bd41b7ec51a39e3d421eab279dbe5126370df40f90404ec8a3c6850d4d4a10308dbefadce9607d338f49012b23b6f1712066296f6b5 SHA512 959677ab6bec85ee858223f7fe952fad48ea3d5669d0168dee56c9558cd3562e4af24b2329feb9a78cb252c2dd5e4051ef0e24497b735d5b2c4653c2112e242f
-MISC metadata.xml 659 BLAKE2B 77a9ce51277977d958712db9e729c1c6517ad29a3c87b0f775fe7c414273cf3fee43ca070894065949f766a22019af72e7a1a23fcbacd4641fa8c43571aa6a7f SHA512 2404a4075934843c4599d42c99e6042f99d9131066c9ec4a36ca08f361d01c9c15050676dc7760a34eff1a173be41cfd91c270fe616696dd36b08cae4f7fda53
+DIST teamspeak3-server_linux_amd64-3.1.3.tar.bz2 7818829 BLAKE2B 61f06e94c677c2569f3d5e13ba797f9aa04c750a4cb547edf98dfe5e461aa62a007220c695ec07ed5be26a20ed1c70192ff1bb46a881c1b60ba52cc5149a084c SHA512 732d3c9ad30796d1dc4028e953ff3e96835a3dc5f05389b44b1c35184dc07765bdd16a39f52d8f5a19a6f31a2a1035d8e3b39020178b4eab8837119fefbc0bab
+DIST teamspeak3-server_linux_x86-3.1.3.tar.bz2 7676538 BLAKE2B 2f57bee0bfb1e7f643e92695c813ed2bbb0b080a76fa2a0eb2a1bdb288edcbbd93c1233a6a8be129473c397c7471554743f57f6ee37242e272db2ba4dfa2bc8d SHA512 050423ed4ef9eedcfb96499cddaf15405aaf4e15ace6d89eed55085f9173394b431ac12e9d226af015e5eddaa484e65f8b475bd04167d3311cb7e33d8c059a7d
+EBUILD teamspeak-server-bin-3.1.3.ebuild 3406 BLAKE2B 40b59dac859af212de10cb58700741479122f81495258c5618c16a7e85cdf670deb95a5b12e3c9019b459d0ddb6da3c84bc8e702efbea3f7ac6fe7558dcf43d9 SHA512 05e1d0518cb99292e8cac74b2f0a8f0daff3bcc4911e726305040b165f5c10318d35609a79b9d294b3697527b7f37c17a7bb82ac5abef45d98de08157c2b3523
+MISC metadata.xml 784 BLAKE2B 2e51ada42240de0b09a52863cdd26f08dbd1fdf1e037d9b9d71a382c72410ed1b1bf2b8b73d90d650b877b4d9ece4902a7873e4e8b110e5e4a798575151d9c44 SHA512 5b186a986e94b62f72ee83e77a4aaacfaadb7c58aa6418187dddcc78a31bc9880d9a2b55c16fa7f7239233d6aefca6048e72ef2db74d99c7b9f4b4adbae1710f
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 67ae94b5f922..812b26bfd184 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -9,10 +9,13 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
+	<longdescription>
+		TeamSpeak is a proprietary voice-over-Internet Protocol (VoIP) application
+		for audio communication between users on a chat channel, much like a telephone conference call.
+		Users typically use headphones with a microphone.
+		The server software allows users to connect and join chat channels.
+	</longdescription>
 	<use>
-		<flag name="doc">Install TeamSpeak complete documentation.</flag>
-		<!-- <flag name="mysql">Install TeamSpeak MariaDB support.</flag> -->
-		<flag name="tsdns">Install TeamSpeak DNS.</flag>
+		<flag name="tsdns">Install TeamSpeaks own DNS service.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild
index 5bbbf749cb09..aa03952e42e4 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.3.ebuild
@@ -5,27 +5,27 @@ EAPI=6
 
 inherit systemd user
 
-DESCRIPTION="TeamSpeak is software for quality voice communication via the Internet"
+DESCRIPTION="A server software for hosting 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"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql tsdns"
 
-# RDEPEND="mysql? ( dev-db/mariadb-connector-c:0=
-#		<dev-libs/openssl-1.1:0=
-#		sys-libs/zlib )"
+RDEPEND="mysql? ( <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"
+QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/ts3server"
 
 pkg_setup() {
 	enewgroup teamspeak
@@ -43,7 +43,6 @@ src_unpack() {
 }
 
 src_install() {
-	# Accept license
 	touch "${T%/}"/.ts3server_license_accepted || die
 	insinto "/opt/teamspeak3-server"
 	doins "${T}"/.ts3server_license_accepted
@@ -68,19 +67,19 @@ src_install() {
 	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
+	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"
+		doexe "redist/libmariadb.so.2"
+
+		insinto "/opt/teamspeak3-server/sql"
+		doins -r "sql/create_mariadb"
+		doins -r "sql/updates_and_fixes"
+	fi
 
 	if use doc; then
 		local HTML_DOCS=( "doc/serverquery/." )
@@ -110,12 +109,11 @@ src_install() {
 	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
+	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
 
 	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"