diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-02-02 16:33:13 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-02-02 16:33:13 +0000 |
| commit | 08219c1dad8951b8bef4139a62f02fd309bff7ff (patch) | |
| tree | 36594b1e3d61fffac6bb43c16e84c915d1c63779 /x11-plugins | |
| parent | Fixed DEPEND for modular X. (diff) | |
| download | gentoo-2-08219c1dad8951b8bef4139a62f02fd309bff7ff.tar.gz gentoo-2-08219c1dad8951b8bef4139a62f02fd309bff7ff.tar.bz2 gentoo-2-08219c1dad8951b8bef4139a62f02fd309bff7ff.zip | |
Fixed DEPEND for modular X.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmmsens/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/wmmsens/wmmsens-0.29.6.ebuild | 14 | ||||
| -rw-r--r-- | x11-plugins/wmsensormon/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild | 13 |
4 files changed, 32 insertions, 10 deletions
diff --git a/x11-plugins/wmmsens/ChangeLog b/x11-plugins/wmmsens/ChangeLog index 4dc86032067d..4346f1d45d9a 100644 --- a/x11-plugins/wmmsens/ChangeLog +++ b/x11-plugins/wmmsens/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmmsens -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.5 2005/11/11 09:34:27 s4t4n Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.6 2006/02/02 16:30:52 nelchael Exp $ + + 02 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmsens-0.29.6.ebuild: + Fixed DEPEND for modular X. 11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmsens-0.29.6.ebuild: removed Artistic and INSTALL from dodoc. diff --git a/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild b/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild index 5e9c51d2aa0d..90da02440606 100644 --- a/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild +++ b/x11-plugins/wmmsens/wmmsens-0.29.6.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/wmmsens/wmmsens-0.29.6.ebuild,v 1.4 2005/11/11 09:34:27 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/wmmsens-0.29.6.ebuild,v 1.5 2006/02/02 16:30:52 nelchael Exp $ inherit eutils @@ -11,9 +11,17 @@ SRC_URI="http://www.digressed.net/wmmsens/src//${P/_/-}.tar.gz" SLOT="0" LICENSE="Artistic" KEYWORDS="x86 ~amd64" -DEPEND="virtual/x11" IUSE="" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( x11-proto/xextproto virtual/x11 ) + sys-apps/lm_sensors" + src_compile() { cd src # remove depends at end of Makefile that cause problems diff --git a/x11-plugins/wmsensormon/ChangeLog b/x11-plugins/wmsensormon/ChangeLog index 64bc8b9f8f5e..33020c736ee9 100644 --- a/x11-plugins/wmsensormon/ChangeLog +++ b/x11-plugins/wmsensormon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmsensormon -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/ChangeLog,v 1.15 2005/11/11 10:35:04 s4t4n Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/ChangeLog,v 1.16 2006/02/02 16:33:13 nelchael Exp $ + + 02 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> + wmsensormon-1.2.1.ebuild: + Fixed DEPEND for modular X. 11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmsensormon-1.2.1.ebuild: removed COPYING and INSTALL from dodoc. diff --git a/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild b/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild index 791e0ea39006..ec0bab7f271b 100644 --- a/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild +++ b/x11-plugins/wmsensormon/wmsensormon-1.2.1.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/wmsensormon/wmsensormon-1.2.1.ebuild,v 1.5 2005/11/11 10:35:04 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsensormon/wmsensormon-1.2.1.ebuild,v 1.6 2006/02/02 16:33:13 nelchael Exp $ IUSE="" S=${WORKDIR}/${P/_/-}/${PN} @@ -10,7 +10,14 @@ HOMEPAGE="http://wmsensormon.sourceforge.net" SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 amd64" -DEPEND="virtual/x11 + +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( x11-proto/xextproto virtual/x11 ) >=sys-apps/lm_sensors-2.8.7" src_compile() { |