(#122540) Add modular X deps, based on work of Santiago M. Mola.

Package-Manager: portage-2.1_pre6-r2

diff --git a/x11-wm/wm2/ChangeLog b/x11-wm/wm2/ChangeLog
index a80bc70744a64c3eec627dccd4df4a6e2941c046..c830f085bc6d2348210361038b20e48c45fe4146 100644 (file)
--- a/x11-wm/wm2/ChangeLog
+++ b/x11-wm/wm2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/wm2
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/ChangeLog,v 1.7 2005/07/20 21:23:34 herbs Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/ChangeLog,v 1.8 2006/03/15 08:17:16 spyderous Exp $
+
+  15 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; wm2-4.ebuild:
+  (#122540) Add modular X deps, based on work of Santiago M. Mola.
 
   20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> wm2-4.ebuild:
   Stable on amd64.

diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index b7ee92ac041b75a29fb11a6ace2f968f28f6978d..ddfe4ac46d5bd903d937c3e7a102183164e8a89a 100644 (file)
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9dc902b53d7e6fa21f917ae099167fc2 wm2-4.ebuild 1325
-MD5 4bc79404907d4fb259c08b6861392161 ChangeLog 891
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 9e0ac0452d3a84e7f4837c7f0f08ff37 files/wm2-4-gentoo.patch 3430
+MD5 ffb998e618eb3ca06202c2a15af42f48 ChangeLog 1032
+RMD160 7fd50d4148637fab71c6a75a60e99bdb6660ac0d ChangeLog 1032
+SHA256 444a384c1f5b18be2ba65d88b0876da0e10059d9104f4b22a7bad283924a9001 ChangeLog 1032
 MD5 b06be8523fb665cee575914e6b788265 files/digest-wm2-4 56
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3sDl2G5bA0cA/ScRAsACAJ9uM6/IECPdYzejWDb5ZZeLAy8ysQCgtEug
-qIAu+wj7TK+fj22wzGxkpME=
-=mVZp
------END PGP SIGNATURE-----
+RMD160 736092962085899b9d7b1c7b9e72a30f252dad22 files/digest-wm2-4 56
+SHA256 3aa01f535de945228974a26664e4b7dbac0e248f098fb08df2873d2c66705d4c files/digest-wm2-4 56
+MD5 9e0ac0452d3a84e7f4837c7f0f08ff37 files/wm2-4-gentoo.patch 3430
+RMD160 c812d55dcfb4fcda8a47fe502b40f08a2df8e9c8 files/wm2-4-gentoo.patch 3430
+SHA256 a180f35d9b818893dc7fb6ed3cb7dd5d3bfdc294d3656f7109b341e476b3a797 files/wm2-4-gentoo.patch 3430
+MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
+RMD160 7c2ff9d5408196433d3c5d74537d222335183899 metadata.xml 163
+SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797 metadata.xml 163
+MD5 409a87b4d439a8590165ae22aa8e1468 wm2-4.ebuild 1413
+RMD160 a9fb8a3e5e23f5c2af6a3a37eb6c9dd3f762a661 wm2-4.ebuild 1413
+SHA256 062cf013a483c404bff2aa62a6cb1618bbb95fbeaa385a60f937e2d46d459d9c wm2-4.ebuild 1413

diff --git a/x11-wm/wm2/wm2-4.ebuild b/x11-wm/wm2/wm2-4.ebuild
index 1b8443aed692fa8d9b18e2953aade049cad2eccf..eacb8d4c92a3f202058d06bcf60472d929294c4e 100644 (file)
--- a/x11-wm/wm2/wm2-4.ebuild
+++ b/x11-wm/wm2/wm2-4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/wm2-4.ebuild,v 1.7 2005/07/20 21:23:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/wm2-4.ebuild,v 1.8 2006/03/15 08:17:16 spyderous Exp $
 
 inherit eutils
 
@@ -10,7 +10,9 @@ DESCRIPTION="Small, unconfigurable window manager"
 HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
 SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXmu virtual/x11 )"
+DEPEND="${RDEPEND}
+       || ( x11-proto/xextproto virtual/x11 )"
 
 SLOT="0"
 LICENSE="freedist"