Fix dependencies for modular Xorg, thanks to James Rowe in bug #146586.

Package-Manager: portage-2.1.2_pre2-r1

3 files changed, 56 insertions, 11 deletions

diff --git a/x11-plugins/wmmp/ChangeLog b/x11-plugins/wmmp/ChangeLog
index cf018324c139..0a3631a21f30 100644
--- a/x11-plugins/wmmp/ChangeLog
+++ b/x11-plugins/wmmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmp
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/ChangeLog,v 1.12 2005/10/07 15:43:45 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/ChangeLog,v 1.13 2006/10/02 06:16:13 flameeyes Exp $
+
+  02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> wmmp-0.10.0.ebuild:
+  Fix dependencies for modular Xorg, thanks to James Rowe in bug #146586.
 
   07 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> wmmp-0.8.0.ebuild,
   wmmp-0.9.1.ebuild, wmmp-0.9.2.ebuild, wmmp-0.10.0.ebuild:
diff --git a/x11-plugins/wmmp/Manifest b/x11-plugins/wmmp/Manifest
index e955fc171699..509f5e45b0b5 100644
--- a/x11-plugins/wmmp/Manifest
+++ b/x11-plugins/wmmp/Manifest
@@ -1,10 +1,50 @@
-MD5 39d2541088a699ee0e5d2ba28a43adf7 ChangeLog 1549
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST WMmp-0.10.0.tar.gz 228560
+DIST WMmp-0.8.0.tar.gz 214608
+DIST WMmp-0.9.1.tar.gz 313037
+DIST WMmp-0.9.2.tar.gz 313679
+EBUILD wmmp-0.10.0.ebuild 684 RMD160 a68546e5a86f5394ace02ae59416a6dfc575e0ec SHA1 1abd5c122a98b1b6705809474c753b2d5390a154 SHA256 c6b2afe365269351d6349e4b61f5d3fb4aee36d797b6bb277d513a4fbac9a1c4
+MD5 0b69de734fe0ff85284550aa59e132ef wmmp-0.10.0.ebuild 684
+RMD160 a68546e5a86f5394ace02ae59416a6dfc575e0ec wmmp-0.10.0.ebuild 684
+SHA256 c6b2afe365269351d6349e4b61f5d3fb4aee36d797b6bb277d513a4fbac9a1c4 wmmp-0.10.0.ebuild 684
+EBUILD wmmp-0.8.0.ebuild 614 RMD160 e116ae649a62e3eb38280e62f9602f1791cc2c09 SHA1 75072a18c44426800a4cf6e71df7e45ea24224bd SHA256 654c7eb858ef3178d20c1af3d534c8b1334c0221eda2c3cd862877a2fcd7f995
+MD5 690807ac188cd38760a4d8e7bba683c5 wmmp-0.8.0.ebuild 614
+RMD160 e116ae649a62e3eb38280e62f9602f1791cc2c09 wmmp-0.8.0.ebuild 614
+SHA256 654c7eb858ef3178d20c1af3d534c8b1334c0221eda2c3cd862877a2fcd7f995 wmmp-0.8.0.ebuild 614
+EBUILD wmmp-0.9.1.ebuild 622 RMD160 961f613a4dd4801a600e844a9bd0805ab7b5b30e SHA1 5a21af78ce75d97d91858c422214aabfa08a4786 SHA256 bc15517d9e1ab832ff167605eac974844e11b21dae2de9bbebde2061ee207bbb
+MD5 8f1d2545ea33233322953e73c873634c wmmp-0.9.1.ebuild 622
+RMD160 961f613a4dd4801a600e844a9bd0805ab7b5b30e wmmp-0.9.1.ebuild 622
+SHA256 bc15517d9e1ab832ff167605eac974844e11b21dae2de9bbebde2061ee207bbb wmmp-0.9.1.ebuild 622
+EBUILD wmmp-0.9.2.ebuild 634 RMD160 82149344123c5f162eebb93006f02ba3ec53f1f2 SHA1 7866338f4f0944990e5716cad950e4d634db0409 SHA256 f5d7d310bb4a3682c51619f24919db98b5a6faf748f4d30847a7382ef5bfd38b
+MD5 117a1c3996038e478c9c4213f43307b7 wmmp-0.9.2.ebuild 634
+RMD160 82149344123c5f162eebb93006f02ba3ec53f1f2 wmmp-0.9.2.ebuild 634
+SHA256 f5d7d310bb4a3682c51619f24919db98b5a6faf748f4d30847a7382ef5bfd38b wmmp-0.9.2.ebuild 634
+MISC ChangeLog 1697 RMD160 0aa169af1abffbaf7d5037fd246715278eadaddb SHA1 4e3597724ba44f3cc67e8f58b651d9f0fd14f043 SHA256 a5186a51b1c0cb67f8f93dcad8faa91f205d384c169cda9425e85b0fba13b753
+MD5 033ec6117add30d0746feb39e5aaf205 ChangeLog 1697
+RMD160 0aa169af1abffbaf7d5037fd246715278eadaddb ChangeLog 1697
+SHA256 a5186a51b1c0cb67f8f93dcad8faa91f205d384c169cda9425e85b0fba13b753 ChangeLog 1697
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 MD5 d648674d5a073b865c66aceb371b4dc1 files/digest-wmmp-0.10.0 63
+RMD160 e00f5206e3f4d059db8d730e0ddfe230c1320a9c files/digest-wmmp-0.10.0 63
+SHA256 eb4600ab686da0c5c42aecf3fb3db7a0cc5223b8b0ae3f0a957cf4b04817f219 files/digest-wmmp-0.10.0 63
 MD5 beb727868a84018b72dd002d9f392004 files/digest-wmmp-0.8.0 62
+RMD160 dca37350c3041bd6b563925302536c20f3b03100 files/digest-wmmp-0.8.0 62
+SHA256 01981d6f8144fd1bc4833886ef0ad82c9697d16feba173deb5ae1a891944ec2d files/digest-wmmp-0.8.0 62
 MD5 999b899312796e783824ace79291a08d files/digest-wmmp-0.9.1 62
+RMD160 8580072a1bc76c611f058c7a4f8b4c34b4b3c9f6 files/digest-wmmp-0.9.1 62
+SHA256 c6a55811389ccb825b01baf4d11b6f9d3da537b043306317ffcae9a83cc9d5c0 files/digest-wmmp-0.9.1 62
 MD5 cdffa6ca398ffe7d0b9a1db438ecfe8b files/digest-wmmp-0.9.2 62
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 8e6837639c11448044271c7a3403b15e wmmp-0.10.0.ebuild 633
-MD5 690807ac188cd38760a4d8e7bba683c5 wmmp-0.8.0.ebuild 614
-MD5 8f1d2545ea33233322953e73c873634c wmmp-0.9.1.ebuild 622
-MD5 117a1c3996038e478c9c4213f43307b7 wmmp-0.9.2.ebuild 634
+RMD160 b2a89974d9d81d4a9d53e2087cdf0aae406eef8f files/digest-wmmp-0.9.2 62
+SHA256 d1cfd225592460c92479d52419019b15cff5cf0c54dd1ee29006d98072629655 files/digest-wmmp-0.9.2 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFIK60AiZjviIA2XgRAsEDAKDmeDnVat5mTda/sL0G9Mn6uwfOVwCfVL7W
+qGFuDdfI5WXGdS5ZrWAksOk=
+=nTKv
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmmp/wmmp-0.10.0.ebuild b/x11-plugins/wmmp/wmmp-0.10.0.ebuild
index 465c2237eba7..b3f5f1dd6170 100644
--- a/x11-plugins/wmmp/wmmp-0.10.0.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.10.0.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-plugins/wmmp/wmmp-0.10.0.ebuild,v 1.7 2005/10/07 15:43:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmp/wmmp-0.10.0.ebuild,v 1.8 2006/10/02 06:16:13 flameeyes Exp $
 
 IUSE=""
 
@@ -10,7 +10,9 @@ SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
 RESTRICT="nomirror"
 HOMEPAGE="http://www.musicpd.org"
 
-DEPEND="virtual/x11"
+DEPEND="|| (
+		( x11-libs/libXext x11-libs/libXpm )
+		<virtual/x11-7 )"
 
 SLOT="0"
 LICENSE="GPL-2"