From 07fd1d8ecd9a917313e53982a9ed2d24a23be199 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Tue, 31 Jan 2006 21:24:02 +0000 Subject: Fixed DEPEND for modular X. Package-Manager: portage-2.1_pre4-r1 --- x11-plugins/wmtz/ChangeLog | 7 +++++-- x11-plugins/wmtz/wmtz-0.7.ebuild | 14 ++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'x11-plugins/wmtz') diff --git a/x11-plugins/wmtz/ChangeLog b/x11-plugins/wmtz/ChangeLog index 26c2a2e4919d..e05e7066038d 100644 --- a/x11-plugins/wmtz/ChangeLog +++ b/x11-plugins/wmtz/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmtz -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.13 2005/11/13 07:18:42 morfic Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.14 2006/01/31 21:01:53 nelchael Exp $ + + 31 Jan 2006; Krzysiek Pawlik wmtz-0.7.ebuild: + Fixed DEPEND for modular X. 13 Nov 2005; Daniel Goller wmtz-0.7.ebuild: Removing condition for patch, so gcc4 can compile this too diff --git a/x11-plugins/wmtz/wmtz-0.7.ebuild b/x11-plugins/wmtz/wmtz-0.7.ebuild index 8441cae4339e..e6f7cff8dbd4 100644 --- a/x11-plugins/wmtz/wmtz-0.7.ebuild +++ b/x11-plugins/wmtz/wmtz-0.7.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/wmtz/wmtz-0.7.ebuild,v 1.14 2005/11/13 07:18:42 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/wmtz-0.7.ebuild,v 1.15 2006/01/31 21:01:53 nelchael Exp $ inherit eutils toolchain-funcs @@ -13,14 +13,20 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 amd64 ppc ~sparc" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( x11-proto/xextproto virtual/x11 )" src_unpack() { unpack ${A} cd ${S} #apply both patches to compile with gcc-3.4 closing bug #64556 - epatch ${FILESDIR}/wmtz-0.7-gcc34.patch + epatch ${FILESDIR}/wmtz-0.7-gcc34.patch } src_compile() { -- cgit v1.2.3-65-gdbad