diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-24 23:22:38 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-24 23:22:38 +0000 |
| commit | 537e54a231f51e30066545c1d13ddffa99812de6 (patch) | |
| tree | fdd9cec450d89eac8361c9c504aa2657fb712fca /x11-plugins/wmfsm | |
| parent | stable on amd64 wrt bug 114587 (diff) | |
| download | gentoo-2-537e54a231f51e30066545c1d13ddffa99812de6.tar.gz gentoo-2-537e54a231f51e30066545c1d13ddffa99812de6.tar.bz2 gentoo-2-537e54a231f51e30066545c1d13ddffa99812de6.zip | |
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-plugins/wmfsm')
| -rw-r--r-- | x11-plugins/wmfsm/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmfsm/files/digest-wmfsm-0.34 | 1 | ||||
| -rw-r--r-- | x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild | 18 | ||||
| -rw-r--r-- | x11-plugins/wmfsm/wmfsm-0.34.ebuild | 28 |
4 files changed, 20 insertions, 35 deletions
diff --git a/x11-plugins/wmfsm/ChangeLog b/x11-plugins/wmfsm/ChangeLog index 5d112fa30981..50cb93ea65ef 100644 --- a/x11-plugins/wmfsm/ChangeLog +++ b/x11-plugins/wmfsm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmfsm -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.8 2004/10/19 08:55:06 absinthe Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/ChangeLog,v 1.9 2006/01/24 23:19:25 nelchael Exp $ + + 24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmfsm-0.34.ebuild, + wmfsm-0.34-r1.ebuild: + Fixed DEPEND for modular X. 19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> wmfsm-0.34-r1.ebuild: Stable on amd64. diff --git a/x11-plugins/wmfsm/files/digest-wmfsm-0.34 b/x11-plugins/wmfsm/files/digest-wmfsm-0.34 deleted file mode 100644 index da68c8549153..000000000000 --- a/x11-plugins/wmfsm/files/digest-wmfsm-0.34 +++ /dev/null @@ -1 +0,0 @@ -MD5 5ec81127146d8340a698cc5e26a66e43 wmfsm-0.34.tar.gz 105220 diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild index fc0360b6eb05..f7207edeaebe 100644 --- a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild +++ b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild @@ -1,6 +1,6 @@ -# 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/wmfsm/wmfsm-0.34-r1.ebuild,v 1.4 2004/10/19 08:55:06 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild,v 1.5 2006/01/24 23:19:25 nelchael Exp $ inherit eutils @@ -13,13 +13,23 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ~sparc amd64 ppc" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xproto + x11-proto/xextproto ) + virtual/x11 )" src_unpack() { unpack ${A} cd ${S}/wmfsm - #einfo "Applying patch to hide virtual filesystems..." + #einfo "Applying patch to hide virtual filesystems..." epatch ${FILESDIR}/${P}.linux-fs.patch #patch -p0 < ${FILES}/${P}.linux-fs.diff diff --git a/x11-plugins/wmfsm/wmfsm-0.34.ebuild b/x11-plugins/wmfsm/wmfsm-0.34.ebuild deleted file mode 100644 index 482d380bf5e6..000000000000 --- a/x11-plugins/wmfsm/wmfsm-0.34.ebuild +++ /dev/null @@ -1,28 +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/wmfsm/wmfsm-0.34.ebuild,v 1.9 2004/07/17 11:03:34 s4t4n Exp $ - -IUSE="" -DESCRIPTION="dockapp for monitoring filesystem usage" -HOMEPAGE="http://www.cs.ubc.ca/~cmg/" -SRC_URI="http://www.cs.ubc.ca/~cmg/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~sparc amd64 ppc" - -DEPEND="virtual/x11" - -src_compile() { - - econf || die "configure failed" - - emake || die "parallel make failed" - -} - -src_install() { - - einstall || die "make install failed" - -} |