diff options
| -rw-r--r-- | x11-wm/fvwm/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm/fvwm-2.5.7.ebuild | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 2ab3008e4ec0..32c049da1951 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,6 +1,6 @@ MD5 616d23339ff772ad286c142eee37efc8 fvwm-2.4.15.ebuild 1167 MD5 640cc8cf1c7b29a974fed717d4460794 fvwm-2.4.14.ebuild 1102 -MD5 44c4004e21f482dd64d9c278fca4beac fvwm-2.5.7.ebuild 2676 +MD5 63885b5a240416b532da7d9e9a8fdaa4 fvwm-2.5.7.ebuild 2745 MD5 9b68cbbbdaba95b23665ea98c695e57d fvwm-2.4.16.ebuild 1334 MD5 7ffeb822c0eea195632cc4c2b7aa232b ChangeLog 2904 MD5 beaa1ad08ff661a32c25d1a51c879a8d metadata.xml 450 diff --git a/x11-wm/fvwm/fvwm-2.5.7.ebuild b/x11-wm/fvwm/fvwm-2.5.7.ebuild index a952dbc02413..80eb201f627f 100644 --- a/x11-wm/fvwm/fvwm-2.5.7.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.7.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.7.ebuild,v 1.6 2003/07/30 22:06:01 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.7.ebuild,v 1.7 2003/07/30 22:28:10 taviso Exp $ inherit gnuconfig -IUSE="readline gtk gnome oss xinerama cjk perl nls png" +IUSE="readline gtk gnome rplay xinerama cjk perl nls png" S=${WORKDIR}/${P} DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager" @@ -18,9 +18,9 @@ LICENSE="GPL-2 FVWM" RDEPEND="readline? ( >=sys-libs/readline-4.1 ) gtk? ( =x11-libs/gtk+-1.2* ) gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) - oss? ( media-sound/rplay ) + rplay? ( media-sound/rplay ) perl? ( dev-lang/perl ) - cjk? ( >=dev-libs/fribidi-0.10.4 ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) png? ( media-libs/libpng ) >=dev-libs/libstroke-0.4 media-libs/fontconfig @@ -49,13 +49,13 @@ src_compile() { || myconf="${myconf} --without-readline-library" use gtk \ - || myconf="${myconf} --with-gtk-prefix=/no/dir --with-imlib-prefix=/no/dir" + || myconf="${myconf} --with-gtk-prefix=/var/empty --with-imlib-prefix=/var/empty" use gnome \ && myconf="${myconf} --with-gnome" \ || myconf="${myconf} --without-gnome" - use oss \ + use rplay \ || myconf="${myconf} --without-rplay-library" use perl \ @@ -67,8 +67,12 @@ src_compile() { || myconf="${myconf} --disable-xinerama" use cjk \ - && myconf="${myconf} --enable-multibyte --enable-bidi" \ - || myconf="${myconf} --disable-multibyte --disable-bidi" + && myconf="${myconf} --enable-multibyte" \ + || myconf="${myconf} --disable-multibyte" + + use bidi \ + && myconf="${myconf} --enable-bidi" \ + || myconf="${myconf} --disable-bidi" use png \ || myconf="${myconf} --without-png-library" @@ -88,7 +92,7 @@ src_compile() { autoreconf ) 2>/dev/null einfo "Fixed." - econf ${myconf} PKG_CONFIG=${ROOT}/usr/bin/pkg-config || die + econf ${myconf} PKG_CONFIG=/usr/bin/pkg-config || die emake || die } |