Version Bump, bug #530408; hopefully fixes mysql DB problems, bug #519412; fix installation of docs, bug #530414

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 44 insertions, 59 deletions

diff --git a/media-sound/teamspeak-server-bin/ChangeLog b/media-sound/teamspeak-server-bin/ChangeLog
index 74287034ea75..e1f8f97e21bb 100644
--- a/media-sound/teamspeak-server-bin/ChangeLog
+++ b/media-sound/teamspeak-server-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/teamspeak-server-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.39 2015/03/31 09:14:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.40 2015/08/02 13:00:19 jlec Exp $
+
+*teamspeak-server-bin-3.0.11.3 (02 Aug 2015)
+
+  02 Aug 2015; Justin Lecher <jlec@gentoo.org>
+  +files/teamspeak-server-bin-init-r1, +files/ts3db_mariadb.ini,
+  +teamspeak-server-bin-3.0.11.3.ebuild, -files/teamspeak-server-bin-3.0.7.2.rc,
+  -files/ts3db_mysql.ini, -teamspeak-server-bin-3.0.10.3-r1.ebuild:
+  Version Bump, bug #530408; hopefully fixes mysql DB problems, bug #519412; fix
+  installation of docs, bug #530414
 
 *teamspeak-server-bin-3.0.10.3-r1 (31 Mar 2015)
 
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index e2860e1459c9..f07316bd79e7 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,33 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX server.conf 337 SHA256 5520d4d1a0be0fa416e1d4b15f69980cba75c082bf7ae94cefa695af6eb56771 SHA512 870acb2cc74b3a48fece9502cc09dcb8a63db8671721c642f1648a305b08b92cccdd883b08e33e28165bf52fa59b5b745f18401ca115deef8fd9f3b190bfc750 WHIRLPOOL e1bd3aedf729cc5d006cfa43aa41e48e9cf85937f03683352ceab5fcb15913b195c4cf7283b467b7e635cd4df89d72afb179d5e5a004cfeaae0c3be7479916e3
 AUX systemd/teamspeak3.conf 133 SHA256 a3851323891a304e6fc5c53740c0e239f167a7c9251cfc8c7e8a4e1b1ac8a1d8 SHA512 49dab025ab37bb29e14a14fb070568c5710fe257a35fe6b887aa404847fc828e9ffecad7c5d10e987128934c433c3b464b8da0e4891ba3b48868b73abb4b9a4c WHIRLPOOL b7980faa9d5c0b83fa1d72eeb14745c050b01bec70a8cd0974157ce02eef06faafb4f7b35a0c4cff496b102817a9d8245237808557472f9452108f46ac9362ab
 AUX systemd/teamspeak3.service 500 SHA256 d211157fd94480c2d4c21e797ba01e51d0ec1563f1a34cbcda503a7ef110ea8c SHA512 332486a1b456fecade65004384f032291ee3d6e55c5b347b7dc6e7a39f6a633e3a381922295a8e431810d425c77b645df42d916d51bc4a1118aff056b606f0a4 WHIRLPOOL 4314ea4a1ecc33164c10017a8ee4328fea22a16ef5a600ea84cd8ac54b9eec2bdd835e85a24c01552a46d78ff869f03c7ef0970d32eafa31a72000f07b780b6a
-AUX teamspeak-server-bin-3.0.7.2.rc 1246 SHA256 09a118de9a0114d374789fb60970b26f16ff6a369d35ca0e7195e963c3d792aa SHA512 23ef15d422d78d8d9c28efa3dc54796b13f65cb71f2ad8ccbf5dbb32dfd53c1a7cc01b2c607f1b41930c7286396f42ec51fb448722d2ace52bd4aab57422ffe9 WHIRLPOOL 57504f78b50a09438ea03327d4e2d0f49cb2b20ae1bd30ef520cbcf00f9138723ebbddb9d5dade07b03f0ffcb55e83c0475dcefd37874f2f1182d4a74b12448c
-AUX ts3db_mysql.ini 98 SHA256 5b4cde4ed06bf831d6d3ed4bdffa2fd92fd47536a3d0f94352d01df91dcb7c76 SHA512 d2d1ef64c90638fde3cc587d351987b16e96d8cfc83672dee43c0294ab297b83106e682d834008f0213b67b975dadcd4f77c63332c39d155a4125a28206ba7d4 WHIRLPOOL fe8b108a563afafa57aa463b638353277f756ab3bfe858d742ab172cd0ea75d361a07f34f0d65e982e76022d7ce25aabe6c59c04b22958a66969b3c0fa68a7bd
+AUX teamspeak-server-bin-init-r1 1164 SHA256 b9c89824be0d5fc8ec498e2e11dcebd3a0e7849ba3f2448ad65a50242295fcce SHA512 c2d82a3efd2a0e3ab1c8c0abd0e4cf20ca0d22e2d0cf8f6b5f2d7109f7100807f9edc11bb97a6c22afc979244ce55807ec45ef2b441934e2cf9853c43c7b9df3 WHIRLPOOL afafb7592f3f9531c741a61f5a93bb3cd4dddbfdac617b635bc99c0c23b93b85f5947de77322b0a299a985dd5164c9a34586f483230d50806c75e100fd296873
+AUX ts3db_mariadb.ini 98 SHA256 5b4cde4ed06bf831d6d3ed4bdffa2fd92fd47536a3d0f94352d01df91dcb7c76 SHA512 d2d1ef64c90638fde3cc587d351987b16e96d8cfc83672dee43c0294ab297b83106e682d834008f0213b67b975dadcd4f77c63332c39d155a4125a28206ba7d4 WHIRLPOOL fe8b108a563afafa57aa463b638353277f756ab3bfe858d742ab172cd0ea75d361a07f34f0d65e982e76022d7ce25aabe6c59c04b22958a66969b3c0fa68a7bd
 AUX ts3server 267 SHA256 fd5fb5e2fa508b84b85d84794bc1d5436828fc4cd0729c6cf70c3739e999d0bb SHA512 632297afee021b1603efff9c4070ddeaa10531cab4faa21bc61e259e9109f4d9bc338347da2a435492f509628baf7a8876b3bc7c5a91cb5f81f0c97f8d634c57 WHIRLPOOL 876f82672c0360f65ce87273273952d0f27df4bc37ab030cd575e2d176236fd7790d76879227de7a5e2df495996839df938fc91ef61611641bc4a9fc48d0d015
-DIST teamspeak3-server_linux-amd64-3.0.10.3.tar.gz 4361521 SHA256 9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702 SHA512 8a5927c48ef84a1a513f576eae05e11c9c19ac3e84bc6e6a7f3d0f784cea5c94b90ed784f595d17aca0b835b8e2dfd6ef7c78a9f21b2392bc27140f81027f846 WHIRLPOOL 051f95b8102a22a4605c6e85e638ff6fe6c5738725bdb9863d8b7f9bc00083ac75899fb0131de40ed4c10a9594562fa964150d3fb24da8aa9cfd435db1fc7545
-DIST teamspeak3-server_linux-x86-3.0.10.3.tar.gz 4711772 SHA256 8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5 SHA512 0c5369aee91bed52276741fd40518f6036fd8db5358305c2dc5b8f898537dc2e1209ebef59c09840ff3c636d1b6aabe75bf0a874658e979a23034c97b20f8022 WHIRLPOOL 042f259576d46c3bea211832edab9ec7c323e721a6196c5f56c23d6f502ff9d9db053f004e07add092a8eec2a44909708155fb7ab241ef8173ca61b743be8198
-EBUILD teamspeak-server-bin-3.0.10.3-r1.ebuild 2349 SHA256 df8b6b1231a580830360978041227970b3b1022059c70bd5fa83d199fe71d905 SHA512 231658d295bce846df2a36f5c5f7c1bf9f4c6fa214b1d30647e16945e3b0ebe6fc309a3e1dbe3d3a157966c2e2e59fc171dee9df80b56e1f3271dedc3952efe5 WHIRLPOOL 374eb34cb9e919cc897f702f707a66309654bab6b4778618b07398fbbe3bbc4b0801419970bbea13562c3118162e15069e9c4aba429d801f7f682b54737f430a
-MISC ChangeLog 8651 SHA256 69ece61e6e2412f3bc3b7c12225f9fb34a21541b5e1b12856ba3da7d30ee8e3c SHA512 105d46fc80956bb90c194295e5549aad15ecfb2062edb2f803971df42543c2667f9c6d38f0b4b2687b02773fa7517efe05c5b123d2d1edf6890f4396f1273a85 WHIRLPOOL 862d7d8b900ca880a9667cb4986579366d493363f000ac90be348133a4cc6d6a06cedc389d28cd12fc3b30f051b9998d98885a9a97344ac0794a6a1d1ef572ec
+DIST teamspeak3-server_linux-amd64-3.0.11.3.tar.gz 5022929 SHA256 448d35de0de5c0c9b17feba0697fc232920fb68ac2880bbbf022e0386a17b63b SHA512 14267c3d578e64e1a4bab278acf67b28cf80041d0341ba2e73051608643fe2eeaa7e3c7d3f28ae1826c76b5904b824deb68b7430f7e7d808977aeae7fb86beab WHIRLPOOL 2a4cd813b6428074b1d0a0568ebb78cbe5bb8b276d4cb114dd10bb87db03f78b7cd9e3d50a1706af99ae60346db1c2ae6e56c46f58688e1c32fb198743a64626
+DIST teamspeak3-server_linux-x86-3.0.11.3.tar.gz 5177437 SHA256 adf1eaf74056b24ffee798a6668de6c001801546adea2423a626388215729fa6 SHA512 241a86a728fd8990c75d1f509cf13d3ce97744492a5787c00e4294a6acca02a0ad8a6cdf64cc16e2dc41094eb5233b1528bced8c0cf73bdca66c27ee686f8ccd WHIRLPOOL db945e4fa04c2dcbabc6b5d75a7bf30e9e9367d02d57cc5df7d843aaf865c3baf1516c3c0536d99ba9929e143dc10de333764133c1de2c5c826b276e70ba19de
+EBUILD teamspeak-server-bin-3.0.11.3.ebuild 2315 SHA256 f120844466d24e9abea6e8f6bbb60c3112b758232e5f0cbe911bbc6070bdf0e8 SHA512 0fec80c7158ae45b73b8e5b5589dddd480740676b9f1a3461936a7c4f5cc32ebe4c4e02609369e444ce4362c8a36907b2f38d5399df3d0181470026d563453d2 WHIRLPOOL d828f3b829175b95b6b682f107a95488c9be3fd4fb7ab4f6a7af0362e96354ea38e1ffb9686d8baf9793181044df1c84f8f15f93d2767c541458710400eac266
+MISC ChangeLog 9076 SHA256 3b38900a1320290aa6dfc701416a4ae16de33dc9c1db92a6cf680deccbca26a9 SHA512 44a845a8000e9c9980e6e6065e5111514265778f23da7ed950b1cb543a998a9d862b17ff37fbd8aab8712a707182bae71181f4dd12909a3160365eb836a409ec WHIRLPOOL c8f0d26e700847c00b2e7eeda9983482f43fc5bad4d08247c0b2369ddc211e5599c41adc5068d045d484713b8932154d90a3f9bfa44bca55c6c93513e723c158
 MISC metadata.xml 382 SHA256 a2786caff34b4e4a0e9b9e9e104ddde2b9ac56cd41f8605d7a5a6ae05b7dc2a7 SHA512 bd4a3964c4f62c4d3edb9c25cccf8ec160a73e32b755b903c3bc385a100bfeb003bb86f5f85214c91418059428d8e9ca26931c8a8b6026e2e14f2778f338a5dc WHIRLPOOL b7a4fa5516ba84ae6ffab7583ee6aa09cc8f6f0fc797c10b421ed4b74698d70d9218a1bc4be84d4e19c10ef792023800769aba48bd3bd13a5ea923c112cbe9fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVGmWIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirnU8P/1OKWoEG35PncdSekSe3KA+V
-WVjGSUG2ktX+P1aSJH0UBpjjGnK/dEJJsl9zNDIfSlxYei2+9lCR+55WrEr0HHSZ
-zgl/3bs9lEcHB8Ha+VDFmFs5K1ePMi6EtErwyg2qoQkcY8JwKt2S88imgODhKDDx
-h+Md6b2u2FSDZOf2qhzeWgkTZvVUA3O7Lyusehdde2PhMOdRObx9hIg2QJTNXcHq
-shCICKa2sVj+0MkWqUxB4dLxXrb/hraVtoMOoG83WfQUfJMw/6miOVw/YGtNbQC3
-Ff7pt3tFQU/IET+dSn9mqP5TQsvXWZ9+D/CYRfCvKvUz9SmiLEeXyHb+8ecwCbcm
-3uRiKGbIIYb4XUr4d1G+OsXpAJi/IXVTb9w+JuKZJujibIlGYN77kOne8cVMhVUl
-VILbOIrHC7S4ttp4+DfE/qfr6Keb8MJDuxVgjGp+0raMReGhflDF5Sr09X5ZVTd3
-6QAmyWDxue8HQC0FAVFLtJJeATZxJN4MBeAuj5hl9ArJ1V5DRArNg0EyiCg6xKkO
-GO+7xfMDU1bYfhZkbrtby3wBMPrN1PSC0AFX2CKQEnqVJan+8EEUa/eJh7IkSE9H
-K0Zl4KCZFmpuyJgH38ZGZwy7czITWiDn429G9kwiO85pe9gCquyjMK7sjC0hKcQp
-7P4Fl/JH7Erqyen5EJpf
-=rNhz
------END PGP SIGNATURE-----
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.2.rc b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
index 81b869590905..170c811f9293 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.2.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
@@ -1,16 +1,19 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.2.rc,v 1.1 2013/05/22 11:22:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1,v 1.1 2015/08/02 13:00:19 jlec Exp $
+
+name="TeamSpeak Server"
+command="/usr/sbin/ts3server"
+pidfile="/run/teamspeak3-server/server.pid"
+command_background="true"
 
 depend() {
 	need net
 	use mysql
 }
 
-start() {
-	ebegin "Starting TeamSpeak 3 Server"
-
+start_pre() {
 	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
 	LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
 	export LD_LIBRARY_PATH
@@ -18,11 +21,14 @@ start() {
 	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
 	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
 
-	[ -d /var/run/teamspeak3-server ] || mkdir /var/run/teamspeak3-server
-	chown teamspeak3:teamspeak3 /var/run/teamspeak3-server
+	checkpath -d --owner teamspeak3:teamspeak3 --mode 0700 /run/teamspeak3-server
+}
+
+start() {
+	ebegin "Starting ${name}"
 
 	start-stop-daemon --start --quiet --background \
-		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
+		--pidfile "/run/teamspeak3-server/server.pid" --make-pidfile \
 		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
 		--exec "/usr/sbin/ts3server" -- \
 		inifile="/etc/teamspeak3-server/server.conf"
@@ -30,17 +36,8 @@ start() {
 	eend $?
 }
 
-stop() {
-	ebegin "Stopping TeamSpeak Server"
-
-	start-stop-daemon --stop --quiet \
-		--pidfile "/var/run/teamspeak3-server/server.pid"
-
-	eend $?
-}
-
 restart() {
-	svc_stop
+	stop
 	sleep 3
-	svc_start
+	start
 }
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
index 7cdc6d6075ab..7cdc6d6075ab 100644
--- a/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3-r1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild
index 60101e991b9a..e2fa3f0e3539 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3-r1.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 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.10.3-r1.ebuild,v 1.1 2015/03/31 09:14:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild,v 1.1 2015/08/02 13:00:19 jlec Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit eutils multilib systemd user
 
@@ -21,6 +21,8 @@ RESTRICT="installsources fetch mirror strip"
 
 S="${WORKDIR}/teamspeak3-server_linux-${ARCH}"
 
+QA_PREBUILT="/opt/*"
+
 pkg_nofetch() {
 	elog "Please download ${A}"
 	elog "from ${HOMEPAGE}?page=downloads and place this"
@@ -43,14 +45,13 @@ src_install() {
 	newsbin ts3server_linux_${ARCH} ts3server-bin
 	doexe *.sh
 	doins *.so
-	# 'libmysqlclient.so.15' is hard-coded into the ts3-server binary :(
-	dosym "${ROOT}"/usr/$(get_libdir)/mysql/libmysqlclient.so ${opt_dir}/libmysqlclient.so.15
 	doins -r sql
 
 	# Install documentation and tsdns.
 	dodoc -r CHANGELOG doc/*.txt
-	use doc && dodoc -r serverquerydocs
-	use pdf && dodoc doc/*.pdf
+	use doc && dodoc -r serverquerydocs doc/*.pdf && \
+		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
+		dosym ../../usr/share/doc/${PF}/serverquerydocs  ${opt_dir}/serverquerydocs
 
 	if use tsdns; then
 		newsbin tsdns/tsdnsserver_linux_${ARCH} tsdnsserver
@@ -62,18 +63,18 @@ src_install() {
 
 	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mysql.ini
-	keepdir /{etc,var/{lib,log,run}}/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}-3.0.7.2.rc teamspeak3-server
+	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
 	systemd_dounit "${FILESDIR}"/systemd/teamspeak3.service
 	systemd_dotmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf
 
 	# Fix up permissions.
-	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
 	fowners teamspeak3 ${opt_dir}
 
-	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
 	fperms 755 ${opt_dir}
 }