gentoo resync : 22.04.2018

14 files changed, 226 insertions, 233 deletions

diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 49e2e5b4a8f8..6ba9358d39dd 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,13 +1,11 @@
-AUX server.conf 337 BLAKE2B 9733300367c7ea7da499f494a02bee8fb1a14203746972876b982b953e45b9b0046d931133e0a8d7bbf4bf0de6aaf078dab141dcb41b83a3d82f744f39fb016f SHA512 870acb2cc74b3a48fece9502cc09dcb8a63db8671721c642f1648a305b08b92cccdd883b08e33e28165bf52fa59b5b745f18401ca115deef8fd9f3b190bfc750
-AUX systemd/teamspeak3-r1.service 505 BLAKE2B 4fee78f7f5d2d33a53b5314894ed7a0665bdd7cfdf8247fff29d0c020b457181c45c03d5dc8498fffd9462a844573f487d177e26ba1adbef162b1bd1b239a8d4 SHA512 28b2b0b1d7fe0b0ccb185446711e98ddb464360061597a90283513f122076fecac47198bc08c4c12e920f008472a4e8f6db7d79a27c711202a7167f05bed78ad
-AUX systemd/teamspeak3.conf 133 BLAKE2B 0bde30391dfb09a37c203ad8440b279cac89e9fba37522bc1fb6a71c1d8ec746f39c1f260b7b456d1c8e05aa46117f3a06f7ceb7319211219e5dc4e4c44c7e5a SHA512 49dab025ab37bb29e14a14fb070568c5710fe257a35fe6b887aa404847fc828e9ffecad7c5d10e987128934c433c3b464b8da0e4891ba3b48868b73abb4b9a4c
-AUX teamspeak-server-bin-init-r1 1025 BLAKE2B b380910b0e1ab728f20d7d2f84fad258586a3df322246034eaddb6fe93a46251881c46877f36f213b0929fe7d152c0303db1788f108067d52bcbfa36385d5d36 SHA512 8aed2b27a658ad62389b445cf8ce4b6215ca106d58ebad378a0c403b4a2b9c41f2b0f3129ba020289b878bb96dc65b50974fd30f56e90435fc8a0903f1557f48
-AUX ts3db_mariadb.ini 98 BLAKE2B 3b47d9a4f85c60e2d660e4790357ef9f3b2fc75aed798e518e48159407188aac912e2159bb2537a3f489557121ddc3cfd0859224269eb66604e00bd776768b73 SHA512 d2d1ef64c90638fde3cc587d351987b16e96d8cfc83672dee43c0294ab297b83106e682d834008f0213b67b975dadcd4f77c63332c39d155a4125a28206ba7d4
-AUX ts3server 267 BLAKE2B 54b6ff156cd6889deebc6443f55ef08d8a05c51d3a2ccb83f141202412dc23d9232027a200731ca9ef75bf15be8ab5fd5af966244ff4673b8fdbca06ed105ecd SHA512 632297afee021b1603efff9c4070ddeaa10531cab4faa21bc61e259e9109f4d9bc338347da2a435492f509628baf7a8876b3bc7c5a91cb5f81f0c97f8d634c57
-DIST teamspeak3-server_linux_amd64-3.0.13.6.tar.bz2 6492488 BLAKE2B 4cad8545968423c2e65853d73f99a46cbccce628982c0a4418eaf34802d6a171f7e89a4ffc2fbd9fd82afdd9ffcd58d214c894ad88862c2927f1aec72f2d3087 SHA512 95271e5a44c7a14b8fbe134b855973c1af53ac76e6ba01089116b1f63c03bae25f5abfd176f9e26207aa4da8501d646298128078ab5b475458a7ccaba2a48e9c
-DIST teamspeak3-server_linux_amd64-3.0.13.8.tar.bz2 6916065 BLAKE2B 0ff4d86a03c910739f27b624d023ba3a5f323f4d56bca6a29a5ce8a737901372ff22cf18f2cc589af07b373fd17f952896ae2aa623571fc004a653125772aa0b SHA512 d8985f5850602660a6c037c1768a97c79b5842640d618ad00d242035a12820b52ba959545f3e668eb3d6079b1a228ff648c569e7d1fc64be6743ee77995ab0be
-DIST teamspeak3-server_linux_x86-3.0.13.6.tar.bz2 6367104 BLAKE2B eeeefe664018e6072e1832d1fc22c24604cf230166269ac63a73cde02fc3e78cbdc3cf6e28dca37d8152e146bbb53489af1e3706fc98047c2389ad97053116f3 SHA512 a35e0fffe320206f2ca19153bd46a910bd1690541c83ec3c784fe1f4aaf8dbe430556990f6ebe0efbe71e52d3887b725da4e659db9d1e3c96fd6fd46e6dcd40d
-DIST teamspeak3-server_linux_x86-3.0.13.8.tar.bz2 6772664 BLAKE2B bde804a069a2700981656860f10d70a45511793370c978c0fc0c3926f039df367d61536657db987c6cc57e8aef543210527e9ff6e8316a5e78319dbd2f874c56 SHA512 7ef5d5d0fa2a1244011c2a68662481e4859aa1660e967b203a508497a4fd3c54db44a9f33116ed4932745942df4b5e4c646658346f288ce6191e3e5629d9638f
-EBUILD teamspeak-server-bin-3.0.13.6.ebuild 2589 BLAKE2B ed81f294c9f15a6d58bc29bdca432a1bcfd72bec8b84c7df524a4116a458f32ee390552be00714346c5e8396a124e028ac98e03b87c3185cbd80af2a806771e9 SHA512 52c6c4cd6eab65c1354887024e45875e975effbe003a60b49c21b101df7abc90ada71984f8000af4221b897a71734fb8274a392527e555245d715c6d972224f0
-EBUILD teamspeak-server-bin-3.0.13.8.ebuild 2589 BLAKE2B f66cd00c651ca5c000b64fbcb5a2b9ae30039455789eeeb6b14a7ce2cb54f3af66f7812a008b4a0269aab6acaa3c1e684255fdefe06be752e7a808efff4c723f SHA512 26688cca026f2d9aa6c5bad4bb540b4f0bf85ca267c3a67e6d702d9e73a8d227b86c68a6bdda966ca4aea9025c99ad09bbfd280bd2e6dc866a9ee3cd0912f35c
-MISC metadata.xml 523 BLAKE2B 633c679661b79b125ca2c0fbdb0ba66ad96e62e66dc2d7e68b75ac800568d2fa1b495385ca4eaf0a0209e6afbec59c90bc3490eea2964c28c6d6df035c6204dc SHA512 c3a7d1accdf12312319f7cf573dc82454b3ffa5201e3c243abcb1f582267f0523e250954cd4894954bcd729d272d0f10af6bf76a73aa421c3fc6a9d438a4d897
+AUX teamspeak.initd 1094 BLAKE2B b9332ff2e24922992a2ea6bf11ddbc7ab07d5c3e61de59ddd2be2343ce38facb529b81c86fc7bb45eb9b3ead0569201accd259c07c52b20da8368f1beb7873bc SHA512 f7c2b3f555bab16caba59d501c64e5cf809ec4fbd81fe9bfbea3f5db0d9689a1cc89f5ebebc631d4e67b24ad5c4bba9343267746b0dbbdd827f00f5444eb6737
+AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7d01c8931a18bf63615b0a125dec420f35e2517dacfd760750957997fcf58e69bcd2ca0721b4e2054ae SHA512 a31633591ae97224f3aefef25ed9d50e6cedf252c94559f7c424065ae815e0724c75e1c71337283933283cc77626d106ba5e15f3cce5c5dfddfc74a1f99160ba
+AUX teamspeak.tmpfiles 131 BLAKE2B a6bad602a95e98b46f55b06dc398bd9757b9e4b3aacc511295c2121790e8decd63a6ccae9d60ff915959cc4bbdb494eeeb5eb42f182f1b24b32bc7c5cceee3a7 SHA512 ecede9a97cf7701cbc96508ab8ed7cee0c4c041c45e48e3e53d5c3696458540ea00c81fb9a57e72d09839a96d808c287494b2a0629f143b6686f0291e046ec79
+AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
+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.1.tar.bz2 7798155 BLAKE2B 4962968b33eaaa07043cfaa23d020d3d7dcff19b9e380f797196d382a4d004fb0ca2a56246eedf246f796e1bea8f719e80e715b2eda67e5340b7042dd1111a57 SHA512 8561cbeb16a44889ddaa6ab054b47abaaa6a5c942f39c308f6afd2687110bc9e142a8711afe557fa22fe92d1395b844a0eff8c8043921aee4e8070571bee6e44
+DIST teamspeak3-server_linux_x86-3.1.1.tar.bz2 7658201 BLAKE2B 1625200a625ad7615241341846e992de8567c7fa7f6fbeb5234953ab696d60809591f870157e947b06953cb421019c7d0cf920bd0ba65968c4178284b0154206 SHA512 952e2e5d467f68b6f5f0bfc0e4f5a71917c2c14809aeccc64038679e6fd7a20f0794e0662f7a2fec1827a5a99249d1df3a673fb53e324524b4320c64083608c6
+EBUILD teamspeak-server-bin-3.1.1.ebuild 3646 BLAKE2B d6b39d6fc98dbd4e0e407d07745c5a90e6a937abf294a34037e741b17884956fe870bf11a8f421dc3546959baa3fe76ac668e980bfcdbaba4b209776c344f61e SHA512 af844cb9889a8bdc9c0156a9619e2499efac40c8bf5fa3e7e88d961e771494d822fa5c231b33cfd6c7204722c9f89012d2a54e5fee927efbbd1dd920342b9364
+MISC metadata.xml 659 BLAKE2B 77a9ce51277977d958712db9e729c1c6517ad29a3c87b0f775fe7c414273cf3fee43ca070894065949f766a22019af72e7a1a23fcbacd4641fa8c43571aa6a7f SHA512 2404a4075934843c4599d42c99e6042f99d9131066c9ec4a36ca08f361d01c9c15050676dc7760a34eff1a173be41cfd91c270fe616696dd36b08cae4f7fda53
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
deleted file mode 100644
index 435325bb89f7..000000000000
--- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=TeamSpeak 3 Server
-After=network.target
-
-[Service]
-Type=simple
-Environment=LD_LIBRARY_PATH=/opt/teamspeak3-server
-WorkingDirectory=/opt/teamspeak3-server
-ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
-ExecStart=/opt/teamspeak3-server/sbin/ts3server-bin inifile=/etc/teamspeak3-server/server.conf
-ExecStop=/bin/kill -15 $MAINPID
-StandardOutput=syslog
-StandardError=syslog
-User=teamspeak3
-Group=teamspeak3
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-
-# vim:syntax=dosini
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1 b/media-sound/teamspeak-server-bin/files/teamspeak.initd
index 44b7b7c6f946..cc8393b58db7 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.initd
@@ -1,11 +1,14 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+command="/opt/bin/ts3server"
+command_background="true"
+group="teamspeak"
+inifile="/etc/teamspeak3-server/ts3server.ini"
 name="TeamSpeak Server"
-command="/usr/sbin/ts3server"
 pidfile="/run/teamspeak3-server/server.pid"
-command_background="true"
+user="teamspeak"
 
 depend() {
 	need net
@@ -20,17 +23,17 @@ start_pre() {
 	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
 	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
 
-	checkpath -d --owner teamspeak3:teamspeak3 --mode 0700 /run/teamspeak3-server
+	checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server
 }
 
 start() {
 	ebegin "Starting ${name}"
 
-	start-stop-daemon --start --quiet --background \
-		--pidfile "/run/teamspeak3-server/server.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/usr/sbin/ts3server" -- \
-		inifile="/etc/teamspeak3-server/server.conf"
+	start-stop-daemon --start --quiet --background --env "TS3SERVER_LICENSE=accept" \
+		--pidfile "${pidfile}" --make-pidfile \
+		--user "${user}" --group "${group}" --chdir "/opt/teamspeak3-server" \
+		--exec "${command}" -- \
+		inifile="${inifile}"
 
 	eend $?
 }
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak.service b/media-sound/teamspeak-server-bin/files/teamspeak.service
new file mode 100644
index 000000000000..0c77e4cbe756
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=TeamSpeak3 Server
+After=network-online.target
+
+[Service]
+Type=simple
+User=teamspeak
+Group=teamspeak
+WorkingDirectory=/opt/teamspeak3-server
+Environment="LD_LIBRARY_PATH=/opt/teamspeak3-server"
+Environment="TS3SERVER_LICENSE=accept"
+ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+ExecStart=/opt/bin/ts3server inifile=/etc/teamspeak3-server/ts3server.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf b/media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
index c83afe3137cd..1b1d7f0e9902 100644
--- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
@@ -1,4 +1,4 @@
 # systemd tmpfile settings for teamspeak3-server
 # See tmpfiles.d(5) for details
 
-d /var/run/teamspeak3 0755 teamspeak3 teamspeak3 -
+d /var/run/teamspeak3 0755 teamspeak teamspeak -
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
index 7cdc6d6075ab..0a8ebc47df1f 100644
--- a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
@@ -4,4 +4,4 @@ port=3306
 username=teamspeak
 password=teamspeak
 database=teamspeak
-socket=
\ No newline at end of file
+socket=
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
deleted file mode 100644
index 261b47171b3d..000000000000
--- a/media-sound/teamspeak-server-bin/files/ts3server
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-BASEDIR="/opt/teamspeak3-server"
-
-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}/sbin/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/files/ts3server-bin b/media-sound/teamspeak-server-bin/files/ts3server-bin
new file mode 100644
index 000000000000..3deb9dd87e5f
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server-bin
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Sets BASEDIR for teamspeak3-server
+BASEDIR="/opt/teamspeak3-server"
+
+# 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-server
+cd "${BASEDIR}" && exec "${BASEDIR}/ts3server" $*
diff --git a/media-sound/teamspeak-server-bin/files/server.conf b/media-sound/teamspeak-server-bin/files/ts3server.ini
index 0fd2db66c508..962c8b80f0ad 100644
--- a/media-sound/teamspeak-server-bin/files/server.conf
+++ b/media-sound/teamspeak-server-bin/files/ts3server.ini
@@ -1,14 +1,23 @@
 machine_id=
 default_voice_port=9987
-voice_ip=0.0.0.0
+voice_ip=
 licensepath=/opt/teamspeak3-server/
 filetransfer_port=30033
-filetransfer_ip=0.0.0.0
+filetransfer_ip=
 query_port=10011
-query_ip=0.0.0.0
+query_ip=0.0.0.0, ::
+query_ip_whitelist=query_ip_whitelist.txt
+query_ip_blacklist=query_ip_blacklist.txt
 dbplugin=ts3db_sqlite3
 dbpluginparameter=
 dbsqlpath=/opt/teamspeak3-server/sql/
 dbsqlcreatepath=create_sqlite/
+dbconnections=10
 logpath=/var/log/teamspeak3-server/
 logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
diff --git a/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample b/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample
new file mode 100644
index 000000000000..94cea8bbe9d8
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample
@@ -0,0 +1,23 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_whitelist=query_ip_whitelist.txt
+query_ip_blacklist=query_ip_blacklist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=ts3db_mariadb.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_mariadb/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index bde7c6989faf..67ae94b5f922 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -11,6 +11,8 @@
 	</maintainer>
 	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
 	<use>
-		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
+		<flag name="doc">Install TeamSpeak complete documentation.</flag>
+		<!-- <flag name="mysql">Install TeamSpeak MariaDB support.</flag> -->
+		<flag name="tsdns">Install TeamSpeak DNS.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild
deleted file mode 100644
index 8f9f1fcb9fb1..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib systemd user
-
-DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
-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 )"
-
-SLOT="0"
-LICENSE="teamspeak3 GPL-2"
-IUSE="doc tsdns"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="installsources fetch mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
-
-QA_PREBUILT="opt/*"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	# Install wrapper
-	dosbin "${FILESDIR}"/ts3server
-
-	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-	exeinto ${opt_dir}
-	newsbin ts3server ts3server-bin
-	doexe *.sh
-	doins *.so
-	doins -r sql
-
-	# Install documentation and tsdns.
-	dodoc -r CHANGELOG doc/*.txt
-	use doc && dodoc -r serverquerydocs doc/serverquery && \
-		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
-		docompress -x /usr/share/doc/${PF}/serverquery && \
-		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
-		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver tsdnsserver
-		newdoc tsdns/README README.tsdns
-		newdoc tsdns/USAGE USAGE.tsdns
-		dodoc tsdns/tsdns_settings.ini.sample
-	fi
-
-	# Install the runtime FS layout.
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
-	keepdir /{etc,var/{lib,log}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
-
-	# Fix up permissions.
-	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
-	fowners teamspeak3 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
-
-pkg_postinst() {
-	einfo "Starting with version 3.0.13, there are two important changes:"
-	einfo "- IPv6 is now supported."
-	einfo "- Binding to any address (0.0.0.0 / 0::0),"
-	einfo "  instead of just the default ip of the network interface."
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
deleted file mode 100644
index 60875a3cb837..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib systemd user
-
-DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
-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 )"
-
-SLOT="0"
-LICENSE="teamspeak3 GPL-2"
-IUSE="doc tsdns"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="installsources fetch mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
-
-QA_PREBUILT="opt/*"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	# Install wrapper
-	dosbin "${FILESDIR}"/ts3server
-
-	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-	exeinto ${opt_dir}
-	newsbin ts3server ts3server-bin
-	doexe *.sh
-	doins *.so
-	doins -r sql
-
-	# Install documentation and tsdns.
-	dodoc -r CHANGELOG doc/*.txt
-	use doc && dodoc -r serverquerydocs doc/serverquery && \
-		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
-		docompress -x /usr/share/doc/${PF}/serverquery && \
-		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
-		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver tsdnsserver
-		newdoc tsdns/README README.tsdns
-		newdoc tsdns/USAGE USAGE.tsdns
-		dodoc tsdns/tsdns_settings.ini.sample
-	fi
-
-	# Install the runtime FS layout.
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
-	keepdir /{etc,var/{lib,log}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
-
-	# Fix up permissions.
-	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
-	fowners teamspeak3 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
-
-pkg_postinst() {
-	einfo "Starting with version 3.0.13, there are two important changes:"
-	einfo "- IPv6 is now supported."
-	einfo "- Binding to any address (0.0.0.0 / 0::0),"
-	einfo "  instead of just the default ip of the network interface."
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
new file mode 100644
index 000000000000..94b2f7e25561
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user
+
+DESCRIPTION="TeamSpeak is 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-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"
+
+# RDEPEND="mysql? ( dev-db/mariadb-connector-c:0=
+#		<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"
+
+pkg_setup() {
+	enewgroup teamspeak
+	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64; then
+		mv "teamspeak3-server_linux_amd64" "teamspeak3-server_linux" || die
+	else
+		mv "teamspeak3-server_linux_x86" "teamspeak3-server_linux" || die
+	fi
+}
+
+src_install() {
+	# Accept license
+	touch "${T%/}"/.ts3server_license_accepted || die
+	insinto "/opt/teamspeak3-server"
+	doins "${T}"/.ts3server_license_accepted
+
+	# Install binary and wrapper
+	exeinto "/opt/teamspeak3-server"
+	doexe "ts3server"
+	doexe "${FILESDIR}/ts3server-bin"
+	dodir "/opt/bin"
+	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
+
+	# Install libs
+	exeinto "/opt/teamspeak3-server"
+	doexe "libts3db_sqlite3.so"
+
+	# Install sql
+	insinto "/opt/teamspeak3-server/sql"
+	doins "sql"/*.sql
+	doins -r "sql/create_sqlite"
+
+	# Install config
+	insinto "/etc/teamspeak3-server"
+	doins "${FILESDIR}/ts3server.ini"
+
+	# Install init script and systemd unit
+	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
+	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
+
+	# Install optional docs
+	if use doc; then
+		local HTML_DOCS=( "doc/serverquery/." )
+
+		docinto "serverquery"
+		dodoc "serverquerydocs"/*.txt
+
+		docinto "ts3server"
+		dodoc "doc"/*.txt
+	fi
+
+	# Install tsdns
+	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" "tsdns/USAGE"
+	fi
+
+	# Install docs
+	einstalldocs
+
+	# Keep directories
+	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
+	doenvd "${T}"/99teamspeak3-server
+
+	# Set permissions
+	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
+}
+
+pkg_postinst() {
+	elog "If you have a Non-Profit License (NPL),"
+	elog "place it in /opt/teamspeak3-server as licensekey.dat."
+}