Remove the kde and imagemagick useflag: for the first, just install the protocol file every time, and remove the silly dependency that is also not considering slots; for the latter, install only the .xpm file, it should be enough for all environments.

Package-Manager: portage-2.1.2-r9

3 files changed, 26 insertions, 30 deletions

diff --git a/media-sound/teamspeak2-client-bin/ChangeLog b/media-sound/teamspeak2-client-bin/ChangeLog
index 2228e19bb0ff..fd1e2d5dc393 100644
--- a/media-sound/teamspeak2-client-bin/ChangeLog
+++ b/media-sound/teamspeak2-client-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/teamspeak2-client-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.22 2007/02/09 05:17:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.23 2007/02/09 05:38:26 flameeyes Exp $
+
+  09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Remove the kde and imagemagick useflag: for the first, just install the
+  protocol file every time, and remove the silly dependency that is also not
+  considering slots; for the latter, install only the .xpm file, it should be
+  enough for all environments.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   teamspeak2-client-bin-2.0.32.60-r3.ebuild:
diff --git a/media-sound/teamspeak2-client-bin/Manifest b/media-sound/teamspeak2-client-bin/Manifest
index 2e11626535df..adc99d6e912b 100644
--- a/media-sound/teamspeak2-client-bin/Manifest
+++ b/media-sound/teamspeak2-client-bin/Manifest
@@ -10,14 +10,14 @@ MD5 b48712e5232569498000c8cb3dd943ef files/teamspeak.protocol 149
 RMD160 b3d2c407ea985ab0800b0738ab3f60e699b15a07 files/teamspeak.protocol 149
 SHA256 5b8ed56227152fc7c60dcbaf5135fd3587e66e6469c33531a33e5e2524ce02db files/teamspeak.protocol 149
 DIST ts2_client_rc2_2032.tar.bz2 7535254 RMD160 ee0690e0ac5f2aac090a565bf2c4fb7726fb62f4 SHA1 d54c9c19a2e70cee11f9a04a3523c71da802ee8d SHA256 d06e0354b51e4ddfd4411104d07dd4f9f7c1c6ba908471f03299049362e36254
-EBUILD teamspeak2-client-bin-2.0.32.60-r3.ebuild 2692 RMD160 9c0cf6ef8ab259ece097bd2f96221efd5a4875fd SHA1 bc76b8d5e0fc679a49dfe61f46ea4de86f4f9f80 SHA256 f3ff23e28a817dcacf982ad6c79808817a81b2b7bdce96a7a8543731a2ecaef4
-MD5 dd6b503240580c2dac8428692c181f56 teamspeak2-client-bin-2.0.32.60-r3.ebuild 2692
-RMD160 9c0cf6ef8ab259ece097bd2f96221efd5a4875fd teamspeak2-client-bin-2.0.32.60-r3.ebuild 2692
-SHA256 f3ff23e28a817dcacf982ad6c79808817a81b2b7bdce96a7a8543731a2ecaef4 teamspeak2-client-bin-2.0.32.60-r3.ebuild 2692
-MISC ChangeLog 3222 RMD160 262a7adcda8be3864b341f67f89eb681d2ef6957 SHA1 44f3316ec3c6358b347409d8ed7eeda986f4e3cf SHA256 98bd0e4361338ebe1ae87b614a240b4c856f0d7f9b781e5a71cb7ef3d60503be
-MD5 1e367b7cbcff0416e71f9ab4e537b673 ChangeLog 3222
-RMD160 262a7adcda8be3864b341f67f89eb681d2ef6957 ChangeLog 3222
-SHA256 98bd0e4361338ebe1ae87b614a240b4c856f0d7f9b781e5a71cb7ef3d60503be ChangeLog 3222
+EBUILD teamspeak2-client-bin-2.0.32.60-r3.ebuild 2465 RMD160 d47fdb0349dba2f20de64e3fcb6859e4eac41f19 SHA1 d2fcc352a920d2be8e21ec149fa7303d14548f08 SHA256 e1440e7790f10edf130fc33ea85864faa9049965ae7310c3f6e345e4e73bd81c
+MD5 4480a4c8d0e27c9cb4d37b96cfdf5153 teamspeak2-client-bin-2.0.32.60-r3.ebuild 2465
+RMD160 d47fdb0349dba2f20de64e3fcb6859e4eac41f19 teamspeak2-client-bin-2.0.32.60-r3.ebuild 2465
+SHA256 e1440e7790f10edf130fc33ea85864faa9049965ae7310c3f6e345e4e73bd81c teamspeak2-client-bin-2.0.32.60-r3.ebuild 2465
+MISC ChangeLog 3581 RMD160 9fbed9b4f1278dad888399d1d66b6c0028e4b25c SHA1 81b5015e3edf86111122389412a7bde23c26b995 SHA256 60948f7a169325e065cd835a6c61bbd913ef0d65e2e0edafee804998b16e3961
+MD5 9aef1eb294fd680e18ae82a0b547b803 ChangeLog 3581
+RMD160 9fbed9b4f1278dad888399d1d66b6c0028e4b25c ChangeLog 3581
+SHA256 60948f7a169325e065cd835a6c61bbd913ef0d65e2e0edafee804998b16e3961 ChangeLog 3581
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -28,7 +28,7 @@ SHA256 b8a503d63025edda62fb5159ca757f59c4fbf8a62990c69a436754e10b07ca97 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzAPfAiZjviIA2XgRAjoDAJ9RyTQdl2rqCbm2v1CJJlOXPEOdYwCghUwr
-kOXAdFqSMrnt8p05Bswr4Oc=
-=mAJq
+iD8DBQFFzAjaAiZjviIA2XgRAtECAJ45D+EB09LEHHr13OP0VWaJftTU6QCfYSgv
+2LbgThoBNkPVkZJcsEJSfVs=
+=nxD8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild
index 9277061a8abb..eb868a6674d5 100644
--- a/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild
+++ b/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # 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-r3.ebuild,v 1.13 2007/02/09 05:17:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild,v 1.14 2007/02/09 05:38:26 flameeyes Exp $
 
 MY_PV=rc2_2032
 DESCRIPTION="The TeamSpeak voice communication tool"
@@ -11,14 +11,12 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* x86 amd64"
 
-IUSE="kde imagemagick"
+IUSE=""
 
 DEPEND=""
 
 RDEPEND="${DEPEND}
 	|| ( ( x11-libs/libXt ) virtual/x11 )
-	kde? ( >=kde-base/kdelibs-3.1.0 )
-	imagemagick? ( media-gfx/imagemagick )
 	amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0
 			 >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
@@ -26,11 +24,7 @@ S="${WORKDIR}/ts2_client_${MY_PV}/setup.data/image"
 
 dir="/opt/teamspeak2-client"
 
-src_compile() {
-	if use imagemagick; then
-		convert icon.xpm teamspeak.png
-	fi
-}
+src_compile() { :; }
 
 src_install() {
 	newdoc Readme.txt README
@@ -54,17 +48,12 @@ src_install() {
 
 	#Install the teamspeak icon.
 	insinto /usr/share/pixmaps
-	if use imagemagick; then
-		doins teamspeak.png
-	fi
 	newins icon.xpm teamspeak.xpm
 
-	if use kde ; then
-		# Install a teamspeak.protocol file for kde/konqueror to accept
-		# teamspeak:// links
-		insinto /usr/share/services/
-		doins ${FILESDIR}/teamspeak.protocol
-	fi
+	# Install a teamspeak.protocol file for kde/konqueror to accept
+	# teamspeak:// links
+	insinto /usr/share/services/
+	doins "${FILESDIR}/teamspeak.protocol"
 
 	# Fix bug #489010
 	dosym /usr/share/doc/${PF}/html ${dir}/manual