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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 28 insertions, 289 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/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}
-}