Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 19 insertions, 36 deletions

diff --git a/x11-plugins/wmappl/ChangeLog b/x11-plugins/wmappl/ChangeLog
index 6bc071b7a738..5b7c43154e68 100644
--- a/x11-plugins/wmappl/ChangeLog
+++ b/x11-plugins/wmappl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmappl
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.11 2004/11/01 20:36:38 gustavoz Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/ChangeLog,v 1.12 2006/01/22 13:33:36 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmappl-0.6.ebuild,
+  wmappl-0.71.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> wmappl-0.71.ebuild:
   Stable on sparc
diff --git a/x11-plugins/wmappl/Manifest b/x11-plugins/wmappl/Manifest
index 39ac1e70025b..0e9a72e8ab3c 100644
--- a/x11-plugins/wmappl/Manifest
+++ b/x11-plugins/wmappl/Manifest
@@ -1,6 +1,4 @@
-MD5 4b02a494af2bc41a69bdc2e69564ba30 ChangeLog 1113
-MD5 0cdefdcc4ebef736b8b772a784fc98bb wmappl-0.6.ebuild 628
-MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 4c2d6049d3439e5551899708d5d8569d wmappl-0.71.ebuild 619
-MD5 b1bfea200d93b4e65c9b72a331cb6479 files/digest-wmappl-0.6 61
+MD5 1c1ac7965d355c2624fed27a513277ec ChangeLog 1239
 MD5 163988dcd976c5d903e52cb87aaa5891 files/digest-wmappl-0.71 63
+MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
+MD5 c10800a35c83511768e8c878f4040f68 wmappl-0.71.ebuild 764
diff --git a/x11-plugins/wmappl/files/digest-wmappl-0.6 b/x11-plugins/wmappl/files/digest-wmappl-0.6
deleted file mode 100644
index 98d4d1190544..000000000000
--- a/x11-plugins/wmappl/files/digest-wmappl-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2625c90fe837cdacec93876e3cbc11b2 wmappl-0.6.tar.gz 44747
diff --git a/x11-plugins/wmappl/wmappl-0.6.ebuild b/x11-plugins/wmappl/wmappl-0.6.ebuild
deleted file mode 100644
index 9706683d6521..000000000000
--- a/x11-plugins/wmappl/wmappl-0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.6.ebuild,v 1.9 2004/08/23 19:52:19 s4t4n Exp $
-
-IUSE=""
-DESCRIPTION="Simple application launcher for the Window Maker dock."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://wmappl.sourceforge.net/"
-
-DEPEND="virtual/x11"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc"
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	dobin wmappl
-	dodoc README LICENSE CHANGELOG sample.wmapplrc
-	insinto /usr/share/icons/wmappl
-	doins icons/*
-}
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild b/x11-plugins/wmappl/wmappl-0.71.ebuild
index 73de1223ee2f..819e423387a3 100644
--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71.ebuild
@@ -1,13 +1,20 @@
-# Copyright 1999-2004 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/wmappl/wmappl-0.71.ebuild,v 1.5 2004/11/01 20:36:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmappl/wmappl-0.71.ebuild,v 1.6 2006/01/22 13:33:36 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="Simple application launcher for the Window Maker dock."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://wmappl.sourceforge.net/"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 LICENSE="GPL-2"
 SLOT="0"