summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-22 13:33:36 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-22 13:33:36 +0000
commitf32a663cb5e0bd9630c8dccdad93f55425428a74 (patch)
tree3e6842af5ef92827e1b5d5d0917865b75edd539a /x11-plugins
parentChange PHP virtual for the profiles that keyword dev-lang/php (diff)
downloadgentoo-2-f32a663cb5e0bd9630c8dccdad93f55425428a74.tar.gz
gentoo-2-f32a663cb5e0bd9630c8dccdad93f55425428a74.tar.bz2
gentoo-2-f32a663cb5e0bd9630c8dccdad93f55425428a74.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmappl/ChangeLog8
-rw-r--r--x11-plugins/wmappl/files/digest-wmappl-0.61
-rw-r--r--x11-plugins/wmappl/wmappl-0.6.ebuild25
-rw-r--r--x11-plugins/wmappl/wmappl-0.71.ebuild13
4 files changed, 16 insertions, 31 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/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"