modernise some of the configuration

Package-Manager: portage-2.0.51.22-r3

3 files changed, 18 insertions, 58 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 570906ff7d3e..1c7fb3069953 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.116 2006/10/19 22:06:14 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.117 2006/10/20 16:12:20 taviso Exp $
+
+  20 Oct 2006; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.18.ebuild:
+  modernise some of the configuration.
 
 *fvwm-2.5.18 (19 Oct 2006)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 858503d85389..ef048ce547fb 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,6 +1,6 @@
 MD5 567f2456b8b933cc6971ff7731935a50 fvwm-2.5.16.ebuild 6159
-MD5 f819efc3c9ca2f4dec68977eb702e84d fvwm-2.5.18.ebuild 6165
-MD5 27d098d6c46d28e76190efca9a952603 ChangeLog 19480
+MD5 f439e22a4066563d80b95c6a63864b00 fvwm-2.5.18.ebuild 5463
+MD5 a984ae04697d4a7a03670f2faae5dcc0 ChangeLog 19589
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
 MD5 293a9b01b3bbdfc741ac4a6fe86d3a21 files/digest-fvwm-2.5.16 527
diff --git a/x11-wm/fvwm/fvwm-2.5.18.ebuild b/x11-wm/fvwm/fvwm-2.5.18.ebuild
index 0c1365c4443f..d6191add0bfa 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.1 2006/10/19 22:06:14 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18.ebuild,v 1.2 2006/10/20 16:12:20 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -62,7 +62,6 @@ src_unpack() {
 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"
@@ -81,65 +80,23 @@ src_compile() {
 		myconf="${myconf} --without-gnome"
 	fi
 
-	if ! use rplay; then
-		myconf="${myconf} --without-rplay-library"
-	fi
-
-	# Install perl bindings.
-	if use perl; then
-		myconf="${myconf} --enable-perllib"
-	else
-		myconf="${myconf} --disable-perllib"
-	fi
-
-	if use xinerama; then
-		myconf="${myconf} --enable-xinerama"
-	else
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	# bidirectional writing support
-	if use bidi; then
-		myconf="${myconf} --enable-bidi"
-	else
-		myconf="${myconf} --disable-bidi"
-	fi
-
-	# png image support
-	if ! use png; then
-		myconf="${myconf} --without-png-library"
-	fi
-
-	# native language support
-	if use nls; then
-		myconf="${myconf} --enable-nls --enable-iconv"
-	else
-		myconf="${myconf} --disable-nls --disable-iconv"
-	fi
-
-	# support for mouse gestures using libstroke (very very cool)
-	if ! use stroke; then
-		myconf="${myconf} --without-stroke-library"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --enable-debug-msgs --enable-command-log"
-	fi
-
-	# Xft Anti Aliased text support
-	if use truetype; then
-		myconf="${myconf} --enable-xft"
-	else
-		myconf="${myconf} --disable-xft"
-	fi
-
 	# set the local maintainer for fvwm-bug.
 	export FVWM_BUGADDR="taviso@gentoo.org"
 
 	# reccommended by upstream
 	append-flags -fno-strict-aliasing
 
-	econf ${myconf} || die
+	econf ${myconf} `use_enable truetype xft` \
+					`use_with stroke stroke-library` \
+					`use_enable nls` \
+					`use_enable nls iconv` \
+					`use_enable png png-library` \
+					`use_enable bidi` \
+					`use_enable xinerama` \
+					`use_enable debug debug-msgs` \
+					`use_enable debug command-log` \
+					`use_enable perl perllib` \
+					`use_with rplay rplay-library` || die
 	emake || die
 }