fix install paths

6 files changed, 46 insertions, 109 deletions

diff --git a/media-sound/teamspeak2-client-bin/ChangeLog b/media-sound/teamspeak2-client-bin/ChangeLog
index 5aa5b0b7063d..563b77f445bc 100644
--- a/media-sound/teamspeak2-client-bin/ChangeLog
+++ b/media-sound/teamspeak2-client-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/teamspeak2-client-bin
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.2 2003/09/20 07:14:54 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.3 2003/12/10 18:31:20 vapier Exp $
+
+*teamspeak2-client-bin-2.0.32.60-r1 (10 Dec 2003)
+
+  10 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Install into the proper locations.
 
 *teamspeak2-client-bin-2.0.32.60 (20 Sep 2003)
 
diff --git a/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.29_rc2 b/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.29_rc2
deleted file mode 100644
index 77e40ba98059..000000000000
--- a/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.29_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ee71fb11537a53860feca457f85fd05 ts2_client_rc2_2029.tar.bz2 7523638
diff --git a/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.32.60 b/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.32.60-r1
index 67ea9b8527fb..67ea9b8527fb 100644
--- a/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.32.60
+++ b/media-sound/teamspeak2-client-bin/files/digest-teamspeak2-client-bin-2.0.32.60-r1
diff --git a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.29_rc2.ebuild b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.29_rc2.ebuild
deleted file mode 100644
index 41e1fcdc8cbe..000000000000
--- a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.29_rc2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.29_rc2.ebuild,v 1.3 2003/09/11 01:21:32 msterret Exp $
-
-DESCRIPTION="The Teamspeak Voice Communication Tool"
-HOMEPAGE="http://www.teamspeak.org"
-LICENSE="as-is"
-KEYWORDS="~x86"
-
-IUSE=""
-SLOT="0"
-S="${WORKDIR}/ts2_client_rc2_2029"
-SRC_URI="ftp://ftp.teamspeak.org/releases/ts2_client_rc2_2029.tar.bz2"
-
-DEPEND="virtual/x11
-	virtual/glibc"
-	#Note: ts2 client comes with its own speex packet, so there is no need
-	#to install speex seperatly
-
-src_unpack() {
-		unpack ${A}
-}
-
-src_install() {
-	mkdir -p ${D}usr/share/teamspeak2-client
-
-	# Edit the Teamspeak startscript to match our install directory
-	cp ${S}/setup.data/image/TeamSpeak ${S}/setup.data/image/TeamSpeak.tmp
-	sed -e 's/%installdir%/\/usr\/share\/teamspeak2-client/g' \
-		${S}/setup.data/image/TeamSpeak.tmp \
-		> ${S}/setup.data/image/TeamSpeak
-	rm ${S}/setup.data/image/TeamSpeak.tmp
-
-	# Copy the files
-	cp -r ${S}/setup.data/image/* ${D}usr/share/teamspeak2-client
-
-	# Setup a sym-link to the binary
-	insinto ${D}/usr/share/teamspeak2-client/
-	dobin ${S}/setup.data/image/TeamSpeak
-	dosym /usr/share/teamspeak2-client/TeamSpeak /usr/bin/TeamSpeak
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please Note: The new Teamspeak2 Release Candidate 2 Client"
-	einfo "will not be able to connect to any of the *old* rc1 servers."
-	einfo "if you get 'Bad response' from your server check if your"
-	einfo "server is running rc2, which is a version >= 2.0.19.16."
-	einfo "Also note this release supports the new speex codec, "
-	einfo "so if you get unsupported codec messages, you need this :D"
-	einfo
-}
diff --git a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r1.ebuild b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r1.ebuild
new file mode 100644
index 000000000000..ee21c80afd09
--- /dev/null
+++ b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r1.ebuild,v 1.1 2003/12/10 18:31:20 vapier Exp $
+
+MY_PV=rc2_2032
+DESCRIPTION="The Teamspeak Voice Communication Tool"
+HOMEPAGE="http://www.teamspeak.org/"
+SRC_URI="ftp://teamspeak.krawall.de/releases/ts2_client_${MY_PV}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="virtual/x11
+	media-libs/jpeg
+	virtual/glibc"
+
+S=${WORKDIR}/ts2_client_${MY_PV}
+
+src_install() {
+	dodir /opt/teamspeak2-client
+
+	cp -r setup.data/image/* ${D}/opt/teamspeak2-client/
+	rm ${D}/opt/teamspeak2-client/TeamSpeak
+
+	into /opt
+	dobin ${FILESDIR}/TeamSpeak
+	dosed "s:%installdir%:/opt/teamspeak2-client:g" /opt/bin/TeamSpeak
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please Note: The new Teamspeak2 Release Candidate 2 Client"
+	einfo "will not be able to connect to any of the *old* rc1 servers."
+	einfo "if you get 'Bad response' from your server check if your"
+	einfo "server is running rc2, which is a version >= 2.0.19.16."
+	einfo "Also note this release supports the new speex codec, "
+	einfo "so if you got unsupported codec messages, you need this :D"
+	einfo
+}
diff --git a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60.ebuild b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60.ebuild
deleted file mode 100644
index 62d84aa4108a..000000000000
--- a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60.ebuild,v 1.1 2003/09/20 07:14:54 jje Exp $
-
-DESCRIPTION="The Teamspeak Voice Communication Tool"
-HOMEPAGE="http://www.teamspeak.org"
-LICENSE="as-is"
-KEYWORDS="~x86"
-
-IUSE=""
-SLOT="0"
-S="${WORKDIR}/ts2_client_rc2_2032"
-SRC_URI="ftp://teamspeak.krawall.de/releases/ts2_client_rc2_2032.tar.bz2"
-
-DEPEND="virtual/x11
-	virtual/glibc"
-	#Note: ts2 client comes with its own speex packet, so there is no need
-	#to install speex seperatly
-
-src_unpack() {
-		unpack ${A}
-}
-
-src_install() {
-	mkdir -p ${D}usr/share/teamspeak2-client
-
-	# Edit the Teamspeak startscript to match our install directory
-	cp ${S}/setup.data/image/TeamSpeak ${S}/setup.data/image/TeamSpeak.tmp
-	sed -e 's/%installdir%/\/usr\/share\/teamspeak2-client/g' \
-		${S}/setup.data/image/TeamSpeak.tmp \
-		> ${S}/setup.data/image/TeamSpeak
-	rm ${S}/setup.data/image/TeamSpeak.tmp
-
-	# Copy the files 
-	cp -r ${S}/setup.data/image/* ${D}usr/share/teamspeak2-client
-
-	# Setup a sym-link to the binary
-	insinto ${D}/usr/share/teamspeak2-client/
-	dobin ${S}/setup.data/image/TeamSpeak
-	dosym /usr/share/teamspeak2-client/TeamSpeak /usr/bin/TeamSpeak
-
-}
-pkg_postinst() {
-
-	einfo
-	einfo "Please Note: The new Teamspeak2 Release Candidate 2 Client"
-	einfo "will not be able to connect to any of the *old* rc1 servers."
-	einfo "if you get 'Bad response' from your server check if your"
-	einfo "server is running rc2, which is a version >= 2.0.19.16."
-	einfo "Also note this release supports the new speex codec, "
-	einfo "so if you got unsupported codec messages, you need this :D"
-	einfo
-}
-