Remove virtual/x11 from dependencies.

Package-Manager: portage-2.1.3_rc8

7 files changed, 91 insertions, 109 deletions

diff --git a/x11-wm/jwm/ChangeLog b/x11-wm/jwm/ChangeLog
index 8eeec9333337..317a6ca9e5bd 100644
--- a/x11-wm/jwm/ChangeLog
+++ b/x11-wm/jwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/jwm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.11 2007/03/13 14:58:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.12 2007/07/22 04:44:15 omp Exp $
+
+  22 Jul 2007; David Shakaryan <omp@gentoo.org> jwm-0.21.ebuild,
+  jwm-0.22.ebuild, jwm-0.23.ebuild, jwm-1.5.ebuild, jwm-1.7.ebuild:
+  Remove virtual/x11 from dependencies.
 
   13 Mar 2007; Raúl Porcel <armin76@gentoo.org> jwm-1.7.ebuild:
   x86 stable
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 34f64f03f2db..2de81957663b 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jwm-1.5-configure.in.patch 458 RMD160 4982c947e87f6e2ede8b16c856ac3305a2c9348b SHA1 68cc993d39d84667ef1bf00f69ff4c3c10d8595d SHA256 bdaddef0f60d9576abc14f39a634a32c49b75983cc82ea33083baf97b674bdfd
 MD5 a882d98497286a39a263630ef41f439d files/jwm-1.5-configure.in.patch 458
 RMD160 4982c947e87f6e2ede8b16c856ac3305a2c9348b files/jwm-1.5-configure.in.patch 458
@@ -7,30 +10,30 @@ DIST jwm-0.22.tar.bz2 93063 RMD160 8b9233214f6d15be98d38b86c530e4a496601517 SHA1
 DIST jwm-0.23.tar.bz2 93365 RMD160 f875152a5e0d93828f1226be0126fc086426e513 SHA1 69c95f9a38e5f206a6f64bd7a4e8c8179d54a02e SHA256 f8dafcd4ce95cf237d48d18af9533bb9403e82708bacb1f560a4282d253e2e0d
 DIST jwm-1.5.tar.bz2 119481 RMD160 df657dcadc20e9abee5732bc0bc0ce351ed42a13 SHA1 3b54438f70eb39f0096cad2011d1fc6e99f7f7b5 SHA256 83bbc418dadf86dd0b0f42da2c2800b9c93a3817eff00f3700d39217c418872d
 DIST jwm-1.7.tar.bz2 121405 RMD160 fca374a54cff0f17eef537a228a696c79ec04fa6 SHA1 2ad8029277d1ba530c314ea4e5a9f930afa56a78 SHA256 301496c62b96da8f1df538899acbafc1d74ab30075c1fa182c4821cea221b094
-EBUILD jwm-0.21.ebuild 841 RMD160 b1eb0feefa4dd9426bd7b6f7a4a604f0654f9d7b SHA1 13ce37d8ae6e67d4be50243e85a7c690cd3cd9f0 SHA256 ae3a0a638f1aeb34c6f8ab96897da4eec02af7b439cc9deb9e94b277b0438b6e
-MD5 e68c7296ff6a343e628d13e3d93a45cd jwm-0.21.ebuild 841
-RMD160 b1eb0feefa4dd9426bd7b6f7a4a604f0654f9d7b jwm-0.21.ebuild 841
-SHA256 ae3a0a638f1aeb34c6f8ab96897da4eec02af7b439cc9deb9e94b277b0438b6e jwm-0.21.ebuild 841
-EBUILD jwm-0.22.ebuild 843 RMD160 eef1645aa528ee909271ded3f64429c5b6d3d7f1 SHA1 48b3d0e5ce1c8bb5166934d61c4f337e93e80fc6 SHA256 e3b021c431b25448ed8979fc8f1da58087ad5d54bcc5d7085838764b10fbabdb
-MD5 d619edbb40f6592b5659f38f9df1d37f jwm-0.22.ebuild 843
-RMD160 eef1645aa528ee909271ded3f64429c5b6d3d7f1 jwm-0.22.ebuild 843
-SHA256 e3b021c431b25448ed8979fc8f1da58087ad5d54bcc5d7085838764b10fbabdb jwm-0.22.ebuild 843
-EBUILD jwm-0.23.ebuild 846 RMD160 a26ab977ce4cd0f37951f2defcce96d17fa7e8df SHA1 ff0e9d58b1af5b6d81c9a251b3cfc7be31e9ae90 SHA256 8b6a8ba3bc77d8e0bde97fc8faf6954754e1e8df7a5ed3c10597b570a9847d6e
-MD5 fe7fb13c2df59d9794a11e51612d32d7 jwm-0.23.ebuild 846
-RMD160 a26ab977ce4cd0f37951f2defcce96d17fa7e8df jwm-0.23.ebuild 846
-SHA256 8b6a8ba3bc77d8e0bde97fc8faf6954754e1e8df7a5ed3c10597b570a9847d6e jwm-0.23.ebuild 846
-EBUILD jwm-1.5.ebuild 1849 RMD160 537c42bec333c37ff5bd599d4b3106cff9daf54f SHA1 967b042cf5232bad3c35500260e323f9b41ca3d9 SHA256 cc58cd020b3b320959d75a1f0c4e6a8f2753061d34d91a844e49b01cc596926e
-MD5 c2484e2760bab55a227266dcd8893c82 jwm-1.5.ebuild 1849
-RMD160 537c42bec333c37ff5bd599d4b3106cff9daf54f jwm-1.5.ebuild 1849
-SHA256 cc58cd020b3b320959d75a1f0c4e6a8f2753061d34d91a844e49b01cc596926e jwm-1.5.ebuild 1849
-EBUILD jwm-1.7.ebuild 1791 RMD160 6d40b815a2408fb116065278a8719ce791ee2cd4 SHA1 149b414e520b7bcf5960272468fc9df1fdfb0c2a SHA256 dfb2db0037890d1f781b0121e0ed229ee371eda9ce8e98775e1d3d4fcc059897
-MD5 9fd7d5f0457d4d6569f12dcc27200527 jwm-1.7.ebuild 1791
-RMD160 6d40b815a2408fb116065278a8719ce791ee2cd4 jwm-1.7.ebuild 1791
-SHA256 dfb2db0037890d1f781b0121e0ed229ee371eda9ce8e98775e1d3d4fcc059897 jwm-1.7.ebuild 1791
-MISC ChangeLog 1722 RMD160 0bca92799c785ed8ac3faa770779c78031d4feb0 SHA1 b4770ddb38a029728382d248047e71df796b1c87 SHA256 b2cad9c0cccd59857fb6efa3a887687eba0c56e4c4717565c48654b054ef9dc6
-MD5 dcfddf940b88ec1ff5979945509a0575 ChangeLog 1722
-RMD160 0bca92799c785ed8ac3faa770779c78031d4feb0 ChangeLog 1722
-SHA256 b2cad9c0cccd59857fb6efa3a887687eba0c56e4c4717565c48654b054ef9dc6 ChangeLog 1722
+EBUILD jwm-0.21.ebuild 780 RMD160 d8a6c3fd19749a226748f97b31e114dc1e596d3e SHA1 655fc3fa7380e940342a25da64d72c5b2a65dc19 SHA256 28929c3d7cb480e6df4d249bbc3ee90b0a85de971d6d9826aad4d24133554dcb
+MD5 59742a1ca8619660432bcf38a86734ec jwm-0.21.ebuild 780
+RMD160 d8a6c3fd19749a226748f97b31e114dc1e596d3e jwm-0.21.ebuild 780
+SHA256 28929c3d7cb480e6df4d249bbc3ee90b0a85de971d6d9826aad4d24133554dcb jwm-0.21.ebuild 780
+EBUILD jwm-0.22.ebuild 782 RMD160 97e9bd44588dd39355720bdf32ed73952f7a26a6 SHA1 78cde553a0240e5f893f45aeee0c346ade9f03d2 SHA256 a1db8aa65f05eb77f60551a1a0d7c48fdb4c5b249face241f7de6aa6a238fbd1
+MD5 ef1c4fca422baf4da10a7fc09e6c8f1b jwm-0.22.ebuild 782
+RMD160 97e9bd44588dd39355720bdf32ed73952f7a26a6 jwm-0.22.ebuild 782
+SHA256 a1db8aa65f05eb77f60551a1a0d7c48fdb4c5b249face241f7de6aa6a238fbd1 jwm-0.22.ebuild 782
+EBUILD jwm-0.23.ebuild 787 RMD160 fd3cca54910b60b1793ddece3111c715d11796f2 SHA1 2f11d2df97c299bc05503db1d448e88afdc5d651 SHA256 443258f203815654cf466cfc3d762085197ca8ad05f3e304d2195f6b3dde2c1f
+MD5 c7dc782e09a7e56fd277ef90676aae9c jwm-0.23.ebuild 787
+RMD160 fd3cca54910b60b1793ddece3111c715d11796f2 jwm-0.23.ebuild 787
+SHA256 443258f203815654cf466cfc3d762085197ca8ad05f3e304d2195f6b3dde2c1f jwm-0.23.ebuild 787
+EBUILD jwm-1.5.ebuild 1708 RMD160 d720caa7f77a0855d26b00ac181cd288c315df9b SHA1 1e87041e65ffcffa8968b3d1b9606c88fa4b8386 SHA256 955d5758905eac8c317a4ec1b0e354126d4450f59e82d4f8d7f5e222ce6578e9
+MD5 07ddff705df2a79a2583759ab173d084 jwm-1.5.ebuild 1708
+RMD160 d720caa7f77a0855d26b00ac181cd288c315df9b jwm-1.5.ebuild 1708
+SHA256 955d5758905eac8c317a4ec1b0e354126d4450f59e82d4f8d7f5e222ce6578e9 jwm-1.5.ebuild 1708
+EBUILD jwm-1.7.ebuild 1650 RMD160 cde42f5fed29daf42e8f2eb0cd2abfcc3814da1f SHA1 8bcb0a426a96bf47b740b46360f99711ef881b37 SHA256 8fe50419608d733f479c3070bdcfee69ed0c6c71c8e3f2456678c431ec09ccf5
+MD5 06285d6e6d83fc8a9885a5395c667045 jwm-1.7.ebuild 1650
+RMD160 cde42f5fed29daf42e8f2eb0cd2abfcc3814da1f jwm-1.7.ebuild 1650
+SHA256 8fe50419608d733f479c3070bdcfee69ed0c6c71c8e3f2456678c431ec09ccf5 jwm-1.7.ebuild 1650
+MISC ChangeLog 1892 RMD160 4ff27b72a4f2a58b22ea0a62edfa752b35cce2e0 SHA1 14362b5ca368cb97e4840770b03197e1aeff8355 SHA256 a50dc68237ac47411b483c95169eaf794011cb9d9001de8993ed784eca5f2749
+MD5 b2d70eecf568b2f35143ab485f39defd ChangeLog 1892
+RMD160 4ff27b72a4f2a58b22ea0a62edfa752b35cce2e0 ChangeLog 1892
+SHA256 a50dc68237ac47411b483c95169eaf794011cb9d9001de8993ed784eca5f2749 ChangeLog 1892
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 metadata.xml 163
@@ -50,3 +53,10 @@ SHA256 8e1bf3e56180b8afe517376d7166ed997f314f7b1337241b8b18ee275735fd76 files/di
 MD5 c5391354ebcba4f2a7990e95476fbed0 files/digest-jwm-1.7 226
 RMD160 ba17c86791165276a9c270a021b7d0884aa7af1a files/digest-jwm-1.7 226
 SHA256 bfd003d6d4e9c0428655a00c269765eb9ae7b3e6b1472e206d3e50a99ebc3834 files/digest-jwm-1.7 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGouCgvSApE0uP4UsRAhEPAJ4rnuRZomClU4608p+TCFlBSaKGcwCgm7v8
+bCFedegJbrNnkOodCjZBP0U=
+=jfLE
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/jwm/jwm-0.21.ebuild b/x11-wm/jwm/jwm-0.21.ebuild
index 37476fd32b22..1fa2d6a5ea05 100644
--- a/x11-wm/jwm/jwm-0.21.ebuild
+++ b/x11-wm/jwm/jwm-0.21.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/x11-wm/jwm/jwm-0.21.ebuild,v 1.5 2006/02/11 11:53:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.21.ebuild,v 1.6 2007/07/22 04:44:15 omp Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ppc x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_install() {
 	dodir /usr/bin
diff --git a/x11-wm/jwm/jwm-0.22.ebuild b/x11-wm/jwm/jwm-0.22.ebuild
index 8b4bf0424ac3..e182648f8b1e 100644
--- a/x11-wm/jwm/jwm-0.22.ebuild
+++ b/x11-wm/jwm/jwm-0.22.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/x11-wm/jwm/jwm-0.22.ebuild,v 1.2 2006/02/11 11:53:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.22.ebuild,v 1.3 2007/07/22 04:44:15 omp Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_install() {
 	dodir /usr/bin
diff --git a/x11-wm/jwm/jwm-0.23.ebuild b/x11-wm/jwm/jwm-0.23.ebuild
index 544d6218b34e..e234adf204bf 100644
--- a/x11-wm/jwm/jwm-0.23.ebuild
+++ b/x11-wm/jwm/jwm-0.23.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/x11-wm/jwm/jwm-0.23.ebuild,v 1.3 2006/02/11 12:53:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.23.ebuild,v 1.4 2007/07/22 04:44:15 omp Exp $
 
 IUSE=""
 
@@ -12,17 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="hppa ~ppc ~x86"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_install() {
 	dodir /usr/bin
diff --git a/x11-wm/jwm/jwm-1.5.ebuild b/x11-wm/jwm/jwm-1.5.ebuild
index 4c607769ebf3..d2b6f4ccaefc 100644
--- a/x11-wm/jwm/jwm-1.5.ebuild
+++ b/x11-wm/jwm/jwm-1.5.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/x11-wm/jwm/jwm-1.5.ebuild,v 1.5 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-1.5.ebuild,v 1.6 2007/07/22 04:44:15 omp Exp $
 
 inherit autotools eutils
 
@@ -14,30 +14,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~hppa ~ppc ~x86"
 
-RDEPEND="|| ( (
-				xpm? ( x11-libs/libXpm )
-				truetype? ( x11-libs/libXft )
-				xinerama? ( x11-libs/libXinerama )
-				x11-libs/libXext
-				x11-libs/libXrender
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				)
-				virtual/x11
-			)
-		truetype? ( virtual/xft )
-		png? ( media-libs/libpng )
-		bidi? ( dev-libs/fribidi )
-		dev-libs/expat"
-
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( virtual/xft )
+	png? ( media-libs/libpng )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
 DEPEND="${RDEPEND}
-		|| ( (
-				x11-proto/xproto
-				x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-			)"
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_compile() {
 	epatch "${FILESDIR}/${P}-configure.in.patch"
diff --git a/x11-wm/jwm/jwm-1.7.ebuild b/x11-wm/jwm/jwm-1.7.ebuild
index bdd2ec01aebb..0ee804c4e0cb 100644
--- a/x11-wm/jwm/jwm-1.7.ebuild
+++ b/x11-wm/jwm/jwm-1.7.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/x11-wm/jwm/jwm-1.7.ebuild,v 1.4 2007/07/12 03:41:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-1.7.ebuild,v 1.5 2007/07/22 04:44:15 omp Exp $
 
 inherit autotools eutils
 
@@ -14,30 +14,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~hppa ~ppc x86"
 
-RDEPEND="|| ( (
-				xpm? ( x11-libs/libXpm )
-				truetype? ( x11-libs/libXft )
-				xinerama? ( x11-libs/libXinerama )
-				x11-libs/libXext
-				x11-libs/libXrender
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				)
-				virtual/x11
-			)
-		truetype? ( virtual/xft )
-		png? ( media-libs/libpng )
-		bidi? ( dev-libs/fribidi )
-		dev-libs/expat"
-
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( virtual/xft )
+	png? ( media-libs/libpng )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
 DEPEND="${RDEPEND}
-		|| ( (
-				x11-proto/xproto
-				x11-proto/xextproto
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-			)"
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_compile() {
 	econf \