summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2006-10-20 21:10:27 +0000
committerTavis Ormandy <taviso@gentoo.org>2006-10-20 21:10:27 +0000
commit271b457228806951f25683fc4401106ef59b198f (patch)
treec5d8eca989742139689737653de8ebea81eb013c /x11-wm/fvwm
parentMarking sparc stable (diff)
downloadhistorical-271b457228806951f25683fc4401106ef59b198f.tar.gz
historical-271b457228806951f25683fc4401106ef59b198f.tar.bz2
historical-271b457228806951f25683fc4401106ef59b198f.zip
tidy up deps
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'x11-wm/fvwm')
-rw-r--r--x11-wm/fvwm/Manifest2
-rw-r--r--x11-wm/fvwm/fvwm-2.5.18.ebuild35
2 files changed, 18 insertions, 19 deletions
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index ef048ce547fb..37bd0ef82c7d 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,5 +1,5 @@
MD5 567f2456b8b933cc6971ff7731935a50 fvwm-2.5.16.ebuild 6159
-MD5 f439e22a4066563d80b95c6a63864b00 fvwm-2.5.18.ebuild 5463
+MD5 1b11d7c1d4325e8aeefa099f0540ee27 fvwm-2.5.18.ebuild 5296
MD5 a984ae04697d4a7a03670f2faae5dcc0 ChangeLog 19589
MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
diff --git a/x11-wm/fvwm/fvwm-2.5.18.ebuild b/x11-wm/fvwm/fvwm-2.5.18.ebuild
index d6191add0bfa..e58241a3e7b0 100644
--- a/x11-wm/fvwm/fvwm-2.5.18.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.18.ebuild
@@ -1,6 +1,6 @@
# 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.18.ebuild,v 1.2 2006/10/20 16:12:20 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18.ebuild,v 1.3 2006/10/20 21:10:27 taviso Exp $
inherit eutils flag-o-matic
@@ -13,20 +13,20 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="bidi debug gtk imlib nls perl png readline rplay stroke tk truetype xinerama"
-RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
+RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
gtk? ( =x11-libs/gtk+-1.2*
- imlib? ( >=media-libs/gdk-pixbuf-0.21.0
- >=media-libs/imlib-1.9.14-r1 ) )
- rplay? ( >=media-sound/rplay-3.3.2 )
- bidi? ( >=dev-libs/fribidi-0.10.4 )
- png? ( >=media-libs/libpng-1.0.12-r2 )
- stroke? ( >=dev-libs/libstroke-0.4 )
- perl? ( tk? ( >=dev-lang/tk-8.3.4
- >=dev-perl/perl-tk-800.024-r2
- >=dev-perl/X11-Protocol-0.52 ) )
- truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 )
- >=dev-lang/perl-5.6.1-r10
- >=sys-libs/zlib-1.1.4-r1
+ imlib? ( media-libs/gdk-pixbuf
+ media-libs/imlib ) )
+ rplay? ( media-sound/rplay )
+ bidi? ( dev-libs/fribidi )
+ png? ( media-libs/libpng )
+ stroke? ( dev-libs/libstroke )
+ perl? ( tk? ( dev-lang/tk
+ dev-perl/perl-tk
+ dev-perl/X11-Protocol ) )
+ truetype? ( virtual/xft media-libs/fontconfig )
+ dev-lang/perl
+ sys-libs/zlib
sys-apps/debianutils
|| ( (
x11-libs/libXpm
@@ -63,10 +63,8 @@ src_compile() {
local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
# use readline in FvwmConsole.
- if ! use readline; then
- myconf="${myconf} --without-readline-library"
- else
- myconf="${myconf} --with-readline-library --without-termcap-library"
+ if use readline; then
+ myconf="${myconf} --without-termcap-library"
fi
# FvwmGtk can be built as a gnome application, or a Gtk+ application.
@@ -96,6 +94,7 @@ src_compile() {
`use_enable debug debug-msgs` \
`use_enable debug command-log` \
`use_enable perl perllib` \
+ `use_with readline readline-library` \
`use_with rplay rplay-library` || die
emake || die
}