gentoo resync : 06.05.2018

6 files changed, 130 insertions, 106 deletions

diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
index 013e5b497e21..0e1de7d5b671 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -1,5 +1,5 @@
-AUX teamspeak3 258 BLAKE2B a70cae413c2392b601f69f9ab4196c06b711beb35822be9cb9621325472fef7caea06bee183f6b73f1d4cb8122be15712ba53dd3b148f6bc5ddd5a98ab7f108f SHA512 b587b3991e927922854f155ac61e8d923a6b84a1da88a040277d670203be7dc11b5fbf79508d3894e94a2686da1758781b158c7598c8a61b151798c6a7b1880e
-DIST TeamSpeak3-Client-linux_amd64-3.0.19.4.run 37054436 BLAKE2B 719b39102c0a6d4c932db83c502eae6dece7530c39b16b7c453b8e34a97fb0371a9de84fd12242f5f3920c135aefaed75fd8e0e28bf960a9a0d598d6b1e74e8b SHA512 fca7303a9c75bbab4945c9336c78115b28b3f14b278ffccb8453d7b29eabf1cd7147697bf0042bc625a9108db653468e8f0ebc4b29cf00d48f5438c919efa8c7
-DIST TeamSpeak3-Client-linux_x86-3.0.19.4.run 36627204 BLAKE2B b31ec9a0667057538bc428b4735cfddb041492bce797294af33a483c2b04dd8fb8a65277e5296dec6620189221b37728e088101c4d220ba843806ebec5efcc5f SHA512 ec52a78e5753716ba81602ecd60a2440a08ec4fc777d7d560dd714ae4b80fe7befceb5271c11d2eae46dbc3cbf71f0eca4976a44510bc66a51f5ebe39745d2db
-EBUILD teamspeak-client-bin-3.0.19.4-r1.ebuild 1945 BLAKE2B 93dab215db0ae62b337f2c791823700339148225f56a1c392c3d7a8691e0d13f1cf8404d7f14b2536635d3bf9d3f52ebf13248335636df39e6ee58ef695fec6d SHA512 54eecf310eaf2c69d0c9bb490bad60ebdac78d426446372d47690218c8d56dab71abe12381465b0de23ae0250baffd185bee1cf73734315c086f894710093c63
-MISC metadata.xml 572 BLAKE2B 635a2b60377ff14ec73aded043500d6a6eab2a80a6baefa294bb484e905f441ddf8c6129a7ff6f76d68544df3809c9d47bb6e681660caead4da54dce4d841222 SHA512 a3a25bc704faf96f49bec84068b9b8f25895c2dcab5df6324936f788534258fb1c90c5b571ed3b2b161e720cb6be374e4a3fd3058a0e63dd84fc96fe219c5cff
+AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
+DIST TeamSpeak3-Client-linux_amd64-3.1.8.run 76052606 BLAKE2B 7d69c964b4d5adf2fd566fb6a0245e80cf93ca8f6a281ba41162fa87e23e9b072c4a2f73f7ffc7cf6d8050dc98bb62f1d735c7a9d04ea023e7834db320af04df SHA512 a3bb7ec87995ef61de3b010c3c125b6f1c05fc456966e7ac95b872a97cebcd2235204cd3d0bb9f9d32f66ae3b773467075f8e48650553541771b4216fbc5db89
+DIST TeamSpeak3-Client-linux_x86-3.1.8.run 75780927 BLAKE2B 1de77d23de56bf9530ae2eb124c4b6f1466a48d567ed0d37eaedbf26f7eb84cdb0822f92db9c0665d094b82022b436ec9f2f01ebcd92f3f604af16a8db2b0fc9 SHA512 b6fa5a9bc48cc71834b12b39f8746085419359875d00a07c238938e00c7bd837e6eb0da756c09593536a7036f5b2bc2ac43eb3c6a33bf5e797c38ff93bb5a7b8
+EBUILD teamspeak-client-bin-3.1.8.ebuild 2442 BLAKE2B e1c99d12eb9ae46356be93f24f786f4b9e5847d67cae8e43ef75bb03e1579b9767aec172717d3f9145bc3101fd86ff955861f4f5fa987a659595299ffc02c27f SHA512 e9c1a449ff27db9ddbf6f077adb5196da5aef2b903b96cd23d486e8085f498decba1911bbb43792a6d95f7dc919cc6ac86efacb43b1ec4b2cde787a05655734c
+MISC metadata.xml 969 BLAKE2B 42b49d768bd4c26c68f1d304f68ab5e57c61463c2c77aca29d3dd894dee565e6044cc15fb886f929b44e52c2ff404cf1cb2acd52b720840701259b7142818618 SHA512 2df8bfb7f7bb343af1ac5ee62e14a191c04ea7ee0913946a12a07956d1f390f3612d7b7aa2f07cc594ee0b3dca37a49efc4bc9b873ca420996e5b4287c18fdcc
diff --git a/media-sound/teamspeak-client-bin/files/teamspeak3 b/media-sound/teamspeak-client-bin/files/teamspeak3
deleted file mode 100644
index d598f01dfcf3..000000000000
--- a/media-sound/teamspeak-client-bin/files/teamspeak3
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-BASEDIR="/opt/teamspeak3-client"
-
-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}/ts3client" "$@"
diff --git a/media-sound/teamspeak-client-bin/files/ts3client-bin b/media-sound/teamspeak-client-bin/files/ts3client-bin
new file mode 100644
index 000000000000..c59e278f390c
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/files/ts3client-bin
@@ -0,0 +1,10 @@
+#!/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}"
+
+# Launch teamspeak3-client
+cd "${BASEDIR}" && exec "${BASEDIR}/ts3client" $*
diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
index be0dbf94ebde..0842b401d4c6 100644
--- a/media-sound/teamspeak-client-bin/metadata.xml
+++ b/media-sound/teamspeak-client-bin/metadata.xml
@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@karolherbst.de</email>
-    <name>Karol Herbst</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>dryatu@gmail.com</email>
-    <name>Sami Loone</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>TeamSpeak Client (Voice Communication Software)</longdescription>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gentoo@karolherbst.de</email>
+		<name>Karol Herbst</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dryatu@gmail.com</email>
+		<name>Sami Loone</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<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 client software connects to a TeamSpeak server of the user's choice,
+		from which the user may join chat channels.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.4-r1.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.4-r1.ebuild
deleted file mode 100644
index 9a0493fb0ba1..000000000000
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.4-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop unpacker
-
-DESCRIPTION="TeamSpeak Client - Voice Communication Software"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
-
-LICENSE="teamspeak3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	>=dev-libs/quazip-0.7.3[-qt4(-),qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[accessibility]
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	sys-libs/glibc
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}?page=downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-src_prepare() {
-	default
-
-	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
-	rm libQt* || die "Couldn't remove bundled Qt libraries."
-
-	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
-
-	# Remove unwanted soundbackends.
-	if ! use alsa ; then
-		rm soundbackends/libalsa* || die
-	fi
-
-	if ! use pulseaudio ; then
-		rm soundbackends/libpulseaudio* || die
-	fi
-
-	# Remove quazip
-	rm libquazip.so || die
-
-	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
-	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
-}
-
-src_install() {
-	insinto /opt/teamspeak3-client
-	doins -r *
-
-	fperms +x /opt/teamspeak3-client/ts3client
-
-	dobin "${FILESDIR}/teamspeak3"
-
-	make_desktop_entry teamspeak3 TeamSpeak3 \
-		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
-		Network
-}
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.8.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.8.ebuild
new file mode 100644
index 000000000000..9c6ffe96819e
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop unpacker xdg-utils
+
+DESCRIPTION="A client software for quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="teamspeak3"
+SLOT="0"
+IUSE="alsa pulseaudio"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="app-arch/snappy:=
+	<dev-libs/openssl-1.1:0=
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility,dbus,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[geolocation,widgets]
+	dev-qt/qtwidgets:5
+	net-libs/libsrtp:=
+	sys-libs/libcxx[libcxxabi]
+	sys-libs/zlib:=
+	virtual/udev
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/teamspeak3-client/error_report
+	opt/teamspeak3-client/package_inst
+	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
+	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
+	opt/teamspeak3-client/ts3client
+	opt/teamspeak3-client/update"
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		rm -f soundbackends/libalsa_linux_*.so || die
+	fi
+	if ! use pulseaudio ; then
+		rm -f soundbackends/libpulseaudio_linux_*.so || die
+	fi
+
+	mv ts3client_linux_* ts3client || die
+}
+
+src_install() {
+	exeinto /opt/teamspeak3-client
+	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
+
+	exeinto /opt/teamspeak3-client/soundbackends
+	doexe soundbackends/*.so
+
+	local folders=( "gfx" "html" "resources" "sound" "styles" "translations" )
+	for folder in ${folders[@]}; do
+		insinto /opt/teamspeak3-client
+		doins -r ${folder}
+	done
+
+	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
+
+	dodir /opt/bin
+	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
+
+	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}