[media-sound/teamspeak-server-bin] sync with tree a bit

media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc

@@ -1,7 +1,7 @@
 #!/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 $
+# $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 $
 
 depend() {
 	need net
@@ -15,6 +15,12 @@ start() {
 	LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
 	export 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" \
@@ -25,7 +31,7 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping TeamSpeak 3 Server"
+	ebegin "Stopping TeamSpeak Server"
 
 	start-stop-daemon --stop --quiet \
 		--pidfile "/var/run/teamspeak3-server/server.pid"

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=

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" $*

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,38 +37,52 @@ 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
 
-	# Symlink tsdns somewhere useful
-	if use amd64 ; then
-		dosym "${D}"/opt/teamspeak3-server/tsdns/tsdnsserver_linux_amd64 /opt/teamspeak3-server/tsdns/tsdnsserver_linux
-	elif use x86 ; then
-		dosym "${D}"/opt/teamspeak3-server/tsdns/tsdnsserver_linux_x86 /opt/teamspeak3-server/tsdns/tsdnsserver_linux
+	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
-	newins "${dest}/tsdns/tsdns_settings.ini.sample" tsdns_settings.ini
-	dosym "${D}"/etc/teamspeak3-server/tsdns_settings.ini /opt/teamspeak3-server/tsdns/tsdns_settings.ini
 
 	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}/${PN}.rc" teamspeak3-server
+	newinitd "${FILESDIR}"/${PN}.rc teamspeak3-server
 	newinitd "${FILESDIR}/teamspeak3-tsdns-server.rc" teamspeak3-tsdns-server
-	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
-	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+	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}
 }