Fixed DEPEND for modular X, see bug #118297.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 24 insertions, 22 deletions

diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 8b405e9166ea..1809f88a2e60 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmacpi
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.17 2005/08/29 08:01:23 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.18 2006/01/15 14:31:56 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmacpi-1.34.ebuild,
+  wmacpi-1.99_p7.ebuild, wmacpi-2.1_rc1.ebuild:
+  Fixed DEPEND for modular X, see bug #118297.
 
   29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmacpi-2.1_rc1.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 7b336816cf43..ae658d525710 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,12 +1,12 @@
-MD5 e74f19ab68ac22ac3ff8c7b2eeb76a72 wmacpi-1.99_p7.ebuild 863
-MD5 ca080e792adfe63f79517fad382a6ca5 wmacpi-1.34.ebuild 950
-MD5 6e19d7f0dc112ed9ce422c8b88b192fc wmacpi-2.1_rc1.ebuild 988
-MD5 5b738a88b8852b67eaeaeb76b3071b80 ChangeLog 2202
-MD5 4719e916cabe20df559a3e88d5f4722a metadata.xml 250
-MD5 700b8b4a46daa2ccab0929b285f36019 files/2.1rc1-windowed.patch 918
-MD5 551fb5d3e01599cf89e3670d19000ff8 files/digest-wmacpi-2.1_rc1 65
-MD5 965b453bc3b6385a827d50c8cc05af3f files/digest-wmacpi-1.34 62
-MD5 419ea648d99ea0f0f1ce6fe742df1cab files/1.34-apm.patch 466
+MD5 e1c910276fb47a839a2bfc1aa179d5aa ChangeLog 2374
 MD5 e5a0e14c3f7c1b1fd21560657bb64e88 files/1.34-acpi.patch 469
+MD5 419ea648d99ea0f0f1ce6fe742df1cab files/1.34-apm.patch 466
 MD5 a4e62d6f61f4a5d669dadf8d1a604c04 files/2.1rc1-nodeps.patch 544
+MD5 700b8b4a46daa2ccab0929b285f36019 files/2.1rc1-windowed.patch 918
+MD5 965b453bc3b6385a827d50c8cc05af3f files/digest-wmacpi-1.34 62
 MD5 3ced18da6e5bf0b6a8113eb56cb0f0cb files/digest-wmacpi-1.99_p7 65
+MD5 551fb5d3e01599cf89e3670d19000ff8 files/digest-wmacpi-2.1_rc1 65
+MD5 4719e916cabe20df559a3e88d5f4722a metadata.xml 250
+MD5 accb2569cd508736289f768562bd5b0e wmacpi-1.34.ebuild 961
+MD5 3ad51c4c32569ce772a38d290c8268f5 wmacpi-1.99_p7.ebuild 842
+MD5 5a1c41647bef3fcaad65fef428749848 wmacpi-2.1_rc1.ebuild 970
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
index 9a5bcb6b7674..7b8f6cdf4ca7 100644
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.34.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/wmacpi/wmacpi-1.34.ebuild,v 1.12 2005/01/25 09:32:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.34.ebuild,v 1.13 2006/01/15 14:31:56 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 -sparc amd64 ppc"
 
-DEPEND="virtual/x11"
+DEPEND="x11-libs/libdockapp"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild b/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
index 95fc9c8940c7..c00c1b1ee6dd 100644
--- a/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-1.99_p7.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/wmacpi/wmacpi-1.99_p7.ebuild,v 1.5 2005/01/25 09:32:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-1.99_p7.ebuild,v 1.6 2006/01/15 14:31:56 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
@@ -14,8 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 -sparc amd64 -ppc"
 
-DEPEND="virtual/x11
-	>=x11-libs/libdockapp-0.4.0-r1"
+DEPEND="x11-libs/libdockapp"
 
 src_compile()
 {
diff --git a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
index 0329d7e6dd93..a91694bb830a 100644
--- a/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.1_rc1.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/wmacpi/wmacpi-2.1_rc1.ebuild,v 1.2 2005/08/29 08:01:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-2.1_rc1.ebuild,v 1.3 2006/01/15 14:31:56 nelchael Exp $
 
 inherit eutils
 
@@ -16,8 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 -sparc ~amd64 -ppc"
 
-DEPEND="virtual/x11
-	>=x11-libs/libdockapp-0.5.0"
+DEPEND="x11-libs/libdockapp"
 
 src_unpack()
 {