diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-tsdns-server.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-tsdns-server.service deleted file mode 100644 index 9d5b3cb..0000000 --- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-tsdns-server.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=TeamSpeak 3 TSDNS Server -After=network.target - -[Service] -Type=simple -WorkingDirectory=/opt/teamspeak3-server -ExecStart=/opt/teamspeak3-server/sbin/tsdnsserver -ExecStop=/bin/kill -15 $MAINPID -StandardOutput=syslog -StandardError=syslog -User=teamspeak3 -Group=teamspeak3 -Restart=always - -[Install] -WantedBy=multi-user.target - -# vim:syntax=dosini diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc deleted file mode 100644 index 8188924..0000000 --- a/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net -} - -start() { - ebegin "Starting TeamSpeak 3 TSDNS Server" - - start-stop-daemon --start --quiet --background \ - --pidfile "/var/run/teamspeak3-server/tsdns.pid" --make-pidfile \ - --user "teamspeak3" --chdir "/etc/teamspeak3-server" \ - --exec "/opt/teamspeak3-server/sbin/tsdnsserver" - - eend $? -} - -stop() { - ebegin "Stopping TeamSpeak 3 TSDNS Server" - - start-stop-daemon --stop --quiet \ - --pidfile "/var/run/teamspeak3-server/tsdns.pid" - - eend $? -} - -restart() { - svc_stop - sleep 3 - svc_start -} diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.1.ebuild index ec80315..1431234 100644 --- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.1.ebuild +++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.1.ebuild @@ -22,7 +22,7 @@ RESTRICT="fetch mirror strip" LICENSE="teamspeak3 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc pdf mysql tsdns" +IUSE="doc pdf mysql" DEPEND="mysql? ( >=virtual/mysql-5.5 )" RDEPEND="${DEPEND}" @@ -67,16 +67,6 @@ src_install() { 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 - insinto /etc/teamspeak3-server - newins tsdns/tsdns_settings.ini.sample tsdns_settings.ini - fi - # Install the runtime FS layout. insinto /etc/teamspeak3-server doins "${FILESDIR}"/server.conf @@ -85,9 +75,7 @@ src_install() { # Install the init script and systemd unit. newinitd "${FILESDIR}"/${PN}.rc teamspeak3-server - use tsdns && newinitd "${FILESDIR}/teamspeak-tsdns-server.rc" teamspeak3-tsdns-server systemd_dounit "${FILESDIR}"/systemd/teamspeak3.service - use tsdns && systemd_dounit "${FILESDIR}"/systemd/teamspeak3-tsdns-server.service systemd_dotmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf # Fix up permissions.