Version bump to 3.0.8. Imported helpful changes from srcshelton overlay, fixes bug #471276 and bug #480896.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

6 files changed, 68 insertions, 70 deletions

diff --git a/media-sound/teamspeak-server-bin/ChangeLog b/media-sound/teamspeak-server-bin/ChangeLog
index 669283092395..fb5959742149 100644
--- a/media-sound/teamspeak-server-bin/ChangeLog
+++ b/media-sound/teamspeak-server-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/teamspeak-server-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.31 2013/05/22 11:22:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.32 2013/09/04 12:31:03 tomwij Exp $
+
+*teamspeak-server-bin-3.0.8 (04 Sep 2013)
+
+  04 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +files/ts3db_mysql.ini,
+  +teamspeak-server-bin-3.0.8.ebuild, -files/teamspeak3-server.rc,
+  -teamspeak-server-bin-3.0.7.2.ebuild, files/ts3server, metadata.xml:
+  Version bump to 3.0.8. Imported helpful changes from srcshelton overlay, fixes
+  bug #471276 and bug #480896.
 
 *teamspeak-server-bin-3.0.7.2 (22 May 2013)
 
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
deleted file mode 100644
index a4a547aea474..000000000000
--- a/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.6 2012/12/21 19:24:29 hwoarang Exp $
-
-depend() {
-	need net
-	use mysql
-}
-
-start() {
-	ebegin "Starting TeamSpeak 3 Server"
-
-	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
-	export LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
-
-	# 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
-
-	start-stop-daemon --start --quiet --background \
-		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/usr/sbin/ts3server" -- \
-		inifile="/etc/teamspeak3-server/server.conf"
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping TeamSpeak Server"
-
-	start-stop-daemon --stop --quiet \
-		--pidfile "/var/run/teamspeak3-server/server.pid"
-
-	eend $?
-}
-
-restart() {
-	svc_stop
-	sleep 3
-	svc_start
-}
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini b/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini
new file mode 100644
index 000000000000..7cdc6d6075ab
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mysql.ini
@@ -0,0 +1,7 @@
+[config]
+host=localhost
+port=3306
+username=teamspeak
+password=teamspeak
+database=teamspeak
+socket=
\ No newline at end of file
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
index 2b2e1c3ce09c..261b47171b3d 100644
--- a/media-sound/teamspeak-server-bin/files/ts3server
+++ b/media-sound/teamspeak-server-bin/files/ts3server
@@ -7,4 +7,4 @@ 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}/ts3server-bin" $*
+exec "${BASEDIR}/sbin/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 8d810c9956ef..ec57db4e56c8 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>TomWij@gentoo.org</email>
-    <name>Tom Wijsman</name>
-  </maintainer>
-  <longdescription>
-    TeamSpeak Server (Voice Communication Software)
-  </longdescription>
+	<maintainer>
+		<email>TomWij@gentoo.org</email>
+		<name>Tom Wijsman</name>
+	</maintainer>
+	<longdescription>
+		TeamSpeak Server (Voice Communication Software)
+	</longdescription>
+	<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.7.2.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.8.ebuild
index 5dee57f27768..756760dd9a75 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.2.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.8.ebuild
@@ -1,17 +1,20 @@
 # 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.2.ebuild,v 1.1 2013/05/22 11:22:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.8.ebuild,v 1.1 2013/09/04 12:31:03 tomwij Exp $
 
-EAPI=5
+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="fetch mirror 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 )"
@@ -34,29 +37,51 @@ pkg_setup() {
 
 src_install() {
 	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local dest="${D}/opt/teamspeak3-server"
-	mkdir -p "${dest}" || die "Can't create ${dest} directory."
-	cp -R "${WORKDIR}/teamspeak3-server_linux-"*/* "${dest}/" || die "Can't copy files to ${dest}."
-	mv "${dest}/ts3server_linux_"* "${dest}/ts3server-bin" || die "Can't rename server file to t3server-bin."
+	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
 
-	# Install wrapper.
 	exeinto /usr/sbin
-	doexe "${FILESDIR}/ts3server"
+	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}"/server.conf
+	doins "${FILESDIR}"/ts3db_mysql.ini
 	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
 
 	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}/${P}.rc" teamspeak3-server
-	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
-	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+	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
-	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fowners teamspeak3 ${opt_dir}
 
-	fowners teamspeak3 /opt/teamspeak3-server
-	fperms 755 /opt/teamspeak3-server
+	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fperms 755 ${opt_dir}
 }