diff options
| author |   Karol Wojtaszek <sekretarz@gentoo.org> | 2006-01-03 23:39:49 +0000 |
|---|---|---|
| committer | Karol Wojtaszek <sekretarz@gentoo.org> | 2006-01-03 23:39:49 +0000 |
| commit | 2c2b6f9c795442738a01bba2e9fad8c62f35ac77 (patch) | |
| tree | 732a44cd52582d2bc9e01996b90e6f9cdd3f86cf | |
| parent | need ncurses as well (diff) | |
| download | gentoo-2-2c2b6f9c795442738a01bba2e9fad8c62f35ac77.tar.gz gentoo-2-2c2b6f9c795442738a01bba2e9fad8c62f35ac77.tar.bz2 gentoo-2-2c2b6f9c795442738a01bba2e9fad8c62f35ac77.zip | |
Add modular X dependencies, bug #115591
(Portage version: 2.1_pre3-r1)
| -rw-r--r-- | x11-wm/fvwm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/fvwm/fvwm-2.5.14-r1.ebuild | 20 |
2 files changed, 21 insertions, 6 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index c8e2ec103b14..eb97f60f8113 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/fvwm -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.101 2005/09/21 08:28:01 taviso Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.102 2006/01/03 23:39:49 sekretarz Exp $ + + 04 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> fvwm-2.5.14-r1.ebuild: + Add modular X dependencies, bug #115591 *fvwm-2.5.14 (21 Sep 2005) diff --git a/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild index 7f54305f016b..f834a6d90cd4 100644 --- a/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.14-r1.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-wm/fvwm/fvwm-2.5.14-r1.ebuild,v 1.1 2005/09/21 08:28:01 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.14-r1.ebuild,v 1.2 2006/01/03 23:39:49 sekretarz Exp $ inherit eutils flag-o-matic @@ -30,11 +30,23 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 ) >=dev-lang/perl-5.6.1-r10 >=sys-libs/zlib-1.1.4-r1 sys-apps/debianutils - virtual/x11" + || ( ( + x11-libs/libXpm + x11-libs/libXft + xinerama? ( x11-libs/libXinerama ) ) + virtual/x11 )" # XXX: gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency? # XXX: gtk perl bindings require dev-perl/gtk-perl, worth a dependency? # XXX: netpbm is used by FvwmScript-ScreenDump, worth a dependency? -DEPEND="${RDEPEND} dev-util/pkgconfig !x11-wm/metisse" +DEPEND="${RDEPEND} + dev-util/pkgconfig + !x11-wm/metisse + || ( ( + x11-libs/libXrandr + x11-proto/xextproto + x11-proto/xproto + xinerama? ( x11-proto/xineramaproto ) ) + virtual/x11 )" SFT=${WORKDIR}/FvwmTabs-v3-4 |