Remove monolithic X from dependencies.

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 35 insertions, 36 deletions

diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 1004d431f3b8..85b8ba5d0674 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -6,14 +6,14 @@ MD5 f22d961023c7dc9527a112fb95edd8cd files/Imakefile.patch 664
 RMD160 c7cf1a22e3dec7b9290ee84a8706698c06473763 files/Imakefile.patch 664
 SHA256 a4f64f4ec83c755655aac25b5a3d60e3f13bc52b71c261d7880fe5851e9d1935 files/Imakefile.patch 664
 DIST xkeycaps-2.46.tar.Z 489439 RMD160 ee787ac4970204689ec54d14b6072235c7026acb SHA1 458133a394f63d84efacaf917254074005ce953d SHA256 40da137109e0ef0b687a72b71a1ef0b3d08a10749fdda05fc16c52b4cbed763e
-EBUILD xkeycaps-2.46.ebuild 1052 RMD160 cdcaed5b6102fc9edc30960914ca5c08df3709e9 SHA1 e6c9a72aef8ec4cc358040297730a190739b1956 SHA256 d8e1ac6876e9e1310da5764741273bc034f95e4e49b1bdda61d1f2ef5eb9aa33
-MD5 a43abf6c658fbb4640ad40cb7ffa181a xkeycaps-2.46.ebuild 1052
-RMD160 cdcaed5b6102fc9edc30960914ca5c08df3709e9 xkeycaps-2.46.ebuild 1052
-SHA256 d8e1ac6876e9e1310da5764741273bc034f95e4e49b1bdda61d1f2ef5eb9aa33 xkeycaps-2.46.ebuild 1052
-MISC ChangeLog 2113 RMD160 32a207f7b59639a20ded428f15f5b4efbf950f37 SHA1 cbcd279c0c070cda3ea2e9cb15513d7946fdfe59 SHA256 30eabc329e51b11aff9526d531e178e345fcdf43dea8928d87e3d99cc8fffc7d
-MD5 c1b530316a1978d258459a33d442612d ChangeLog 2113
-RMD160 32a207f7b59639a20ded428f15f5b4efbf950f37 ChangeLog 2113
-SHA256 30eabc329e51b11aff9526d531e178e345fcdf43dea8928d87e3d99cc8fffc7d ChangeLog 2113
+EBUILD xkeycaps-2.46.ebuild 993 RMD160 f5ab09bf63b6bc7ec8ad7f7d35bca86287e2fb8a SHA1 62138089a6cce38aaf435e33486f6af2b897c3e5 SHA256 8ebc5f3afcb00ae248003b61eeb554cfcebf65506f22409c24c211fa58dac36d
+MD5 95a24c1e49cc93a092dcea559f924bf1 xkeycaps-2.46.ebuild 993
+RMD160 f5ab09bf63b6bc7ec8ad7f7d35bca86287e2fb8a xkeycaps-2.46.ebuild 993
+SHA256 8ebc5f3afcb00ae248003b61eeb554cfcebf65506f22409c24c211fa58dac36d xkeycaps-2.46.ebuild 993
+MISC ChangeLog 2235 RMD160 819b4d405ea1fb3940676ef97bfe270943eb4c64 SHA1 9c9a98d4d67116f6f739c31c20a709ab54991186 SHA256 426d2a721cf920aead7d5993df943445af66dbc769e174bbaf61722e1f918e15
+MD5 5095f070ad2f2654d6fa1c5354b086b4 ChangeLog 2235
+RMD160 819b4d405ea1fb3940676ef97bfe270943eb4c64 ChangeLog 2235
+SHA256 426d2a721cf920aead7d5993df943445af66dbc769e174bbaf61722e1f918e15 ChangeLog 2235
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -24,7 +24,7 @@ SHA256 b2400e292721d6e5083074ad15d39d3cba2ef36c58d1c67abb9b7f48867431a6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLNZYgo/w9rxVVVERApcwAJ49B22IpuRJYpEWyLwBxMM6LRnZOQCfSLos
-pI+BVqr7knEehkP2NKzOVRw=
-=BAyO
+iD8DBQFFOpSKvSApE0uP4UsRAifTAKCVqTX/iQaWr/p0rHWgrvkwhye4NACfY4n6
+Ab8w4F0rOp+HmwtkqGgXi/w=
+=SSJz
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xsnow/ChangeLog b/x11-misc/xsnow/ChangeLog
index 486aba3a56ee..f3de45aa6931 100644
--- a/x11-misc/xsnow/ChangeLog
+++ b/x11-misc/xsnow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xsnow
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/ChangeLog,v 1.16 2006/10/10 11:12:01 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/ChangeLog,v 1.17 2006/10/21 21:40:00 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xsnow-1.42.ebuild:
+  Remove monolithic X from dependencies.
 
   10 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> xsnow-1.42.ebuild:
   Added missing gccmakedep to DEPEND. Bug #150575.
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index 64be31c5d038..a631813a9d8a 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST xsnow-1.42.tar.gz 56752 RMD160 4fdf881d045b986f003a13c0eaa2308775cf5e9e SHA1 d63987560dac9c6341e50d270089e40d17031ce3 SHA256 d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
-EBUILD xsnow-1.42.ebuild 953 RMD160 bf9aab02717ab5f2f4320f94861c835b411cdac7 SHA1 5648a0ac1a613571d3aafc9ef49abb05ee6e2705 SHA256 b0b720874d2f374fd7c234c797704edb23ec5e36c49d9aacd049b0964bfe50ad
-MD5 3980cb628bbb39eca16351199c30b3c4 xsnow-1.42.ebuild 953
-RMD160 bf9aab02717ab5f2f4320f94861c835b411cdac7 xsnow-1.42.ebuild 953
-SHA256 b0b720874d2f374fd7c234c797704edb23ec5e36c49d9aacd049b0964bfe50ad xsnow-1.42.ebuild 953
-MISC ChangeLog 1344 RMD160 eb23c930eb7d48631ec6fa603fb70478dea7d1e0 SHA1 27f3e97f3438c0bc0d69feccda8b5986659894e4 SHA256 ac5ebbbb19f029befe2bfce977c7509906959a117711ae2f8ed4ab0f689908b7
-MD5 5fad4398614b89dd9a994b36f13d9fcb ChangeLog 1344
-RMD160 eb23c930eb7d48631ec6fa603fb70478dea7d1e0 ChangeLog 1344
-SHA256 ac5ebbbb19f029befe2bfce977c7509906959a117711ae2f8ed4ab0f689908b7 ChangeLog 1344
+EBUILD xsnow-1.42.ebuild 890 RMD160 0823dbfd0d9ab9d95fd85a7a67fd04a3bff5493f SHA1 3e1dedf6f6e26318c4ddde6903f8c1a70da85124 SHA256 cc80d6c9bb7a95f85ab1a493912a647f35c9073926d8236f52f2657a9028b93a
+MD5 b6724954746a4bb5d88925f1ff003d11 xsnow-1.42.ebuild 890
+RMD160 0823dbfd0d9ab9d95fd85a7a67fd04a3bff5493f xsnow-1.42.ebuild 890
+SHA256 cc80d6c9bb7a95f85ab1a493912a647f35c9073926d8236f52f2657a9028b93a xsnow-1.42.ebuild 890
+MISC ChangeLog 1448 RMD160 33e23cdaeda78fcbfa9b6289507af71d0ac91d8b SHA1 91decb412395de021f678fef42ea455b7fbb34d8 SHA256 9fffcce15b1aed7efd34ec3d8b53dd88fd4415139f8813758e85ed512292ff8c
+MD5 d191017a30e719942d936fccc006c6b7 ChangeLog 1448
+RMD160 33e23cdaeda78fcbfa9b6289507af71d0ac91d8b ChangeLog 1448
+SHA256 9fffcce15b1aed7efd34ec3d8b53dd88fd4415139f8813758e85ed512292ff8c ChangeLog 1448
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -20,7 +20,7 @@ SHA256 8baa9874ea5ef94a30541d3f35989831625e427b3f551e53e434e30bd97b6d84 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFK4Aigo/w9rxVVVERAgrDAKCdXt4aNRHGAjCNYjDVokDH5DcKBACePOp+
-VWeSg7EzFuCJzQrGS6iZsG4=
-=UsCR
+iD8DBQFFOpPXvSApE0uP4UsRAinmAJ43+6Cw1i59rQo/VcW8cDRZGrfFWgCeOIVK
+ftbOw98FjQtQqDw3uCgdik4=
+=MC1q
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xsnow/xsnow-1.42.ebuild b/x11-misc/xsnow/xsnow-1.42.ebuild
index 03d7b4b267f0..a3ade78d9440 100644
--- a/x11-misc/xsnow/xsnow-1.42.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/xsnow-1.42.ebuild,v 1.18 2006/10/10 11:12:01 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnow/xsnow-1.42.ebuild,v 1.19 2006/10/21 21:40:00 omp Exp $
 
 DESCRIPTION="snow, reindeer, and santa on the root window"
 SRC_URI="http://www.euronet.nl/~rja/Xsnow/${P}.tar.gz"
@@ -11,19 +11,15 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 LICENSE="as-is"
 IUSE=""
 
-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-misc/imake
-		x11-misc/gccmakedep
-		x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
+	x11-misc/imake
+	x11-misc/gccmakedep
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_compile() {
 	xmkmf || die