[patch] Summarized patch for ebuilds

teamspeak3-final_ebuild.patch (text/plain), 15.74 KB, created by Benjamin Börngen-Schmidt on 2011-09-03 18:08:04 UTC

diff -Naur media-sound.bak/teamspeak-client-bin/teamspeak-client-bin-3.0.0_beta36.ebuild media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.0_beta36.ebuild
--- media-sound.bak/teamspeak-client-bin/teamspeak-client-bin-3.0.0_beta36.ebuild	2011-09-03 19:16:07.000000000 +0200
+++ media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.0_beta36.ebuild	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 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.0_beta36.ebuild,v 1.1 2011/02/27 19:47:21 trapni Exp $
-
-# NOTE: The comments in this file are for instruction and documentation.
-# They're not meant to appear with your final, production ebuild.  Please
-# remember to remove them before submitting or committing your ebuild.  That
-# doesn't mean you can't add your own comments though.
-
-# The 'Header' on the third line should just be left alone.  When your ebuild
-# will be committed to cvs, the details on that line will be automatically
-# generated to contain the correct data.
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="TeamSpeak Client - Voice Communication Software"
-HOMEPAGE="http://teamspeak.com/"
-LICENSE="teamspeak3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-PROPERTIES="interactive"
-
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/beta-${PV/3.0.0_beta/}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/beta-${PV/3.0.0_beta/}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )
-"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		=media-libs/libpng-1.4*
-		x11-libs/qt-gui:4
-		>=x11-libs/libXinerama-1.0.2"
-
-src_unpack() {
-	# TODO: unpack_makeself -- use this version once it supports makeself 2.1.6
-	for i in ${A}; do
-		sh "${DISTDIR}/${i}" --target "${WORKDIR}" || die "unpack failed"
-	done
-}
-
-src_install() {
-	local dest="${D}/opt/teamspeak3-client"
-
-	mkdir -p "${dest}"
-
-	# remove the qt-libraries as they just cause trouble with the system's Qt
-	# see bug #328807
-	rm "${WORKDIR}"/libQt* || die
-
-	cp -R "${WORKDIR}/"* "${dest}/" || die
-
-	exeinto /usr/bin
-	doexe "${FILESDIR}/teamspeak3"
-
-	mv "${dest}/ts3client_linux_"* "${dest}/ts3client"
-
-	make_desktop_entry teamspeak3 TeamSpeak3 \
-		"/opt/teamspeak3-client/gfx/default/24x24_connect.png" \
-		Network
-}
diff -Naur media-sound.bak/teamspeak-client-bin/teamspeak-client-bin-3.0.0_rc1.ebuild media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.0_rc1.ebuild
--- media-sound.bak/teamspeak-client-bin/teamspeak-client-bin-3.0.0_rc1.ebuild	2011-09-03 19:16:07.000000000 +0200
+++ media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.0_rc1.ebuild	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 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.0_rc1.ebuild,v 1.1 2011/06/03 07:25:04 trapni Exp $
-
-# NOTE: The comments in this file are for instruction and documentation.
-# They're not meant to appear with your final, production ebuild.  Please
-# remember to remove them before submitting or committing your ebuild.  That
-# doesn't mean you can't add your own comments though.
-
-# The 'Header' on the third line should just be left alone.  When your ebuild
-# will be committed to cvs, the details on that line will be automatically
-# generated to contain the correct data.
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="TeamSpeak Client - Voice Communication Software"
-HOMEPAGE="http://teamspeak.com/"
-LICENSE="teamspeak3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-PROPERTIES="interactive"
-
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/rc${PV/3.0.0_rc/}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/rc${PV/3.0.0_rc/}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )
-"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		=media-libs/libpng-1.4*
-		x11-libs/qt-gui:4
-		>=x11-libs/libXinerama-1.0.2"
-
-src_unpack() {
-	# TODO: unpack_makeself -- use this version once it supports makeself 2.1.6
-	for i in ${A}; do
-		sh "${DISTDIR}/${i}" --target "${WORKDIR}" || die "unpack failed"
-	done
-}
-
-src_install() {
-	local dest="${D}/opt/teamspeak3-client"
-
-	mkdir -p "${dest}"
-
-	# remove the qt-libraries as they just cause trouble with the system's Qt
-	# see bug #328807
-	rm "${WORKDIR}"/libQt* || die
-
-	cp -R "${WORKDIR}/"* "${dest}/" || die
-
-	exeinto /usr/bin
-	doexe "${FILESDIR}/teamspeak3"
-
-	mv "${dest}/ts3client_linux_"* "${dest}/ts3client"
-
-	make_desktop_entry teamspeak3 TeamSpeak3 \
-		"/opt/teamspeak3-client/gfx/default/24x24_connect.png" \
-		Network
-}
diff -Naur media-sound.bak/teamspeak-client-bin/teamspeak-client-bin-3.0.1.ebuild media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.1.ebuild
--- media-sound.bak/teamspeak-client-bin/teamspeak-client-bin-3.0.1.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.1.ebuild	2011-09-03 19:53:43.000000000 +0200
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 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.1.ebuild,v 1.1 2011/08/26 15:08:21 cthulhu Exp $
+
+EAPI=1
+
+inherit eutils
+
+DESCRIPTION="TeamSpeak Client - Voice Communication Software"
+HOMEPAGE="http://teamspeak.com/"
+LICENSE="teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+PROPERTIES="interactive"
+
+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 )
+"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		=media-libs/libpng-1.4*
+		>=x11-libs/qt-gui-4.7
+		>=x11-libs/libXinerama-1.0.2"
+
+src_unpack() {
+	# TODO: unpack_makeself -- use this version once it supports makeself 2.1.6
+	for i in ${A}; do
+		sh "${DISTDIR}/${i}" --target "${WORKDIR}" || die "unpack failed"
+	done
+}
+
+src_install() {
+	local dest="${D}/opt/teamspeak3-client"
+
+	mkdir -p "${dest}"
+
+	# remove the qt-libraries as they just cause trouble with the system's Qt
+	# see bug #328807
+	rm "${WORKDIR}"/libQt* || die
+
+	cp -R "${WORKDIR}/"* "${dest}/" || die
+
+	exeinto /usr/bin
+	doexe "${FILESDIR}/teamspeak3"
+
+	mv "${dest}/ts3client_linux_"* "${dest}/ts3client"
+
+	make_desktop_entry teamspeak3 TeamSpeak3 \
+		"/opt/teamspeak3-client/gfx/default/24x24_connect.png" \
+		Network
+}
+
diff -Naur media-sound.bak/teamspeak-server-bin/files/teamspeak3-server.rc media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
--- media-sound.bak/teamspeak-server-bin/files/teamspeak3-server.rc	2011-09-03 19:16:07.000000000 +0200
+++ media-sound/teamspeak-server-bin/files/teamspeak3-server.rc	2011-09-03 19:20:17.000000000 +0200
@@ -14,9 +14,6 @@
 	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
 	export LD_LIBRARY_PATH="/opt/teamspeak3-server:$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
-
 	start-stop-daemon --start --quiet --background \
 		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
 		--chuid "teamspeak3" --chdir "/opt/teamspeak3-server" \
diff -Naur media-sound.bak/teamspeak-server-bin/files/ts3server media-sound/teamspeak-server-bin/files/ts3server
--- media-sound.bak/teamspeak-server-bin/files/ts3server	2011-09-03 19:16:07.000000000 +0200
+++ media-sound/teamspeak-server-bin/files/ts3server	2011-09-03 19:20:36.000000000 +0200
@@ -7,4 +7,4 @@
 # work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
 cd "${BASEDIR}"
 
-exec "${BASEDIR}/ts3server-bin" $*
+"${BASEDIR}/ts3server-bin" $*
diff -Naur media-sound.bak/teamspeak-server-bin/files/tsdns-server.rc media-sound/teamspeak-server-bin/files/tsdns-server.rc
--- media-sound.bak/teamspeak-server-bin/files/tsdns-server.rc	1970-01-01 01:00:00.000000000 +0100
+++ media-sound/teamspeak-server-bin/files/tsdns-server.rc	2011-09-03 19:18:39.000000000 +0200
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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 \
+		--chuid "teamspeak3" --chdir "/opt/teamspeak3-server/tsdns" \
+		--exec "/opt/teamspeak3-server/tsdns/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 -Naur media-sound.bak/teamspeak-server-bin/teamspeak-server-bin-3.0.0_beta30.ebuild media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.0_beta30.ebuild
--- media-sound.bak/teamspeak-server-bin/teamspeak-server-bin-3.0.0_beta30.ebuild	2011-09-03 19:16:07.000000000 +0200
+++ media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.0_beta30.ebuild	1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 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.0_beta30.ebuild,v 1.1 2011/02/27 19:45:07 trapni Exp $
-
-# NOTE: The comments in this file are for instruction and documentation.
-# They're not meant to appear with your final, production ebuild.  Please
-# remember to remove them before submitting or committing your ebuild.  That
-# doesn't mean you can't add your own comments though.
-
-# The 'Header' on the third line should just be left alone.  When your ebuild
-# will be committed to cvs, the details on that line will be automatically
-# generated to contain the correct data.
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="TeamSpeak Server - Voice Communication Software"
-HOMEPAGE="http://teamspeak.com/"
-LICENSE="teamspeak3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/beta-${PV/3.0.0_beta/}/teamspeak3-server_linux-amd64-${PV/_/-}.tar.gz )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/beta-${PV/3.0.0_beta/}/teamspeak3-server_linux-x86-${PV/_/-}.tar.gz )
-"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	local dest="${D}/opt/teamspeak3-server"
-
-	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
-
-	# runtime FS layout ...
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}/server.conf"
-	newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3-server
-
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
-	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
-}
diff -Naur media-sound.bak/teamspeak-server-bin/teamspeak-server-bin-3.0.0.ebuild media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.0.ebuild
--- media-sound.bak/teamspeak-server-bin/teamspeak-server-bin-3.0.0.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.0.ebuild	2011-09-03 19:37:43.000000000 +0200
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 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.0_rc1.ebuild,v 1.1 2011/06/03 00:40:21 trapni Exp $
+
+EAPI=1
+
+inherit eutils
+
+DESCRIPTION="TeamSpeak Server - Voice Communication Software"
+HOMEPAGE="http://teamspeak.com/"
+LICENSE="teamspeak3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RESTRICT="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 )
+"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewuser teamspeak3
+}
+
+src_install() {
+	local dest="${D}/opt/teamspeak3-server"
+
+	mkdir -p "${dest}"
+	cp -R "${WORKDIR}/teamspeak3-server_linux-"*/* "${dest}/" || die
+
+	mv "${dest}/ts3server_linux_"* "${dest}/ts3server-bin" || die
+	mv "${dest}/tsdns/tsdnsserver_linux_"* "${dest}/tsdns/tsdnsserver" || die
+
+	# upstream is poked wrt inifile switch for tsdns, we need to keep the inifile in /opt for now.
+	mv "${dest}/tsdns/tsdns_settings.ini.sample" "${dest}/tsdns/tsdns_settings.ini" || die
+
+	exeinto /usr/sbin || die
+	doexe "${FILESDIR}/ts3server" || die
+
+	# runtime FS layout ...
+	insinto /etc/teamspeak3-server
+	doins "${FILESDIR}/server.conf"
+	newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3-server
+	newinitd "${FILESDIR}/tsdns-server.rc" tsdns-server
+
+	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
+	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
+}
diff -Naur media-sound.bak/teamspeak-server-bin/teamspeak-server-bin-3.0.0_rc1.ebuild media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.0_rc1.ebuild
--- media-sound.bak/teamspeak-server-bin/teamspeak-server-bin-3.0.0_rc1.ebuild	2011-09-03 19:16:07.000000000 +0200
+++ media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.0_rc1.ebuild	1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 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.0_rc1.ebuild,v 1.1 2011/06/03 00:40:21 trapni Exp $
-
-# NOTE: The comments in this file are for instruction and documentation.
-# They're not meant to appear with your final, production ebuild.  Please
-# remember to remove them before submitting or committing your ebuild.  That
-# doesn't mean you can't add your own comments though.
-
-# The 'Header' on the third line should just be left alone.  When your ebuild
-# will be committed to cvs, the details on that line will be automatically
-# generated to contain the correct data.
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="TeamSpeak Server - Voice Communication Software"
-HOMEPAGE="http://teamspeak.com/"
-LICENSE="teamspeak3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/rc${PV/3.0.0_rc/}/teamspeak3-server_linux-amd64-${PV/_/-}.tar.gz )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/rc${PV/3.0.0_rc/}/teamspeak3-server_linux-x86-${PV/_/-}.tar.gz )
-"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	local dest="${D}/opt/teamspeak3-server"
-
-	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
-
-	# runtime FS layout ...
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}/server.conf"
-	newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3-server
-
-	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
-	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
-}