tweaks

3 files changed, 32 insertions, 16 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index ddc20eef1afc..2b7bb2f15c28 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.31 2003/09/15 14:23:25 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.32 2003/09/17 11:55:25 taviso Exp $
+
+  17 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
+  apparently noxpm and nosm are confusing, removing them from IUSE.
+  only fix Xft detection if USE="truetype"
+  changin some of the informational messages to use ebegin/eend.
+  print out a message indicatind imlib/gtk errors are normal if USE="-gtk -imlib"
 
   15 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r1.ebuild,
   fvwm-2.5.7.ebuild:
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 0e1511d41dce..5b16fb62ef00 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,7 +1,7 @@
-MD5 dbe623b8efe5e32eae5e2a42abfcb227 fvwm-2.5.7-r2.ebuild 8178
+MD5 4a6f5d57d38a950c2043fb67e9099016 fvwm-2.5.7-r2.ebuild 8612
 MD5 d751280d0c04415e343dc8290536eb01 fvwm-2.4.16-r1.ebuild 4006
 MD5 5b6363450ad810f8ee1cdafb487a1189 fvwm-2.4.16.ebuild 1335
-MD5 ee4f94004372c549002dfa33cbbf0a86 ChangeLog 6126
+MD5 3ee755cff85a1d5bf2d53c1b5ff673d0 ChangeLog 6456
 MD5 beaa1ad08ff661a32c25d1a51c879a8d metadata.xml 450
 MD5 ccd8378d86941cb17669e64ca88949c1 fvwm-2.4.8.ebuild 1146
 MD5 40725b9b9496d374f5f1a763618781ea files/digest-fvwm-2.4.16 65
diff --git a/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild
index 1faa3feae629..cdc3f53a5d45 100644
--- a/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.7-r2.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-r2.ebuild,v 1.13 2003/09/14 10:13:53 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.7-r2.ebuild,v 1.14 2003/09/17 11:55:25 taviso Exp $
 
 inherit gnuconfig
 
-IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama cjk perl nls png bidi imlib tcltk debug gtk2 noxpm nosm"
+IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama cjk perl nls png bidi imlib tcltk debug gtk2"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
@@ -84,10 +84,14 @@ src_compile() {
 
 	# fvwm configure doesnt provide a way to disable gtk support if the
 	# required libraries are found, this hides them from the script.
+	# Print a message indicating the errors are normal.
 	if ! use gtk; then
+		einfo "ATTN: You can safely ignore any gtk related configure errors."
+		einfo "ATTN: You can safely ignore any imlib related configure errors."
 		myconf="${myconf} --with-gtk-prefix=${T} --with-imlib-prefix=${T}"
 	else
 		if ! use imlib; then
+			einfo "ATTN: You can safely ignore any imlib related configure errors."
 			myconf="${myconf} --with-imlib-prefix=${T}"
 		fi
 	fi
@@ -178,16 +182,20 @@ src_compile() {
 
 	# Xft detection is broken in this release, the fix is in cvs
 	# which ive installed here, rerun automake to sort the problem.
-	einfo "Fixing Xft detection, please wait..."
-	(	einfo "	Running aclocal..."
-		aclocal
-		einfo "	Running autoheader..."
-		autoheader
-		einfo "	Running automake..."
-		automake --add-missing
-		einfo "	Running autoreconf..."
-		autoreconf ) 2>/dev/null
-	einfo "Fixed."
+	# This is only nescessary if `truetype` is required.
+	if use truetype; then
+		echo
+		einfo "Fixing Xft detection, please wait..."
+		(	ebegin "	Running aclocal"
+			aclocal; eend $?
+			ebegin "	Running autoheader"
+			autoheader; eend $?
+			ebegin "	Running automake"
+			automake --add-missing; eend $?
+			ebegin "	Running autoreconf"
+			autoreconf; eend $?	) 2>/dev/null
+		einfo "Fixed."
+	fi
 
 	# must specify PKG_CONFIG or Xft detection bombs.
 	econf ${myconf} PKG_CONFIG=/usr/bin/pkg-config || die
@@ -256,6 +264,7 @@ src_install() {
 	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
 	docs/fvwm.lsm
 
+	# fix a couple of symlinks.
 	prepallman
 }
 
@@ -264,9 +273,10 @@ pkg_postinst() {
 		if use tcltk; then
 			einfo "By setting the perl and tcltk USE flags, you have elected to"
 			einfo "install the FvwmTabs module, a configurable tabbing system"
-			einfo "for FVWM, you can read more about it here"
+			einfo "for FVWM. You can read more about FvwmTabs here:"
 			einfo
 			einfo "	http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
+			einfo
 		fi
 	fi
 }