Took maintainership. Version bump to 3.0.7.1, fixes bug #460280 reported by Marek Królikowski. EAPI 5. RESTRICT="fetch mirror strip" just like teamspeak-client-bin. Added GPL-2 to LICENSE, fixes bug #425974 reported by Ian Stakenvicius (_AxS_).

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

5 files changed, 158 insertions, 29 deletions

diff --git a/media-sound/teamspeak-server-bin/ChangeLog b/media-sound/teamspeak-server-bin/ChangeLog
index 82156f861ea1..fba5d0f7e7f0 100644
--- a/media-sound/teamspeak-server-bin/ChangeLog
+++ b/media-sound/teamspeak-server-bin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/teamspeak-server-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.29 2012/12/21 19:24:30 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/ChangeLog,v 1.30 2013/04/25 18:11:05 tomwij Exp $
+
+*teamspeak-server-bin-3.0.7.1 (25 Apr 2013)
+
+  25 Apr 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/teamspeak-server-bin-3.0.7.1.rc, +teamspeak-server-bin-3.0.7.1.ebuild,
+  metadata.xml, teamspeak-server-bin-3.0.6.1.ebuild:
+  Took maintainership. Version bump to 3.0.7.1, fixes bug #460280 reported by
+  Marek Królikowski. EAPI 5. RESTRICT="fetch mirror strip" just like teamspeak-
+  client-bin. Added GPL-2 to LICENSE, fixes bug #425974 reported by Ian
+  Stakenvicius (_AxS_).
 
   21 Dec 2012; Markos Chandras <hwoarang@gentoo.org> files/teamspeak3-server.rc:
   Apply fix from #438050 for missing /var/run/teamspeak3 server directory.
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 000000000000..75a14e45899c
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc
@@ -0,0 +1,46 @@
+#!/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 $
+
+depend() {
+	need net
+	use mysql
+}
+
+start() {
+	ebegin "Starting TeamSpeak 3 Server"
+
+	# 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
+
+	# 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/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index cafd9aa61313..8d810c9956ef 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<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>
 </pkgmetadata>
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 3a649b768520..6e66d286a528 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,56 +1,62 @@
-# 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.2 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=""
 KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
+RESTRICT="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-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."
 
-	mkdir -p "${dest}"
-	cp -R "${WORKDIR}/teamspeak3-server_linux-"*/* "${dest}/" || die
-
-	mv "${dest}/ts3server_linux_"* "${dest}/ts3server-bin" || die
-
-	exeinto /usr/sbin || die
-	doexe "${FILESDIR}/ts3server" || die
+	# Install wrapper.
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/ts3server"
 
-	# runtime FS layout ...
+	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
 	doins "${FILESDIR}/server.conf"
+	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
+
+	# Install the init script and systemd unit.
 	newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3-server
+	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
+	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
 
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
+	# Fix up permissions.
 	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
 	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
 
 	fowners teamspeak3 /opt/teamspeak3-server
 	fperms 755 /opt/teamspeak3-server
-
-	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
-	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
 }
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 000000000000..55bdc63ab09f
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild
@@ -0,0 +1,62 @@
+# 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"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="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 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."
+
+	# Install wrapper.
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/ts3server"
+
+	# Install the runtime FS layout.
+	insinto /etc/teamspeak3-server
+	doins "${FILESDIR}/server.conf"
+	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"
+
+	# Fix up permissions.
+	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+
+	fowners teamspeak3 /opt/teamspeak3-server
+	fperms 755 /opt/teamspeak3-server
+}