Fixed modular X dependancies. Closes bug #150645

Package-Manager: portage-2.1.1

3 files changed, 26 insertions, 17 deletions

diff --git a/x11-plugins/wmbutton/ChangeLog b/x11-plugins/wmbutton/ChangeLog
index 1cf0cc4f580a..d833f4d1cbfe 100644
--- a/x11-plugins/wmbutton/ChangeLog
+++ b/x11-plugins/wmbutton/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbutton
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.9 2006/02/21 21:43:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.10 2006/10/27 08:36:32 s4t4n Exp $
+
+  24 Jan 2006; Michele Noberasco <s4t4n@gentoo.org> wmbutton-0.5.ebuild:
+  Fixed modular X dependancies. Closes bug #150645
 
   21 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/wmbutton-buttons.xpm, wmbutton-0.5.ebuild:
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index 9481955082bc..6aeb80129518 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -1,21 +1,29 @@
-MD5 30652dbd263f28a7e1d7262123909bad ChangeLog 1280
-RMD160 19345028abeeceac82edf058ddedb161d349a32c ChangeLog 1280
-SHA256 cbf92ee91010c04fcc33522b9e6b633435c6eb5d48001f19ec3265e117b8c9c2 ChangeLog 1280
-MD5 137f4c16471faf9cb4a7f9b4e834960d files/digest-wmbutton-0.5 473
-RMD160 b692f517218940951b8b54f48f58c18eab62e0c9 files/digest-wmbutton-0.5 473
-SHA256 ee4674d0af9e5e350c319646f1a24018c4ff23472cdb8f2d1959dd33c2e554c6 files/digest-wmbutton-0.5 473
+AUX sample.wmbutton 659 RMD160 4e9672a88fdb677588a9048c46e0da237dd7f2c5 SHA1 e69ee959ba4115a98201dde759067deec4a95e18 SHA256 55541666900f478a2c1f73d5fc6fb6bc9ee02687657f830251ce42f480b211d0
 MD5 7d562ae9a457c07a11b6c6038769dc6f files/sample.wmbutton 659
 RMD160 4e9672a88fdb677588a9048c46e0da237dd7f2c5 files/sample.wmbutton 659
 SHA256 55541666900f478a2c1f73d5fc6fb6bc9ee02687657f830251ce42f480b211d0 files/sample.wmbutton 659
+AUX wmbutton-cflags.patch 483 RMD160 755069a2d7ed744093c59525f6e82be0be20ef81 SHA1 d9fd34145e2cad224ba3f18e7280d7b53ee1c4b8 SHA256 4e0eb4e021725a28835b5505546c6af27698468034d61eecfd083a11b10df8be
 MD5 76263f6d447775d0a50f3a42e9e8299e files/wmbutton-cflags.patch 483
 RMD160 755069a2d7ed744093c59525f6e82be0be20ef81 files/wmbutton-cflags.patch 483
 SHA256 4e0eb4e021725a28835b5505546c6af27698468034d61eecfd083a11b10df8be files/wmbutton-cflags.patch 483
+AUX wmbutton.desktop 242 RMD160 10d002ff678107abd4ebfcfe4331a748948f8e7c SHA1 1527175d740f07120c7ae705c63b0d3595b6c090 SHA256 e8640bc403a8dda5d9e0d3917989e6c357bae1321ee38de107d6693b4b39148e
 MD5 1bbe314d935c36bdb0cc7e80141624c9 files/wmbutton.desktop 242
 RMD160 10d002ff678107abd4ebfcfe4331a748948f8e7c files/wmbutton.desktop 242
 SHA256 e8640bc403a8dda5d9e0d3917989e6c357bae1321ee38de107d6693b4b39148e files/wmbutton.desktop 242
+DIST wmbutton-0.5.tar.gz 52316 RMD160 b1abc488f1ce31d12466c3aaf8b307c6e9e91ee1 SHA1 ad41fd466b94ebaa8a40f9a5e75790ea9ff73fae SHA256 09f85d36bccd3d1fee146adefb77053b9b69ec33aca23e8148632d604bc4acd8
+DIST wmbutton-buttons.xpm 25003 RMD160 21d64d252466a8e9c609bdd59dd1035ddc422a02 SHA1 89b986d3d4cf89e981e71d3b6a231debcb35d4af SHA256 357de6947c75339ed8156bd09287f82ef46dad22d16b1c82f7bbce12fd287318
+EBUILD wmbutton-0.5.ebuild 1071 RMD160 090c2952932aa4747e42af1c8259289629a34ead SHA1 d4c7c36572e94a153e0ae84fe242976de9dbf8cc SHA256 75bc935d7e5ccdfcf56b9a6fa0f321abd2c9429d6b57fe58d4c4a4014d0649a0
+MD5 927018c6ae6e25a8dc21d62e81b2f683 wmbutton-0.5.ebuild 1071
+RMD160 090c2952932aa4747e42af1c8259289629a34ead wmbutton-0.5.ebuild 1071
+SHA256 75bc935d7e5ccdfcf56b9a6fa0f321abd2c9429d6b57fe58d4c4a4014d0649a0 wmbutton-0.5.ebuild 1071
+MISC ChangeLog 1403 RMD160 dea5cc2cf7bf97862365a50fb3c485a2e0a76d09 SHA1 a09cc06e793c37cd01b9d2f59a89b63976ec9a43 SHA256 5bc7bf8f33adb8ddbc4ebbd01b51ced5db3fb7c75e14b70660407130ce9f1d00
+MD5 7c6ef06a2b4d5ff4fa21f9442a2a11f5 ChangeLog 1403
+RMD160 dea5cc2cf7bf97862365a50fb3c485a2e0a76d09 ChangeLog 1403
+SHA256 5bc7bf8f33adb8ddbc4ebbd01b51ced5db3fb7c75e14b70660407130ce9f1d00 ChangeLog 1403
+MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata.xml 165
-MD5 80f963e38e8b70677e80a0277e5c400b wmbutton-0.5.ebuild 1117
-RMD160 330cd43b5d95b78207a9880b253c69bce5e544c3 wmbutton-0.5.ebuild 1117
-SHA256 4960b587f8a565556267f8bfa352c3e5c31181ec20abf93f315176b8b938f351 wmbutton-0.5.ebuild 1117
+MD5 137f4c16471faf9cb4a7f9b4e834960d files/digest-wmbutton-0.5 473
+RMD160 b692f517218940951b8b54f48f58c18eab62e0c9 files/digest-wmbutton-0.5 473
+SHA256 ee4674d0af9e5e350c319646f1a24018c4ff23472cdb8f2d1959dd33c2e554c6 files/digest-wmbutton-0.5 473
diff --git a/x11-plugins/wmbutton/wmbutton-0.5.ebuild b/x11-plugins/wmbutton/wmbutton-0.5.ebuild
index db36756dc045..998e2becbe0d 100644
--- a/x11-plugins/wmbutton/wmbutton-0.5.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.5.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/wmbutton/wmbutton-0.5.ebuild,v 1.9 2006/02/21 21:43:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.5.ebuild,v 1.10 2006/10/27 08:36:32 s4t4n Exp $
 
 inherit eutils
 
@@ -11,16 +11,14 @@ SRC_URI="http://www.dockapps.org/download.php/id/454/${P}.tar.gz
 	mirror://gentoo/${PN}-buttons.xpm"
 HOMEPAGE="http://www.dockapps.org/file.php/id/241"
 
-RDEPEND="|| ( (
+DEPEND="
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXpm )
 	virtual/x11 )"
-DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto )
-	virtual/x11 )"
 
 SLOT="0"
 LICENSE="GPL-2"