gentoo resync : 30.05.2020

3 files changed, 2 insertions, 124 deletions

diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 8232ee950b9c..023d699c7688 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -3,10 +3,7 @@ AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 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.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
-DIST teamspeak3-server_linux_x86-3.10.2.tar.bz2 9049720 BLAKE2B 86f854c2b18397bde3cbb02b9d0024af8d3fbbdc695dae0f7f950fb5670cc6c983e8eb20dee97409a87b6cd572772cf72cfddee0254857023aa4e8446ea71068 SHA512 5ad16efc1a0b8dad6696d4121560cc793a35b15473391fcb18a8edd72031415775fb10d0c686a2af550f36748c17db03ac8caae76b0ef7e4ffa528d3ab416951
 DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
-EBUILD teamspeak-server-3.10.2.ebuild 3083 BLAKE2B 7ff9e60bd939dc15804ce5912786a43f545d0a93c8b9f14b9a1c91dc544233f1e4274929d1d40054f40eaf448073e968787a26a1d92b338f8727464e57f9785d SHA512 971f19bfd38d0080d75329fc10163ffcb7f2f7900e7e922abe898032413abe20029b8f8054e50bf6b80c05a734374d28590c0384d4257b7db262c4d048868047
-EBUILD teamspeak-server-3.12.1.ebuild 3085 BLAKE2B 7faeb26ca5fc3ba156c8aa2eada593993af15ea2d3562a7092dc11cbb72084ae1a8cbb1f06c6390e679bfd73a7f1595468ee4f2a24cce57944d88e5da6f3e207 SHA512 d397bdd12f0ba68cbf419733669d24de022a804af92b7daa2b995f4c57b0046ad14188d64972139db36600795ebaab19126c89945767a28a898a6b8208bf0a2b
+EBUILD teamspeak-server-3.12.1.ebuild 3083 BLAKE2B 2790ceaad0373faf5fb5b6e7ebcb997590ac3916021efabedcd4573c5c785351a1c617e418b2075bc10545c79ca64106c4506bc3844d007dab4aa6add16deb86 SHA512 8c4f7e56d0b035946b02a236d1488be1f2052332012724ef0158f00e58c1c0a7a0b7037a59a838a283e905c72b9194de483c0633c5095097c5920c1307dbbab3
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
deleted file mode 100644
index 50c92db4bba9..000000000000
--- a/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 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/teamspeak-server/teamspeak-server-3.12.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
index bf9ed2742678..8188b8163ba4 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="doc mysql tsdns"
 
 RESTRICT="bindist mirror"