use dosbin instead of exeinto /usr/sbin/ && doexe; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 53 insertions, 301 deletions

diff --git a/media-sound/teamspeak-server-bin/ChangeLog b/media-sound/teamspeak-server-bin/ChangeLog
index 93b0770a21ab..b1046abc1be6 100644
--- a/media-sound/teamspeak-server-bin/ChangeLog
+++ b/media-sound/teamspeak-server-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/teamspeak-server-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.37 2014/11/14 01:40:35 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.38 2015/03/21 21:17:13 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  -teamspeak-server-bin-3.0.10.1.ebuild, -teamspeak-server-bin-3.0.10.ebuild,
+  -teamspeak-server-bin-3.0.9.ebuild, metadata.xml,
+  teamspeak-server-bin-3.0.10.3.ebuild:
+  use dosbin instead of exeinto /usr/sbin/ && doexe; drop old
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Maintainer needed.
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index d0f839d224fd..ba075a1cfb80 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,20 +1,33 @@
+-----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 ts3server 267 SHA256 fd5fb5e2fa508b84b85d84794bc1d5436828fc4cd0729c6cf70c3739e999d0bb SHA512 632297afee021b1603efff9c4070ddeaa10531cab4faa21bc61e259e9109f4d9bc338347da2a435492f509628baf7a8876b3bc7c5a91cb5f81f0c97f8d634c57 WHIRLPOOL 876f82672c0360f65ce87273273952d0f27df4bc37ab030cd575e2d176236fd7790d76879227de7a5e2df495996839df938fc91ef61611641bc4a9fc48d0d015
-DIST teamspeak3-server_linux-amd64-3.0.10.1.tar.gz 4361331 SHA256 db650269c6521aabdc2673a3ad76780bd455c9f1fc3e1081277473a3452e662c SHA512 124ef0eb0c9c32d8e64aca0a76fc3b4fdf503de8e57a90b01a97ccdf476085c0fb32fcf14a057195d8e0280333714053b7e8b85a16bd459ae08027635efcf894 WHIRLPOOL 2215cf0eb08709f6f547546f8d5a068234788d8497da5d7ce9a484afd2955c56f9c91867c026aa89ec67dd3d37663b411c67cecffdfa25c5d825cc744854a6f9
 DIST teamspeak3-server_linux-amd64-3.0.10.3.tar.gz 4361521 SHA256 9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702 SHA512 8a5927c48ef84a1a513f576eae05e11c9c19ac3e84bc6e6a7f3d0f784cea5c94b90ed784f595d17aca0b835b8e2dfd6ef7c78a9f21b2392bc27140f81027f846 WHIRLPOOL 051f95b8102a22a4605c6e85e638ff6fe6c5738725bdb9863d8b7f9bc00083ac75899fb0131de40ed4c10a9594562fa964150d3fb24da8aa9cfd435db1fc7545
-DIST teamspeak3-server_linux-amd64-3.0.10.tar.gz 4358597 SHA256 4144bbdc92ea765bda4a7dfbb176482f56caa8bf52531d9d8afc41401518335b SHA512 b7f63108697074bf9ddd2d46381ef215dc4b02c5a663f6a516929ccda487d6a97ad42bd3dea71ebb17aeaeeb1899476a5cda7a7769048d86c761319de2687b0f WHIRLPOOL 2ed0052fcd4a2051473dccbaecb4bd4eaa1f906c33a2eccaaeb6bc3f127da84da8e6243efe40b2f186ebb996cdb1408e4b8957ad7f42133841a65bd2e096234e
-DIST teamspeak3-server_linux-amd64-3.0.9.tar.gz 4739964 SHA256 3559624ce21142a90c21c8a8e789d420b6043cc97698713a070cddccd8918b08 SHA512 c0b5ba34d28a740ef1a8b458f2203c3f145f117b9d1e38d571c15335fc56a52311bacc320bcd1d9fbec899d5c32548cf3579765ebefa2fddc0287aafb8b5cbcc WHIRLPOOL e8c2605917635211202bb3c3e5a9d714622fb0ea909558cb77fd8e32fd0e22296b4f3fd7119b7cf9b07fb06f06dcd75b3e9f17e9da0f9edc6f3ca365440d7603
-DIST teamspeak3-server_linux-x86-3.0.10.1.tar.gz 4711546 SHA256 c16c0196211d799b9e3038d2f938fdeb33aa1a580a6adc468e2c1175186d8fcc SHA512 f126a97efe5f1999e5e9c085c4d863ea82a1b3a402c353515ff5f0befa127f8f6c5cc6d01e9d071739d5eb0ca4bc18fc066b4c94232f8c3c6cc7bcc0438fd74e WHIRLPOOL 11188d27fec6179c8427b39a0e90f4601929b0efcc50501e8cf1e984e60627607c0dec129a497901f20d5a3b77d62f2767b4d0b300105f328e4674cb6a38c7ae
 DIST teamspeak3-server_linux-x86-3.0.10.3.tar.gz 4711772 SHA256 8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5 SHA512 0c5369aee91bed52276741fd40518f6036fd8db5358305c2dc5b8f898537dc2e1209ebef59c09840ff3c636d1b6aabe75bf0a874658e979a23034c97b20f8022 WHIRLPOOL 042f259576d46c3bea211832edab9ec7c323e721a6196c5f56c23d6f502ff9d9db053f004e07add092a8eec2a44909708155fb7ab241ef8173ca61b743be8198
-DIST teamspeak3-server_linux-x86-3.0.10.tar.gz 4711473 SHA256 8d9c583f14bcd85b4a0e2a40a8744e037256a2a4ec8b2cfa25ed7ab04baea0dd SHA512 13c0c847351e907dd18b5fa4de924359c532f5f3b6d12bb5b8b6d79dc4a455d5d8195ffb68efa30d24c23f23d145e747cda783a685f1c959747278c71509ef5d WHIRLPOOL 6d2e3aacecc892e0984e2113fb2ed7ba387a6156a98bbf41ace3793a4f45cdf86fcbf5ad27ca45280545144e397594ae03f713502c0735b0c695f12dc1da2e6e
-DIST teamspeak3-server_linux-x86-3.0.9.tar.gz 5090445 SHA256 e12d3449f0a63422136bf859e50f9d3d3a9a78bab2b1b6914fc67b62e3a27d6f SHA512 6eddf9d4f6c24475211281d2f7875db6c96f27ce3bcd161f85cae848300cd0fb25a04d3aea12e06e3f9a13c8d2f7819f0d25920c23e4cdb12ad28de8f548790c WHIRLPOOL 86291985191fe539e7066f9fd771dc00b35dfa1e61e3748de9092d02743e34b9f4b03ddc2eae7ddf0d74d20808a4960b5cdee385f8386e9acc5f0de9092e9a21
-EBUILD teamspeak-server-bin-3.0.10.1.ebuild 2566 SHA256 c4b665a73d858f632f57e8f2c455e8fcf3dbc178722adaccd4e022fb55774124 SHA512 c0acf3ba39307924c56f1051bb14a667f829c1c3888b8c1cf60794381732243dde2a49319df65fda9ec86ed66a469ae19eeab18e8f6ad2b602af73f831d574de WHIRLPOOL a0823d3649455ad07e66d5f500f5761278b3adc911baf0187f86aee23ceddb663da269f181e3aa38948bca2ebfaffec3a70707d23903785019578210ea4a9c99
-EBUILD teamspeak-server-bin-3.0.10.3.ebuild 2566 SHA256 8725157efa7b238f442274620ecbe66db6a3515d194fe4515d2442db4223bc10 SHA512 02045a831d22ead694cc4120d1b1f5bfcaa8f5788ac7fbd7cf64f140cc788828f99717c8c1daad4e334ce14c8b03f0002fa9d0471252cc544b1417de815262c0 WHIRLPOOL 90eeadff2894a9305b8c7db1811d0ce912abd7f4ca24045acea104142a9c109d23ce01ca401250286bb947e72bcf2703c18587f5ef09507a57a6a352729a0808
-EBUILD teamspeak-server-bin-3.0.10.ebuild 2564 SHA256 16287a66803daa729882d7ad122eed8eff0a1c9ca99312a0a7375d7f9b6f87b2 SHA512 6e347299345e816aeec212dcae38903f67b393cf153a4feaad6b70616f7189399e712bcaa248291fa0ca0a3ff3318890089a4fc763118de89e316132c2efa390 WHIRLPOOL a427d3ba7edccea447c2155d6ae1db358287af54887d7f87fa1cf8b46dd5d5a6d71359af6cd6dd6950e2fafe53ae643eb6890e0b391c0f06e59e0feaa6619a02
-EBUILD teamspeak-server-bin-3.0.9.ebuild 2563 SHA256 501cf97d9cf7d16e7bbb01f3eb947e9c49dec139558a82113750cfadcb894d2e SHA512 92dbb31adb7d8dc813f8fc6e9a1156f420d579b70456713b6d2fe7497f57c7366c9230241bae7ef420f40ce8a3f1105960d150eae7d3191c1ef36b83d7248dd3 WHIRLPOOL f81850c71e2bad1eec3272f0a7655ed6612ff6ec98c8de8dcfa97baf315448482a9e2b4deafac3b7f57bd3d0d8aa2e2b1b592e75eb2b0902dac23c0046dbc759
-MISC ChangeLog 8127 SHA256 5da38a754c9ff9d23950aa8970e55aa8e0bb462afc8c360f743cca857f710860 SHA512 77d87e2aee31cca310f630f5569a1ab2b9a36907ff9e14521745dd3af5c914d48b580c04c9cd2a6acb673de068f82045faeb7d6f0a0308d9cfaf67d3d9cda42e WHIRLPOOL 3a2ffdca42fc10eeab3fa2e9f3e04d546219e855433198feea918aeb2b542f89ee433d9aa46611e49968801ac0d704532d30f303449601b315539caac594a0bc
-MISC metadata.xml 373 SHA256 e250b8acabf9e1c390fe4f0a6c4fb551b4c9c4b524546093eaec1261a62bfa3d SHA512 9ea9ea00d31d6a675c7a1300eff68df2176594c50ee30567dfb1635aa2a762cb5d2df950a97854290092c88c303f76423c9ff6202efc7b5361433a3c3f0669d2 WHIRLPOOL bf415d2db491b294eca446c19b0b0af6e0c3fc845d2004d8d873638fafd8453d637e504bfc9485c746d406fd728a23dc86aff7f07dd7d154e011069dd24fa3ee
+EBUILD teamspeak-server-bin-3.0.10.3.ebuild 2384 SHA256 c64cf6a0cc5d0d5e4a91a5101f40b6ab2c32ab5cef1163913b2ae4ac8b6d36ed SHA512 398125a6c5635a7033e70d76ebbe48a699da7d7e255007ae62323168f1778268f9f46da692eb034d051c9b53a86608626ed6fd35c998dde717d9d80311d71fc3 WHIRLPOOL 82d837748c11d687c6a33679a067a70408ea8812773c0d506a81004e20b04d9bee4f41632e4f9e69e69243c81edd3adfb3edfc35fb608a5a4b64c514e5395b6a
+MISC ChangeLog 8405 SHA256 61dcd22e41d64242c1022ef9ae435cf1187c5e5b70461ef869feee26d8b37b26 SHA512 37701b544a168a2e6daeefd53fcd9015e600c31cbabd4e1a9cbdc1b57b0758893fdeb6818ca3c79b2a296032bfb03c404de8323f1ef4bbc5cd694a3620dfd442 WHIRLPOOL 635a95ce4340931db0fe9f3e83e4cdced1c7ae90e11136f3cc704f6c8a398d32a6d192c0bec34bd501da8b10006ec006fb887a9dc8623f7d35aa2a1b20b172fc
+MISC metadata.xml 382 SHA256 a2786caff34b4e4a0e9b9e9e104ddde2b9ac56cd41f8605d7a5a6ae05b7dc2a7 SHA512 bd4a3964c4f62c4d3edb9c25cccf8ec160a73e32b755b903c3bc385a100bfeb003bb86f5f85214c91418059428d8e9ca26931c8a8b6026e2e14f2778f338a5dc WHIRLPOOL b7a4fa5516ba84ae6ffab7583ee6aa09cc8f6f0fc797c10b421ed4b74698d70d9218a1bc4be84d4e19c10ef792023800769aba48bd3bd13a5ea923c112cbe9fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDeANXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirycEP+wTqq8pfgB1Ps2Zph6M9ebLv
+i6kTHFTcXzoWqpgqRM9wsMiaRde8NkjKeXf5CztR+S0QETZr6S1xVYZK31w4jvZN
+DtOAfllbeFl+nuyAftD2L9ApjgkhlI3eYKzWE5SJGctOjUE36lY6kix1WZ0/FUeT
+ltCNP1S2Ae9sw3TyYyCwAG/nVHHu0qapfpbZfcSpFDpxB9n8tZcJPCF92pRR+yC6
+5jbhbVMvfH6ist7N1AgAzH+lCdVjMg4I+gBcz0qj/3ZyjLgvvOxw8wlNbDwHs2R3
+j/Biamsn2l3m5NLgSEXav4No+X6D/Y6ZJJvbYGWh17Dlkg7mFrzZexKuw48LW3QJ
+E0Ks/wlkxildJM5c68iEUxB+nP09b/ZLuHoXDIJCyD4YHQ9OvzVxAhky25NFUG7T
+E55D1mWHHDcu8MLvsU2HLnOx5PjtwDkNij6UxUslEXUloE62yBpxdUMTrDHGIiyz
+GxFi88KE/hBTUZDzl+NbCFnTy3Mi8TqVEsURDZdWT4OPrC7BwxFTX590YM7EjPQp
+X8hhpsGEiCggmUxEc1THbMI/dsnyivKZsJYKGz5n11u/M5/KtxbDK/5Ul67y61aE
+aXwNVrXca4nb88LYy+l7iD/RK4deklcYFCMa2J8a6Kr7Wd/3bSduSWq5K+X+vNAJ
+gzoBiB3WAbnAJfPGX2wP
+=Q09G
+-----END PGP SIGNATURE-----
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index c611e7116c89..9d47011f5298 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
 		TeamSpeak Server (Voice Communication Software)
 	</longdescription>
-	<use>
-		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
-	</use>
+  <use>
+    <flag name="tsdns">Make use of TeamSpeak DNS.</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.1.ebuild
deleted file mode 100644
index e6bc6355e199..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.10.1.ebuild,v 1.1 2013/11/12 22:21:53 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 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-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-
-	# Install binary, wrapper, shell files and libraries.
-	newsbin ts3server_linux_${ARCH} ts3server-bin
-
-	exeinto /usr/sbin
-	doexe "${FILESDIR}"/ts3server
-
-	exeinto ${opt_dir}
-	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
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver_linux_${ARCH} 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
-	doins "${FILESDIR}"/ts3db_mysql.ini
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-3.0.7.2.rc 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 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild
index 518edd6b1661..ee8c76d2f982 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild
@@ -1,34 +1,30 @@
-# Copyright 1999-2014 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/teamspeak-server-bin-3.0.10.3.ebuild,v 1.1 2014/01/27 16:05:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild,v 1.2 2015/03/21 21:17:13 jlec Exp $
 
 EAPI="5"
 
-inherit eutils systemd user
+inherit eutils multilib systemd user
 
-DESCRIPTION="TeamSpeak Server - Voice Communication Software"
+DESCRIPTION="Voice Communication Software - Server"
 HOMEPAGE="http://www.teamspeak.com/"
-LICENSE="teamspeak3 GPL-2"
+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 )"
 
 SLOT="0"
+LICENSE="teamspeak3 GPL-2"
 IUSE="doc pdf 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}"
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}?page=downloads and place this"
+	elog "file in ${DISTDIR}"
 }
 
 pkg_setup() {
@@ -44,8 +40,7 @@ src_install() {
 	# Install binary, wrapper, shell files and libraries.
 	newsbin ts3server_linux_${ARCH} ts3server-bin
 
-	exeinto /usr/sbin
-	doexe "${FILESDIR}"/ts3server
+	dosbin "${FILESDIR}"/ts3server
 
 	exeinto ${opt_dir}
 	doexe *.sh
@@ -69,8 +64,7 @@ src_install() {
 
 	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf
-	doins "${FILESDIR}"/ts3db_mysql.ini
+	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mysql.ini
 	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
 
 	# Install the init script and systemd unit.
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.ebuild
deleted file mode 100644
index 11d04d2e1869..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.10.ebuild,v 1.1 2013/10/12 12:35:31 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 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-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-
-	# Install binary, wrapper, shell files and libraries.
-	newsbin ts3server_linux_${ARCH} ts3server-bin
-
-	exeinto /usr/sbin
-	doexe "${FILESDIR}"/ts3server
-
-	exeinto ${opt_dir}
-	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
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver_linux_${ARCH} 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
-	doins "${FILESDIR}"/ts3db_mysql.ini
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-3.0.7.2.rc 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 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild
deleted file mode 100644
index 9d255ebe1329..000000000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.9.ebuild,v 1.1 2013/09/21 11:53:32 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 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-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-
-	# Install binary, wrapper, shell files and libraries.
-	newsbin ts3server_linux_${ARCH} ts3server-bin
-
-	exeinto /usr/sbin
-	doexe "${FILESDIR}"/ts3server
-
-	exeinto ${opt_dir}
-	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
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver_linux_${ARCH} 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
-	doins "${FILESDIR}"/ts3db_mysql.ini
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-3.0.7.2.rc 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 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}