gentoo resync : 19.07.2019

4 files changed, 2 insertions, 249 deletions

diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index ec4d4876fdf9..ec5ab44ad6e7 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,10 +1,6 @@
-AUX teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch 4523 BLAKE2B e7193fae5efbaeac62e8366f89e8fc19cc32b0eb5269f74ba2108c2bf656f4fcd22d861e21e6512fab6240cef89a6aae7f1c2f77aba01be78af14aef68a8d223 SHA512 fdfe279bb69e7e48a28b64dd430eaeb74a51a3de7c3ea7ee32d0b399e386188f0d3f8f26064ea90f857d362639ad5cc019696cc28cf04691cb97c119cb47627e
 AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f2500c3e533433a31593cb9d32e82cf9fd305d2d9c04f7d6df62295594397eb447ffb9a6d3396541872f SHA512 27b6ac42ec3ca05868786ee62d0f9ac4900ed2db9dfed0f2fe9cb951669e7abee7e0d2f8d07db76b03c3fc965fb48f46d94b4e64a5e8dbcd6c24d22e724db938
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
-DIST TeamSpeak3-Client-linux_amd64-3.2.5.run 76619678 BLAKE2B b8d42a4d633124cab395ea69d3ccbebc65f4d9b5a148c6a81a6d9a3afab48dd59fd99ac3f5cc9551c89daabb7cc51a60c5587034a7a5bec5e3b530ecb3d6e220 SHA512 fdfaa863d3523fffdf46ca0cf9c2b0588e8d847e348ade75c8f82818920f493460740a5192d4cc8d1eafe1e7a03af93b09ae6ddecaa0b166552ab5409508a445
 DIST TeamSpeak3-Client-linux_amd64-3.3.0.run 95624376 BLAKE2B 0e6129ef32e43bbea18c9a047af3599f96975dbdbfd9ff22a9f3cea60eaf5841eacf8b396b855819fa06787a4f192aadcf2cd76b3873b48021fdd3e7fd99b371 SHA512 477ced3deb4d4226817bf1f4ec0828123c027027160cdc62a6384583227c153168ec28025613380483229e2a8b3c30bf5b17337c3011e52f01317a9f0dbd4bbb
-DIST TeamSpeak3-Client-linux_x86-3.2.5.run 76311914 BLAKE2B 4a8f4a6ce55bde680f2d9d1f28c1cabe2a01fa6c10f3f3f637931dbe2f652c87cd2a7b61f054b50a8faf3bce461e316ca2e9b68418271535a5f6a3cd0b9d3492 SHA512 90b46a840a6e43bbc7d4cfb526117a81cdb92fb8186194ab9f245e8e501608ec4740a198e8d1de5e3f69bea84ab6281384915193d4e6a1e90aff45b4b80d3d9a
 DIST TeamSpeak3-Client-linux_x86-3.3.0.run 94313517 BLAKE2B f806d23f3039cc30a6bf09945f7041bb271040419b5221d663b0119873edd08bfa4f57befc4e8f53efc12f5b9d4c423bc1706e48f6194f4df89392db6b4cff9f SHA512 b5696ed18fe31b3051c5346ceb1bb06ceb0abafb1f87767a696961836a02804cd92a1aabccd24959b37962162bdc2bcfbf5ccd0ebe44b1816b832f7b018c5588
-EBUILD teamspeak-client-3.2.5.ebuild 2539 BLAKE2B 567bb70a3c72a3bf13a5cb9c721b40f292b2a7c18260e042b7f6a48401fb78aabd12f095b963336cca6baaf2681f9c41caffab961959d689fe13f1b4c1f2cc58 SHA512 65e2c1006054b428a8d230428abaaf9bf99b6df51c3fa13b8941e6aac4619d1f8e988e4bc0bdfc6bc50972a3ec642119fae23c277a0bc149de24f5fcf77b9540
-EBUILD teamspeak-client-3.3.0.ebuild 2471 BLAKE2B 14995cbd4b7af4f54e234ff5935806191c43fea5b71e07ec585eb0373fb9ad5969d749c8da7425349beb85d5e928ce7dda94bcf7ec628512cc3809b0cb384263 SHA512 9add7c8377a9e7d0f7e75d1882617bba4295fa1f144823fe78b2d6dc47c9b0c0c4f6b6865fb160f2611c68289790915ebb015320d737e30e7ff8ff958cc8f2b8
+EBUILD teamspeak-client-3.3.0-r1.ebuild 2474 BLAKE2B c6ccb57ac969eeac6e69a329cc1056215fec98ef46fbbe00d8d995dad0846c97fb637a0d7820470fc0908223d847eb37b183cd9923ce8070ee179a0100b45bed SHA512 3fb4a07a3dbcf3c99520324c42ad765d84fbaa56f6d37686389a00a9421cc01e21f549cb35a22802b1bc2a0497b786187fe5a557cd57a9d6326e6304d6554877
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch b/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch
deleted file mode 100644
index ee5f78914d0b..000000000000
--- a/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..c036d5f
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,2 @@
-+overrides.so: qt-5.12-overrides.o override-version.map
-+	$(CXX) $(LDFLAGS) -shared -o $@ -Wl,--version-script override-version.map qt-5.12-overrides.o
-diff --git a/override-version.map b/override-version.map
-new file mode 100644
-index 0000000..991d98e
---- /dev/null
-+++ b/override-version.map
-@@ -0,0 +1 @@
-+Qt_5 {};
-diff --git a/qt-5.12-overrides.cpp b/qt-5.12-overrides.cpp
-new file mode 100644
-index 0000000..002a1af
---- /dev/null
-+++ b/qt-5.12-overrides.cpp
-@@ -0,0 +1,120 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2017 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the QtWebEngine module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <stdlib.h>
-+#include <malloc.h>
-+
-+#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
-+#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5")
-+#define SHIM_HIDDEN __attribute__ ((visibility ("hidden")))
-+
-+extern "C" {
-+
-+SHIM_SYMBOL_VERSION(malloc);
-+void* __malloc(size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimMalloc);
-+
-+SHIM_SYMBOL_VERSION(free);
-+void __free(void* ptr)
-+    SHIM_ALIAS_SYMBOL(ShimFree);
-+
-+SHIM_SYMBOL_VERSION(realloc);
-+void* __realloc(void* ptr, size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimRealloc);
-+
-+SHIM_SYMBOL_VERSION(calloc);
-+void* __calloc(size_t n, size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimCalloc);
-+
-+SHIM_SYMBOL_VERSION(cfree);
-+void __cfree(void* ptr)
-+    SHIM_ALIAS_SYMBOL(ShimCFree);
-+
-+SHIM_SYMBOL_VERSION(memalign);
-+void* __memalign(size_t align, size_t s)
-+    SHIM_ALIAS_SYMBOL(ShimMemalign);
-+
-+SHIM_SYMBOL_VERSION(valloc);
-+void* __valloc(size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimValloc);
-+
-+SHIM_SYMBOL_VERSION(pvalloc);
-+void* __pvalloc(size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimPvalloc);
-+
-+SHIM_SYMBOL_VERSION(posix_memalign);
-+int __posix_memalign(void** r, size_t a, size_t s)
-+    SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
-+
-+SHIM_HIDDEN void* ShimMalloc(size_t size) {
-+    return malloc(size);
-+}
-+
-+SHIM_HIDDEN void ShimFree(void* ptr) {
-+    free(ptr);
-+}
-+
-+SHIM_HIDDEN void* ShimRealloc(void* ptr, size_t size) {
-+    return realloc(ptr,size);
-+}
-+
-+SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
-+    return calloc(n,size);
-+}
-+
-+SHIM_HIDDEN void ShimCFree(void* ptr) {
-+    free(ptr);
-+}
-+
-+SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
-+    return memalign(align,s);
-+}
-+
-+SHIM_HIDDEN void* ShimValloc(size_t size) {
-+    return  valloc(size);
-+}
-+
-+SHIM_HIDDEN void* ShimPvalloc(size_t size) {
-+    return pvalloc(size);
-+}
-+
-+SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
-+    return posix_memalign(r,a,s);
-+}
-+}  // extern "C"
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild
deleted file mode 100644
index 9204ab36f972..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-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-${MY_PV}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
-SLOT="0"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	dev-libs/openssl: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:0
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RESTRICT="mirror"
-
-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
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.5-qt-5.12-symbol-reexports.patch"
-)
-
-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
-
-	tc-export CXX
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client update overrides.so
-	newexe "${FILESDIR}"/ts3client-bin-r1 ts3client-bin
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	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
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.3.0.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.3.0-r1.ebuild
index 9e873515c3b8..1939f471108b 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.3.0.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.3.0-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
 	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[geolocation,widgets]
+	dev-qt/qtwebengine:5[geolocation(+),widgets]
 	dev-qt/qtwidgets:5
 	net-libs/libsrtp:0
 	sys-libs/libcxx[libcxxabi]