use dobin instead of exeinto /usr/bin/ && doexe; make ebuild layout more readable; use elog if apropriate; fix ebuild layout

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

3 files changed, 31 insertions, 36 deletions

diff --git a/media-sound/teamspeak-client-bin/ChangeLog b/media-sound/teamspeak-client-bin/ChangeLog
index 7e597a1dbfcd..279b1ce9e3cc 100644
--- a/media-sound/teamspeak-client-bin/ChangeLog
+++ b/media-sound/teamspeak-client-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/teamspeak-client-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-client-bin/ChangeLog,v 1.38 2015/01/15 16:41:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-client-bin/ChangeLog,v 1.39 2015/03/21 18:41:22 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  teamspeak-client-bin-3.0.13.1.ebuild, teamspeak-client-bin-3.0.16.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe; make ebuild layout more
+  readable; use elog if apropriate; fix ebuild layout
 
 *teamspeak-client-bin-3.0.16 (15 Jan 2015)
 
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
index b893990eb91e..e2c61e4d6dd7 100644
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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-client-bin/teamspeak-client-bin-3.0.13.1.ebuild,v 1.1 2013/11/09 18:44:21 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild,v 1.2 2015/03/21 18:41:22 jlec Exp $
 
 EAPI="5"
 
@@ -8,37 +8,34 @@ inherit eutils unpacker
 
 DESCRIPTION="TeamSpeak Client - Voice Communication Software"
 HOMEPAGE="http://www.teamspeak.com/"
-LICENSE="teamspeak3"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
 
+LICENSE="teamspeak3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch mirror strip"
 IUSE="alsa pulseaudio"
 
 REQUIRED_USE="|| ( alsa pulseaudio )"
 
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
-
-RDEPEND="dev-qt/qtcore:4
+RDEPEND="
+	dev-qt/qtcore:4
 	dev-qt/qtgui:4[accessibility,xinerama]
 	dev-qt/qtsql:4
 	sys-libs/glibc
 	sys-libs/zlib
-
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )"
 
+RESTRICT="fetch mirror strip"
+
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	if use amd64 ; then
-		einfo "Please download TeamSpeak3-Client-linux_amd64-${PV/_/-}.run"
-	elif use x86 ; then
-		einfo "Please download TeamSpeak3-Client-linux_x86-${PV/_/-}.run"
-	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}"
 }
 
 src_prepare() {
@@ -59,14 +56,12 @@ src_prepare() {
 }
 
 src_install() {
-	dodir /opt/teamspeak3-client
 	insinto /opt/teamspeak3-client
 	doins -r *
 
 	fperms +x /opt/teamspeak3-client/ts3client
 
-	exeinto /usr/bin
-	doexe "${FILESDIR}/teamspeak3"
+	dobin "${FILESDIR}/teamspeak3"
 
 	make_desktop_entry teamspeak3 TeamSpeak3 \
 		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16.ebuild
index 50af0be86416..cf7b328bcba4 100644
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16.ebuild
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16.ebuild,v 1.1 2015/01/15 16:41:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16.ebuild,v 1.2 2015/03/21 18:41:22 jlec Exp $
 
 EAPI="5"
 
@@ -8,18 +8,17 @@ inherit eutils unpacker
 
 DESCRIPTION="TeamSpeak Client - Voice Communication Software"
 HOMEPAGE="http://www.teamspeak.com/"
-LICENSE="teamspeak3"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
 
+LICENSE="teamspeak3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch mirror strip"
 IUSE="alsa pulseaudio"
 
 REQUIRED_USE="|| ( alsa pulseaudio )"
 
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
-
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5[accessibility]
@@ -31,16 +30,14 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )"
 
+RESTRICT="fetch mirror strip"
+
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	if use amd64 ; then
-		einfo "Please download TeamSpeak3-Client-linux_amd64-${PV/_/-}.run"
-	elif use x86 ; then
-		einfo "Please download TeamSpeak3-Client-linux_x86-${PV/_/-}.run"
-	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}"
 }
 
 src_prepare() {
@@ -62,14 +59,12 @@ src_prepare() {
 }
 
 src_install() {
-	dodir /opt/teamspeak3-client
 	insinto /opt/teamspeak3-client
 	doins -r *
 
 	fperms +x /opt/teamspeak3-client/ts3client
 
-	exeinto /usr/bin
-	doexe "${FILESDIR}/teamspeak3"
+	dobin "${FILESDIR}/teamspeak3"
 
 	make_desktop_entry teamspeak3 TeamSpeak3 \
 		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \