Update teamspeak-server-bin-3.0.6.1 to v1.2, add teamspeak-server-bin-3.0.7.1

5 files changed, 170 insertions, 20 deletions

diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 42f997f6..59ac3a1d 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,9 +1,13 @@
 AUX server.conf 501 SHA256 908af5130cf871b00f2c46aa88d2ad4d1b0873fa995cbeda03e3aa563230671d SHA512 c7f786e5dcb93029a444eb37eaa86ddbd6d5ace9c8c870ecc4b43bde3a313ceec88d6085f3a198ba4b12b7b626524bc74d19121660bfceb4025ba54b02dbc82a WHIRLPOOL 388feaa659bb1e7cccf9e40e288663a6c53711e3cc7f8c7b524a6e034a6dfbc66a3c0b7e80fd40e401c1939a63daeb08bd7d444ea0bf51bbcba55393ff0bb9d9
 AUX systemd/teamspeak3.conf 133 SHA256 a3851323891a304e6fc5c53740c0e239f167a7c9251cfc8c7e8a4e1b1ac8a1d8 SHA512 49dab025ab37bb29e14a14fb070568c5710fe257a35fe6b887aa404847fc828e9ffecad7c5d10e987128934c433c3b464b8da0e4891ba3b48868b73abb4b9a4c WHIRLPOOL b7980faa9d5c0b83fa1d72eeb14745c050b01bec70a8cd0974157ce02eef06faafb4f7b35a0c4cff496b102817a9d8245237808557472f9452108f46ac9362ab
 AUX systemd/teamspeak3.service 500 SHA256 d211157fd94480c2d4c21e797ba01e51d0ec1563f1a34cbcda503a7ef110ea8c SHA512 332486a1b456fecade65004384f032291ee3d6e55c5b347b7dc6e7a39f6a633e3a381922295a8e431810d425c77b645df42d916d51bc4a1118aff056b606f0a4 WHIRLPOOL 4314ea4a1ecc33164c10017a8ee4328fea22a16ef5a600ea84cd8ac54b9eec2bdd835e85a24c01552a46d78ff869f03c7ef0970d32eafa31a72000f07b780b6a
-AUX teamspeak3-server.rc 1169 SHA256 708aeeedfcb52bf7dbd63bc4787b225174c36e7958929eb45ec46b2b5a96e293 SHA512 2a36ca9b09be43c037689ca85bbd2d77d405a70c460098b4d78ddf579fd09b181483fec96b98c010becd7bc173ebe2b9a05f96d5a9c1116f4bac4dd1c2829318 WHIRLPOOL 676c580e3d6842ecdb15569fc7da5cfeb26b98047e9765f387f9032be990e5b0648d072ee923942f52b6cfcf7695be6f1c01ed76444adfb6ccfb08fb93610f24
+AUX teamspeak-server-bin-3.0.7.1.rc 1220 SHA256 ae20d2a6bd7029a68dd56f91f44de88ea2ffdd55986e62134e1ff6c74eb77ebd SHA512 2281697f6d088a18f68a657c673c77ce14a923688e8731707e826f07918643d845df4243ec2b83ce1ce05b06551727c83517c363d72e8f6fc3ee223bd1fccdcf WHIRLPOOL 62421cfd9de9de9b1aa7ecb1e7031ae5f420a3e011907f9f4097feffabe0c9d05ad3dc556a4e0d03b3ec00f7e51c51fc8e6d7746f4c5f4a6c3c4464c57d52de3
+AUX teamspeak3-server.rc 1214 SHA256 d5acf0bf2ea8ff988f9dc1a2ec70690fd7e160b6af1898e9bd75840cd3abc4b6 SHA512 f6cdb5a80347f103ab38fc89272cf4c2fb5f21612059295911c072a36b4e377c070db62e5a3d293e9131558fe7bb70ed95b3b1a2d112b6727b21b4e218bf3d3d WHIRLPOOL 52f4a7a7bff4dcabc7ee49d1b26ddd8a0f3a1b0206d3224ca8331c0c7f54f75365ab492bd5d47377a39873c60b168eba1deda8e419a2c54f3a4bd994f6c3e612
 AUX ts3db_mysql.ini 99 SHA256 57f81c410d7768a7550b1f01697bb65f2ea7cd4548cabf8ff75a352ea39d453d SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db WHIRLPOOL b378b5b4bba9d71ac07b08bd3715aa388e3e378450dd2827497638859775c7364059880e7a64cf7525776a1b96aff497f40917aac0868ebaa6a79f5affcf7075
 AUX ts3server 264 SHA256 fd640796c87ff8be2ee4992b5d05512fc39624f2bcf75adf3a25f4ca8deb585f SHA512 b839d393550f08e0b8e19d78879d2be13f47d8d8cd7a81106ca39ccf475be780cd2f07e7188945f8df1da443d3dffd2f948620b96a41e66aaf887111a22dd9ff WHIRLPOOL a466dcdcda46468d7e31e1a5be50e88b025a58c00ea1b84f54629810b3fae01025a5c4b9172719945fb2da7023c129f7533f42e92f5b20ceab67fa4a3d141db4
 DIST teamspeak3-server_linux-amd64-3.0.6.1.tar.gz 4131518 SHA256 5d222d1f6b28db856788e0004a1a2143372c82fecbd0651e8a575cee8742ef3c SHA512 e5700fea5bf4df2134449cf3a57a823feb4bf72e052bec242fe4d180563a44cf48acd3d46f3ac2ec1a9c300ab903ff132cb16e06501cbac4650993240656414b WHIRLPOOL 4ba2a6f4561365c1441c7bec861b057e8d66d5ea9f08f05e472c2ed70ceedec5898b149e9cb208d0cdea7ccccde97acda0de9e412c5e86cc8a25ff3a25b12ee2
+DIST teamspeak3-server_linux-amd64-3.0.7.1.tar.gz 4470985 SHA256 500b9a75dbe5287db7f4d8b788e53b73069c9d1d49cebc8b6b5e0b3081e0473b SHA512 aca25cfd0d0d0d2e3c3832cbac256f5e8996c3593659f5fdf01de1192a35246d4cc222dbda236d75adae31911fd03a2b345f8beb2874b79b62b95ff2c0f528e0 WHIRLPOOL 99c8c62565038828765965cd0eff35245d305b80074042a0dc296b50eb23df9823676351db84e8ec0e79faeb6fc26622a6c6488240957f16afb87ea8457e42a9
 DIST teamspeak3-server_linux-x86-3.0.6.1.tar.gz 4436951 SHA256 ea0399bfce623b09e15dca4fc970528ae7b4cee27027ff2ab03a1563da562f0c SHA512 5e022bcb8b3c0b8c728c2ea85421908c86f9e41ea87c172a246fd749b04182467cfdaba8d53413b76c6dbbf97d598564e533245f2530f6375c5cd35465c2f850 WHIRLPOOL a4fa70b534bd3370cda50de7f462126db2d0a34bbe4fa5fcae3c226d277f03bc30d8af09d3909c79f005decc68b5f8c15517fc9e7a485d8c9807ca83082402d1
-EBUILD teamspeak-server-bin-3.0.6.1.ebuild 2155 SHA256 5b992eb4374b12cfd03965095c216bf4b3d21329b89b5ff57aa971fd56c872f8 SHA512 d65af1f202de32dabfac6455da7223963262f0b565465fd35fc999a472fd40fe8fadcc08297ea7ed11b3c87f48c40412ad5cc8109fd1e26c905d6f9b3d82624e WHIRLPOOL b80293a5776152657006da3b0ff23e3d829a6889cf256ded6a5bd213ed30c39fa2cb3e4844d91faef15214f24666604bc7d668074ebf0acf93b97d1076e2ebbd
+DIST teamspeak3-server_linux-x86-3.0.7.1.tar.gz 4751494 SHA256 bc565b74b4c6d6e9a348c51c0f227514a6efce437907eb1dac301ea5bcc449c1 SHA512 02cd68186c4a4040f0373a4e873ac4a11d65b6d5c7fc833974341cdd4163f0efaba66fde61500acaefb664d8502a40341f9ddffd96cd7aa5163392f3d2b41bcb WHIRLPOOL f1ad3e4cfe3a8ebc2674b40295c0fff83b79abbd79198329316e7a9702844f803a24e28e11f1f140b6e9ae091881a6150fd564d69beb5b1bbc81abb59bce6a89
+EBUILD teamspeak-server-bin-3.0.6.1.ebuild 2480 SHA256 790ce39655581cb70cb1126948ca27c73efc9f1b84e6906ff9e5ea1ef2c665dc SHA512 164fe472ca21ced8e848931b8730fe80e3bdf0b4a6bdf51ba70207fd2be71361aa35d3924a76d87db1a38315fb1b66e7afeaa4099318a9169c304e0cac470bf9 WHIRLPOOL 7158f529dc6403c9f0a253a5a5e24febe204765e02399cbb62d74192c2a19cd223b01b9f87dc6c0ffef49e23e8148d8ecabd7fce0c5bb8ff17528c26fa720ac9
+EBUILD teamspeak-server-bin-3.0.7.1.ebuild 2467 SHA256 1be316b2a1ca2e99a25052c78f98d831929eb7522db1b1c177e2c33549781d08 SHA512 8c36280b3922b668b78266f18389c0e00e2d864e931eab57bfeb73935021bf25058b4a29106c3227b074ceb1c975f7ebd9b8627aba7663d6503e6b98831eada5 WHIRLPOOL 4b1b82c1fdc4b9e3344d8516382187cdb3214c74d96c3b9b212fc8c96d0a07f5771da7bf864fd3d0798d5af3b036d66583a25ee1210253f35356af0a51e21bd0
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc
new file mode 100644
index 00000000..777ccf44
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc,v 1.1 2013/04/25 18:11:05 tomwij Exp $
+
+DIR="/opt/teamspeak3"
+
+depend() {
+	need net
+	use mysql
+}
+
+start() {
+	ebegin "Starting TeamSpeak-3 Server"
+
+	# Ensure that ts3-server finds all custom shared objects on startup
+	export LD_LIBRARY_PATH="${DIR}/lib:${LD_LIBRARY_PATH}"
+
+	# Temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
+	[[ -e /dev/shm/7gbhujb54g8z9hu43jre8 ]] && rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+
+	[[ -d /var/run/teamspeak3 ]] || mkdir -p /var/run/teamspeak3
+	chown teamspeak3:teamspeak3 /var/run/teamspeak3
+
+	start-stop-daemon --start --quiet --background \
+		--pidfile "/var/run/teamspeak3/server.pid" --make-pidfile \
+		--user "teamspeak3" --chdir "${DIR}" \
+		--exec "${DIR}/bin/ts3server" -- \
+		inifile="/etc/teamspeak3/server.conf"
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping TeamSpeak-3 Server"
+
+	start-stop-daemon --stop --quiet \
+		--pidfile "/var/run/teamspeak3/server.pid"
+
+	eend $?
+}
+
+restart() {
+	svc_stop
+	sleep 3
+	svc_start
+}
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
index fb915b8d..454a2299 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
@@ -39,3 +39,9 @@ stop() {
 
 	eend $?
 }
+
+restart() {
+	svc_stop
+	sleep 3
+	svc_start
+}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
index aa90537a..12aa8aa4 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
@@ -1,42 +1,50 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild,v 1.1 2012/10/12 21:23:01 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild,v 1.1 2013/04/25 18:11:05 tomwij Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils systemd user
 
 DESCRIPTION="TeamSpeak Server - Voice Communication Software"
-HOMEPAGE="http://teamspeak.com/"
-LICENSE="teamspeak3"
+HOMEPAGE="http://www.teamspeak.com/"
+LICENSE="teamspeak3 GPL-2"
 SLOT="0"
 IUSE="doc pdf systemd tsdns"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="installsources strip"
+RESTRICT="installsources fetch mirror strip"
 
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )
-"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )"
 
 S="${WORKDIR}/teamspeak3-server_linux-${ARCH}"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+pkg_nofetch() {
+	if use amd64 ; then
+		einfo "Please download teamspeak3-server_linux-amd64-${PV}.tar.gz"
+	elif use x86 ; then
+		einfo "Please download teamspeak3-server_linux-x86-${PV}.tar.gz"
+	fi
+	einfo "from ${HOMEPAGE}?page=downloads and place this"
+	einfo "file in ${DISTDIR}"
+}
 
 pkg_setup() {
 	enewuser teamspeak3
 }
 
 src_install() {
+	# Install TeamSpeak 3 server into /opt/teamspeak3
 	into /opt/teamspeak3
 
 	dodoc -r CHANGELOG doc/*.txt
 	use doc && dodoc -r serverquerydocs
 	use pdf && dodoc doc/*.pdf
+
 	newsbin ts3server_linux_${ARCH} ts3server-bin
 	dobin "${FILESDIR}/ts3server"
 	dobin *.sh
+
 	# 'dolib' may install to libx32 or lib64 - we just want standard lib
 	#dolib.so *.so
 	insinto /opt/teamspeak3/lib
@@ -55,21 +63,22 @@ src_install() {
 	insinto /opt/teamspeak3/lib
 	doins -r sql
 
-	# Runtime FS layout ...
 	insinto /etc/teamspeak3
 	doins "${FILESDIR}/server.conf"
 	doins "${FILESDIR}/ts3db_mysql.ini"
 	newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3
 
+	if use systemd; then
+		systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
+		systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+	fi
+
 	keepdir /{etc,var/{lib,log,run}}/teamspeak3
+
+	# Fix up permissions
 	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3
 	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3
 
 	fowners teamspeak3 /opt/teamspeak3
 	fperms 755 /opt/teamspeak3
-
-	if use systemd; then
-		systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
-		systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
-	fi
 }
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild
new file mode 100644
index 00000000..d70aa068
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild,v 1.1 2013/04/25 18:11:05 tomwij Exp $
+
+EAPI=5
+
+inherit eutils systemd user
+
+DESCRIPTION="TeamSpeak Server - Voice Communication Software"
+HOMEPAGE="http://www.teamspeak.com/"
+LICENSE="teamspeak3 GPL-2"
+SLOT="0"
+IUSE="doc pdf systemd tsdns"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="installsources fetch mirror strip"
+
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )"
+
+S="${WORKDIR}/teamspeak3-server_linux-${ARCH}"
+
+pkg_nofetch() {
+	if use amd64 ; then
+		einfo "Please download teamspeak3-server_linux-amd64-${PV}.tar.gz"
+	elif use x86 ; then
+		einfo "Please download teamspeak3-server_linux-x86-${PV}.tar.gz"
+	fi
+	einfo "from ${HOMEPAGE}?page=downloads and place this"
+	einfo "file in ${DISTDIR}"
+}
+
+pkg_setup() {
+	enewuser teamspeak3
+}
+
+src_install() {
+	# Install TeamSpeak 3 server into /opt/teamspeak3
+	into /opt/teamspeak3
+
+	dodoc -r CHANGELOG doc/*.txt
+	use doc && dodoc -r serverquerydocs
+	use pdf && dodoc doc/*.pdf
+
+	newsbin ts3server_linux_${ARCH} ts3server-bin
+	dobin "${FILESDIR}/ts3server"
+	dobin *.sh
+
+	# 'dolib' may install to libx32 or lib64 - we just want standard lib
+	#dolib.so *.so
+	insinto /opt/teamspeak3/lib
+	doins *.so
+	# 'libmysqlclient.so.15' is hard-coded into the ts3-server binary :(
+	dosym ../../../usr/$(get_libdir)/libmysqlclient.so /opt/teamspeak3/lib/libmysqlclient.so.15
+
+	if use tsdns; then
+		newdoc tsdns/README README.tsdns
+		newdoc tsdns/USAGE USAGE.tsdns
+		newsbin tsdns/tsdnsserver_linux_${ARCH} tsdnsserver
+		insinto /opt/teamspeak3/sbin
+		doins tsdns/tsdns_settings.ini.sample
+	fi
+
+	insinto /opt/teamspeak3/lib
+	doins -r sql
+
+	insinto /etc/teamspeak3
+	doins "${FILESDIR}/server.conf"
+	doins "${FILESDIR}/ts3db_mysql.ini"
+	newinitd "${FILESDIR}/${P}.rc" teamspeak3
+
+	if use systemd; then
+		systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
+		systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+	fi
+
+	keepdir /{etc,var/{lib,log,run}}/teamspeak3
+
+	# Fix up permissions
+	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3
+	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3
+
+	fowners teamspeak3 /opt/teamspeak3
+	fperms 755 /opt/teamspeak3
+}