Remove virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

7 files changed, 48 insertions, 54 deletions

diff --git a/media-sound/playmidi/ChangeLog b/media-sound/playmidi/ChangeLog
index e45281548fef..3d8c31eaccc8 100644
--- a/media-sound/playmidi/ChangeLog
+++ b/media-sound/playmidi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/playmidi
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.9 2007/02/03 19:53:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/ChangeLog,v 1.10 2007/07/22 08:32:18 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> playmidi-2.5-r1.ebuild:
+  Remove virtual/x11 references.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-sound/playmidi/playmidi-2.5-r1.ebuild b/media-sound/playmidi/playmidi-2.5-r1.ebuild
index f6cf58879406..da62229bddc9 100644
--- a/media-sound/playmidi/playmidi-2.5-r1.ebuild
+++ b/media-sound/playmidi/playmidi-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/playmidi-2.5-r1.ebuild,v 1.3 2006/01/27 22:11:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/playmidi/playmidi-2.5-r1.ebuild,v 1.4 2007/07/22 08:32:18 drac Exp $
 
 IUSE="svga X gtk"
 
@@ -18,20 +18,19 @@ RDEPEND="sys-libs/ncurses
 	svga? ( media-libs/svgalib )
 	gtk? ( =dev-libs/glib-1*
 		=x11-libs/gtk+-1* )
-	X? ( || ( ( x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXaw )
-			virtual/x11 ) )"
+	X? ( x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libXaw )"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
+	X? ( x11-proto/xextproto )"
 
 S="${WORKDIR}/${P/2.5/2.4}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}.patch"
-	epatch "${FILESDIR}/CAN-2005-0020.patch"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/CAN-2005-0020.patch
 }
 
 src_compile() {
diff --git a/media-sound/synaesthesia/ChangeLog b/media-sound/synaesthesia/ChangeLog
index 4ade75ce7e62..c7a14b96b649 100644
--- a/media-sound/synaesthesia/ChangeLog
+++ b/media-sound/synaesthesia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/synaesthesia
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/ChangeLog,v 1.14 2006/08/27 23:21:24 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/ChangeLog,v 1.15 2007/07/22 08:34:21 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> synaesthesia-2.3.ebuild:
+  Remove virtual/x11 references.
 
   27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/synaesthesia-2.2-gcc3.4.patch, -synaesthesia-2.2.ebuild:
diff --git a/media-sound/synaesthesia/synaesthesia-2.3.ebuild b/media-sound/synaesthesia/synaesthesia-2.3.ebuild
index dadaaffd2740..96144f9e0bb5 100644
--- a/media-sound/synaesthesia/synaesthesia-2.3.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/synaesthesia-2.3.ebuild,v 1.7 2006/07/24 00:21:59 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/synaesthesia/synaesthesia-2.3.ebuild,v 1.8 2007/07/22 08:34:21 drac Exp $
 
 inherit eutils
 
@@ -13,20 +13,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="sdl svga esd"
 
-RDEPEND="|| ( ( x11-libs/libXext
-				x11-libs/libSM )
-			virtual/x11
-		)
+RDEPEND="x11-libs/libXext
+	x11-libs/libSM
 	esd? ( >=media-sound/esound-0.2.22 )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
-
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
+	x11-proto/xextproto"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i \
 		-e "/CFLAGS=/s:-O4:${CFLAGS}:" \
@@ -36,6 +33,6 @@ src_unpack() {
 }
 
 src_install() {
-	dobin synaesthesia || die
+	dobin synaesthesia
 	dodoc README
 }
diff --git a/media-sound/teamspeak2-client-bin/ChangeLog b/media-sound/teamspeak2-client-bin/ChangeLog
index fd1e2d5dc393..b82466c90fe9 100644
--- a/media-sound/teamspeak2-client-bin/ChangeLog
+++ b/media-sound/teamspeak2-client-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2007/02/09 05:38:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/ChangeLog,v 1.24 2007/07/22 08:30:00 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  teamspeak2-client-bin-2.0.32.60-r3.ebuild:
+  Remove virtual/x11 references.
 
   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/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 7d8f4055b172..9f520fc44d91 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.15 2007/07/11 19:30:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak2-client-bin/teamspeak2-client-bin-2.0.32.60-r3.ebuild,v 1.16 2007/07/22 08:30:00 drac Exp $
 
 MY_PV=rc2_2032
 DESCRIPTION="The TeamSpeak voice communication tool"
@@ -10,17 +10,13 @@ SRC_URI="ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/ts2_client_${M
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* x86 amd64"
-
 IUSE=""
 
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	|| ( ( x11-libs/libXt ) virtual/x11 )
+DEPEND="x11-libs/libXt
 	amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0
-			 >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+		>=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
-S="${WORKDIR}/ts2_client_${MY_PV}/setup.data/image"
+S="${WORKDIR}"/ts2_client_${MY_PV}/setup.data/image
 
 dir="/opt/teamspeak2-client"
 
@@ -32,7 +28,7 @@ src_install() {
 	dohtml manual/*
 
 	into /opt
-	dobin ${FILESDIR}/TeamSpeak
+	dobin "${FILESDIR}"/TeamSpeak
 	dosed "s:%installdir%:/opt/teamspeak2-client:g" /opt/bin/TeamSpeak
 
 	exeinto ${dir}
@@ -53,14 +49,13 @@ src_install() {
 	# Install a teamspeak.protocol file for kde/konqueror to accept
 	# teamspeak:// links
 	insinto /usr/share/services/
-	doins "${FILESDIR}/teamspeak.protocol"
+	doins "${FILESDIR}"/teamspeak.protocol
 
 	# Fix bug #489010
 	dosym /usr/share/doc/${PF}/html ${dir}/manual
 }
 
 pkg_postinst() {
-
 	echo
 	elog
 	elog "Please Note: The new Teamspeak2 Release Candidate 2 Client"
diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
index d66c20c4abac..cb4f1a1c7351 100644
--- a/media-sound/vkeybd/Manifest
+++ b/media-sound/vkeybd/Manifest
@@ -8,29 +8,22 @@ RMD160 b1ca4f529cdd46391cba90b918acc53796773fa7 files/vkeybd-0.1.17a-makefile.pa
 SHA256 9ca0f12d2c98ff6a375832d1c317f858b404ed37b9bdc20ea719214a603cef03 files/vkeybd-0.1.17a-makefile.patch 835
 DIST vkeybd-0.1.15.tar.gz 26117 RMD160 51382b99528a1e6ba6b48e07a4840d0e655eddd9 SHA1 68693fceaf561d563ab7821df8368b479a9fe60b SHA256 a77e5376ab850d829e5759fcd82b236d5f92a6fd5826add84635e851f1b336a1
 DIST vkeybd-0.1.17a.tar.bz2 32135 RMD160 baa89b7a7d95e7ab964831e8d1e41d1b0e46a0fc SHA1 364750ea51d8af8324a8a9395431f3aa370ea3ed SHA256 7247495ae336e1e34ca6474e6e8cf4bc0fb589f29698ff924ceb4dc683422a7e
-EBUILD vkeybd-0.1.15-r1.ebuild 1427 RMD160 9d985a94a02cc6ddf0dd3013cd7d0d5570d5cc42 SHA1 f326a8a1a8d2618b974ae425ba2801feec3a95f3 SHA256 5605e769f1206f35da6c7d4cdd35c71918c468cd6d5b83f899d4b83886eccae3
-MD5 c3ba0c45afab3c239303138e19719828 vkeybd-0.1.15-r1.ebuild 1427
-RMD160 9d985a94a02cc6ddf0dd3013cd7d0d5570d5cc42 vkeybd-0.1.15-r1.ebuild 1427
-SHA256 5605e769f1206f35da6c7d4cdd35c71918c468cd6d5b83f899d4b83886eccae3 vkeybd-0.1.15-r1.ebuild 1427
-EBUILD vkeybd-0.1.15-r2.ebuild 1571 RMD160 c8c3d213e8a3a3d03c3e940477e7501e56624374 SHA1 6b901ae8c32c62157b3775a3e8165235014e146c SHA256 92e8bc58ac3e88376551a618dfe732c514c1f9922adc4cf17311dc6f8766c238
-MD5 7e49b55336bf9624f48783024c595e84 vkeybd-0.1.15-r2.ebuild 1571
-RMD160 c8c3d213e8a3a3d03c3e940477e7501e56624374 vkeybd-0.1.15-r2.ebuild 1571
-SHA256 92e8bc58ac3e88376551a618dfe732c514c1f9922adc4cf17311dc6f8766c238 vkeybd-0.1.15-r2.ebuild 1571
-EBUILD vkeybd-0.1.17a.ebuild 1576 RMD160 3da6a9ebdf34ad8b05271000d4268c77592f9488 SHA1 0a74e4221190009ec51ac353503665d82ab8fb5f SHA256 19395893dc5bda250431bbb6ff6442f8853d0858962b8b6458520910cfeef69b
-MD5 fff8265e9f777d45eb0c755cc402b97c vkeybd-0.1.17a.ebuild 1576
-RMD160 3da6a9ebdf34ad8b05271000d4268c77592f9488 vkeybd-0.1.17a.ebuild 1576
-SHA256 19395893dc5bda250431bbb6ff6442f8853d0858962b8b6458520910cfeef69b vkeybd-0.1.17a.ebuild 1576
-MISC ChangeLog 4086 RMD160 7afda4219689fac101e9ce985b66974e46c0e959 SHA1 7d869f2f38e4c3ef657dc285b4dd5f963d92653a SHA256 b3b530f01a0d2404128b72f746b00936008a42196467f8ffa83f7af5518f8ad4
-MD5 457582cb5927087c3f03a95b7b878082 ChangeLog 4086
-RMD160 7afda4219689fac101e9ce985b66974e46c0e959 ChangeLog 4086
-SHA256 b3b530f01a0d2404128b72f746b00936008a42196467f8ffa83f7af5518f8ad4 ChangeLog 4086
+EBUILD vkeybd-0.1.15-r2.ebuild 1524 RMD160 6a0be8604a7bf707dc7e5514fc40396649aab507 SHA1 e89ab445831aa3cd5d5385a1c4ced8750b646d11 SHA256 89d02005bb18e1d30b4110103bec6b54d2ad85173675fc8772b8e0aba008ff74
+MD5 d771ff451f430a66fe3d7f1169749feb vkeybd-0.1.15-r2.ebuild 1524
+RMD160 6a0be8604a7bf707dc7e5514fc40396649aab507 vkeybd-0.1.15-r2.ebuild 1524
+SHA256 89d02005bb18e1d30b4110103bec6b54d2ad85173675fc8772b8e0aba008ff74 vkeybd-0.1.15-r2.ebuild 1524
+EBUILD vkeybd-0.1.17a.ebuild 1525 RMD160 f5fa039e9854731d7299ff4196c5570b2e75a96c SHA1 17c402201fdf6c73daa60931b8f687f267b15ac4 SHA256 27c1dfd4709263ab4dc6e3ff13513d1091590069303e8777a6c2d7e22bf180ea
+MD5 7444a093e25b612522fec53560805ee6 vkeybd-0.1.17a.ebuild 1525
+RMD160 f5fa039e9854731d7299ff4196c5570b2e75a96c vkeybd-0.1.17a.ebuild 1525
+SHA256 27c1dfd4709263ab4dc6e3ff13513d1091590069303e8777a6c2d7e22bf180ea vkeybd-0.1.17a.ebuild 1525
+MISC ChangeLog 4264 RMD160 4e1190f5c31e2a2b561665385d9dd783a540ded3 SHA1 40e5319401ab9a191739b4d3272537188a27fb43 SHA256 da850860adbdb3a4eb82ab87b9afc838f0b62dbbf7587bd3d9d21fec52aeaf0b
+MD5 1906c870e2289cdb406a841e7da97f2f ChangeLog 4264
+RMD160 4e1190f5c31e2a2b561665385d9dd783a540ded3 ChangeLog 4264
+SHA256 da850860adbdb3a4eb82ab87b9afc838f0b62dbbf7587bd3d9d21fec52aeaf0b ChangeLog 4264
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221
 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e metadata.xml 221
-MD5 89f22f95b5731a1bfb5cc64b6f812de2 files/digest-vkeybd-0.1.15-r1 238
-RMD160 bb0a57b691cde216f2c68b332d4a06668eded94f files/digest-vkeybd-0.1.15-r1 238
-SHA256 1b276b98f0577efd7e08cfeeb8a67c48994133787b256ac2f567974c17726150 files/digest-vkeybd-0.1.15-r1 238
 MD5 89f22f95b5731a1bfb5cc64b6f812de2 files/digest-vkeybd-0.1.15-r2 238
 RMD160 bb0a57b691cde216f2c68b332d4a06668eded94f files/digest-vkeybd-0.1.15-r2 238
 SHA256 1b276b98f0577efd7e08cfeeb8a67c48994133787b256ac2f567974c17726150 files/digest-vkeybd-0.1.15-r2 238