modular X happyness acheived.

Package-Manager: portage-2.1.1_pre2-r6

5 files changed, 56 insertions, 10 deletions

diff --git a/x11-plugins/wmium/ChangeLog b/x11-plugins/wmium/ChangeLog
index 3e4bcf82ae85..6d4ef2e51b8a 100644
--- a/x11-plugins/wmium/ChangeLog
+++ b/x11-plugins/wmium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmium
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.16 2006/01/22 02:21:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/ChangeLog,v 1.17 2006/07/12 08:37:01 dragonheart Exp $
+
+  12 Jul 2006; Daniel Black <dragonheart@gentoo.org> wmium-1.0.9b.ebuild:
+  modular X happyness acheived.
 
 *wmium-1.0.9b-r1 (22 Jan 2006)
 
diff --git a/x11-plugins/wmium/Manifest b/x11-plugins/wmium/Manifest
index be7a744f50b3..b56f6724bc66 100644
--- a/x11-plugins/wmium/Manifest
+++ b/x11-plugins/wmium/Manifest
@@ -1,6 +1,33 @@
-MD5 5f8f2f0c117e4d8054eaa0fb70b5b1a6 ChangeLog 2497
-MD5 e420d58fe2bc90bec34c26a6e31cc60b files/digest-wmium-1.0.9b 63
-MD5 e420d58fe2bc90bec34c26a6e31cc60b files/digest-wmium-1.0.9b-r1 63
-MD5 75bf1a2523c837fdd89f903e4b8252a4 metadata.xml 385
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST wmium-1.0.9b.tar.gz 53977 RMD160 1851c8cfe7ebf673b1f7138343057ac5cd02d171 SHA1 1a32c77c54f073b739c619c29448d9de8cf2a1aa SHA256 a3534b4919d8f5eb3679d5d6b9eff854864e7c6dc1b74aff6637d9c2f94f78f9
+EBUILD wmium-1.0.9b-r1.ebuild 1516 RMD160 0fcb36c39dd6cbb05b7aa2c1ebaf617b7de015a2 SHA1 6819e5ade4e349b496bdcad20fe26c3d1f673520 SHA256 8f0d9e7b9129b504209d9d8e9d349e9624d1f06ea84bb33fd024cd9375631651
 MD5 f53d62de38d23ac82091ea13366a6100 wmium-1.0.9b-r1.ebuild 1516
-MD5 458645aa982271da991cc9e1748c8876 wmium-1.0.9b.ebuild 1264
+RMD160 0fcb36c39dd6cbb05b7aa2c1ebaf617b7de015a2 wmium-1.0.9b-r1.ebuild 1516
+SHA256 8f0d9e7b9129b504209d9d8e9d349e9624d1f06ea84bb33fd024cd9375631651 wmium-1.0.9b-r1.ebuild 1516
+EBUILD wmium-1.0.9b.ebuild 1513 RMD160 557491a564863203f513f2e79082f145d8707fe8 SHA1 9f27fc48de39d8de69790dab66d18947f864e9f7 SHA256 94726a65ee453167ec021b30ba44a8289cc5713126a1bcce56f51e6c7e0fc18c
+MD5 714d93c2a138333c4c511f51bb4fb9a7 wmium-1.0.9b.ebuild 1513
+RMD160 557491a564863203f513f2e79082f145d8707fe8 wmium-1.0.9b.ebuild 1513
+SHA256 94726a65ee453167ec021b30ba44a8289cc5713126a1bcce56f51e6c7e0fc18c wmium-1.0.9b.ebuild 1513
+MISC ChangeLog 2605 RMD160 5f20d24c5e52f1f9ff54aff9c47f857d0e44b116 SHA1 e1608d694ca83287c22b2a92cefbc69a3d08162b SHA256 46c47dee8eb48ef1f7a05ad3b01134c65fa3f69f025bb2c2fbab690de7d99a29
+MD5 67b59f694596df692c467c7b31115fbf ChangeLog 2605
+RMD160 5f20d24c5e52f1f9ff54aff9c47f857d0e44b116 ChangeLog 2605
+SHA256 46c47dee8eb48ef1f7a05ad3b01134c65fa3f69f025bb2c2fbab690de7d99a29 ChangeLog 2605
+MISC metadata.xml 385 RMD160 42a8a34d4c35d63792fdb4ca6cd31d1d5a771347 SHA1 340c87b1b4f5d26615fc9852deb29cb53e1aa126 SHA256 9e630ab9fa4a5b46865febcda4b6f04f2c7a16298c34b509c09ed08ea402d920
+MD5 75bf1a2523c837fdd89f903e4b8252a4 metadata.xml 385
+RMD160 42a8a34d4c35d63792fdb4ca6cd31d1d5a771347 metadata.xml 385
+SHA256 9e630ab9fa4a5b46865febcda4b6f04f2c7a16298c34b509c09ed08ea402d920 metadata.xml 385
+MD5 35f5d3c78f6d6662a7a44df8316aca96 files/digest-wmium-1.0.9b 235
+RMD160 966e04f23a39f397611104f07bda08839714e411 files/digest-wmium-1.0.9b 235
+SHA256 9ba014fc0df4bc71fee9bbfe599a0602e33478d006bcb4d06725681150f1e0bf files/digest-wmium-1.0.9b 235
+MD5 35f5d3c78f6d6662a7a44df8316aca96 files/digest-wmium-1.0.9b-r1 235
+RMD160 966e04f23a39f397611104f07bda08839714e411 files/digest-wmium-1.0.9b-r1 235
+SHA256 9ba014fc0df4bc71fee9bbfe599a0602e33478d006bcb4d06725681150f1e0bf files/digest-wmium-1.0.9b-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEtLZymdTrptrqvGERAvUTAJ0dRcWEss/ou7DOeY4psIz6KNC0igCfb2iS
+up56x4WGO56wWof1l4yQKeo=
+=YgJS
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmium/files/digest-wmium-1.0.9b b/x11-plugins/wmium/files/digest-wmium-1.0.9b
index daedf27e758a..ed8188db87f7 100644
--- a/x11-plugins/wmium/files/digest-wmium-1.0.9b
+++ b/x11-plugins/wmium/files/digest-wmium-1.0.9b
@@ -1 +1,3 @@
 MD5 ae94efe5d534894b94e1d87b958df58c wmium-1.0.9b.tar.gz 53977
+RMD160 1851c8cfe7ebf673b1f7138343057ac5cd02d171 wmium-1.0.9b.tar.gz 53977
+SHA256 a3534b4919d8f5eb3679d5d6b9eff854864e7c6dc1b74aff6637d9c2f94f78f9 wmium-1.0.9b.tar.gz 53977
diff --git a/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1 b/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1
index daedf27e758a..ed8188db87f7 100644
--- a/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1
+++ b/x11-plugins/wmium/files/digest-wmium-1.0.9b-r1
@@ -1 +1,3 @@
 MD5 ae94efe5d534894b94e1d87b958df58c wmium-1.0.9b.tar.gz 53977
+RMD160 1851c8cfe7ebf673b1f7138343057ac5cd02d171 wmium-1.0.9b.tar.gz 53977
+SHA256 a3534b4919d8f5eb3679d5d6b9eff854864e7c6dc1b74aff6637d9c2f94f78f9 wmium-1.0.9b.tar.gz 53977
diff --git a/x11-plugins/wmium/wmium-1.0.9b.ebuild b/x11-plugins/wmium/wmium-1.0.9b.ebuild
index 7b2f02f27b45..1894f6540011 100644
--- a/x11-plugins/wmium/wmium-1.0.9b.ebuild
+++ b/x11-plugins/wmium/wmium-1.0.9b.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-plugins/wmium/wmium-1.0.9b.ebuild,v 1.3 2006/01/22 02:21:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmium/wmium-1.0.9b.ebuild,v 1.4 2006/07/12 08:37:01 dragonheart Exp $
 
 IUSE="gtk"
 
@@ -11,22 +11,34 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 DEPEND="virtual/libc
-	virtual/x11
 	dev-libs/openssl
 	gtk? (
 		>=x11-libs/gtk+-2
 		app-admin/gkrellm
 		dev-util/pkgconfig
+	)
+	( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXext-1.0.0
+	>=x11-libs/libXpm-3.5.4.2
+	>=x11-proto/xextproto-7.0.2 )
+	virtual/x11 )
 	)"
 
 RDEPEND="virtual/libc
-	virtual/x11
 	dev-libs/openssl
 	gtk? (
 		>=x11-libs/gtk+-2
 		app-admin/gkrellm
 	)
-	!gtk? ( x11-wm/windowmaker )"
+	!gtk? ( x11-wm/windowmaker )
+	( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXext-1.0.0
+	>=x11-libs/libXpm-3.5.4.2
+	>=x11-proto/xextproto-7.0.2 )
+	virtual/x11 )
+	)"
 
 src_compile() {
 	emake build || die