diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-24 22:55:40 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-24 22:55:40 +0000 |
| commit | 5fdf6d3f4642d533b9fd429b9b6c39bffc24982d (patch) | |
| tree | a741d42a762b8c1d72a458b18adc438b4eb435a7 | |
| parent | Fixed DEPEND for modular X. (diff) | |
| download | gentoo-2-5fdf6d3f4642d533b9fd429b9b6c39bffc24982d.tar.gz gentoo-2-5fdf6d3f4642d533b9fd429b9b6c39bffc24982d.tar.bz2 gentoo-2-5fdf6d3f4642d533b9fd429b9b6c39bffc24982d.zip | |
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
| -rw-r--r-- | x11-plugins/wmcp/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/wmcp/wmcp-1.2.8.ebuild | 16 | ||||
| -rw-r--r-- | x11-plugins/wmcpuload/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild | 13 |
4 files changed, 32 insertions, 11 deletions
diff --git a/x11-plugins/wmcp/ChangeLog b/x11-plugins/wmcp/ChangeLog index 3ecfecebfb9f..5e4dbedc3c8f 100644 --- a/x11-plugins/wmcp/ChangeLog +++ b/x11-plugins/wmcp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmcp -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.9 2005/04/01 19:19:33 agriffis Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.10 2006/01/24 22:53:18 nelchael Exp $ + + 24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmcp-1.2.8.ebuild: + Fixed DEPEND for modular X. 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> wmcp-1.2.8.ebuild: stable on ia64 diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild index 2e1571da13e8..b4ddb522b52f 100644 --- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild +++ b/x11-plugins/wmcp/wmcp-1.2.8.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/wmcp/wmcp-1.2.8.ebuild,v 1.13 2005/04/01 19:19:33 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.14 2006/01/24 22:53:18 nelchael Exp $ inherit eutils @@ -12,8 +12,16 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 amd64 ia64 ppc ~sparc alpha hppa ~mips" -DEPEND="virtual/libc - virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xproto + x11-proto/xextproto ) + virtual/x11 )" src_unpack() { unpack ${A} diff --git a/x11-plugins/wmcpuload/ChangeLog b/x11-plugins/wmcpuload/ChangeLog index cd124cdb66ca..2676aeee3eea 100644 --- a/x11-plugins/wmcpuload/ChangeLog +++ b/x11-plugins/wmcpuload/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmcpuload -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/ChangeLog,v 1.19 2005/11/10 08:52:59 s4t4n Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/ChangeLog,v 1.20 2006/01/24 22:55:40 nelchael Exp $ + + 24 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmcpuload-1.0.1.ebuild: + Fixed DEPEND for modular X. 10 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcpuload-1.0.1.ebuild: Removed INSTALL from dodoc. diff --git a/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild index 9f8bfcbb1f61..9dd4a4b368e9 100644 --- a/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild +++ b/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild @@ -1,13 +1,20 @@ -# 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/wmcpuload/wmcpuload-1.0.1.ebuild,v 1.14 2005/11/10 08:52:59 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcpuload/wmcpuload-1.0.1.ebuild,v 1.15 2006/01/24 22:55:40 nelchael Exp $ IUSE="" DESCRIPTION="WMCPULoad is a program to monitor CPU usage." HOMEPAGE="http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml" SRC_URI="http://www.sh.rim.or.jp/~ssato/src/${P}.tar.bz2" -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 )" SLOT="0" LICENSE="GPL-2" |