unset DISPLAY so the build will not try to check display resolution causing access violations bug 87326. Also cleaned up src_compile quite a bit. As usual thanks to Nathan.

(Portage version: 2.0.51.19)

3 files changed, 34 insertions, 49 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 003158b887b2..3a9dd153252b 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.31 2005/03/30 20:29:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.32 2005/03/31 17:27:09 ka0ttic Exp $
+
+  31 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.00.04.ebuild:
+  unset DISPLAY so the build will not try to check display resolution causing
+  access violations bug 87326. Also cleaned up src_compile quite a bit. As
+  usual thanks to Nathan.
 
   30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   afterstep-2.00.02.ebuild:
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 6db3a1189ac9..f541e974869e 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 abf480f613adb992d772d54d62a8e256 ChangeLog 4818
 MD5 61ac082c6563be2e5790a287988a4674 afterstep-1.8.11-r2.ebuild 1543
-MD5 fca9d0ef8f9ab0142654d2cf85544310 afterstep-2.00.01.ebuild 3673
-MD5 5fcb6c5011c265ab4d4268662ee0dac9 metadata.xml 353
-MD5 9b9b86bbaa1a7a3f3271ce04188628d4 afterstep-2.00.04.ebuild 3693
 MD5 ee92461f26ba5338a6a1333c1e5f14a1 afterstep-2.00.02.ebuild 3692
+MD5 b00a3a493ff41d70b515d4b0e3d23d95 afterstep-2.00.04.ebuild 3359
+MD5 540cc54b610c66aa3a9bbe2721bd8b9f ChangeLog 5073
+MD5 5fcb6c5011c265ab4d4268662ee0dac9 metadata.xml 353
+MD5 fca9d0ef8f9ab0142654d2cf85544310 afterstep-2.00.01.ebuild 3673
+MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
+MD5 776a43b6b57674eb3b1ec1f026707be5 files/as2-gnome-r1.diff 1802
 MD5 720723e9a9846b9d6a7e64a25b1adbbc files/afterstep 29
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.11-gentoo.diff 1321
-MD5 776a43b6b57674eb3b1ec1f026707be5 files/as2-gnome-r1.diff 1802
-MD5 9dfd9962d8a60e264920c6d4e742d74c files/as2-gnome.diff 1524
-MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
-MD5 3b881a3589ee178d1ae956067a4ff6d0 files/digest-afterstep-2.00.04 71
 MD5 1e30a65a7a4daf379a4159eb28ac2d0f files/afterstep-2.00.01-fix-makefile.diff 656
 MD5 68d5b5bcaa6c2e3102dbde6b1314326e files/digest-afterstep-2.00.01 71
 MD5 ddd133fa16578493d349b8cdaa531986 files/digest-afterstep-2.00.02 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCSwxMKRy60XGEcJIRAtv/AJ9qYezVyWclmNSk2Pu5tO6Z1mOJ8ACeN5Ef
-e7P8tbzJddZdEgRrNO7peis=
-=8qm8
------END PGP SIGNATURE-----
+MD5 3b881a3589ee178d1ae956067a4ff6d0 files/digest-afterstep-2.00.04 71
+MD5 9dfd9962d8a60e264920c6d4e742d74c files/as2-gnome.diff 1524
diff --git a/x11-wm/afterstep/afterstep-2.00.04.ebuild b/x11-wm/afterstep/afterstep-2.00.04.ebuild
index 38cd1377d189..f3b6c2773ae1 100644
--- a/x11-wm/afterstep/afterstep-2.00.04.ebuild
+++ b/x11-wm/afterstep/afterstep-2.00.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.04.ebuild,v 1.2 2005/03/30 17:35:06 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.04.ebuild,v 1.3 2005/03/31 17:27:10 ka0ttic Exp $
 
 inherit flag-o-matic
 
@@ -15,6 +15,8 @@ IUSE="debug gif jpeg mmx nls png tiff truetype xinerama"
 
 DEPEND="virtual/libc
 	virtual/x11
+	media-libs/freetype
+	debug? ( !ppc? ( dev-util/efence ) )
 	png? ( >=media-libs/libpng-1.2.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
@@ -25,39 +27,16 @@ S="${WORKDIR}/AfterStep-${PV}"
 src_compile() {
 	local myconf
 
-	use nls && myconf="--enable-i18n" \
-		|| myconf="--enable-i18n=no"
-
-	use png && myconf="${myconf} --with-png" \
-		|| myconf="${myconf} --with-png=no"
-
-	use jpeg && myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --with-jpeg=no"
-
-	use gif && myconf="${myconf} --with-gif" \
-		|| myconf="${myconf} --with-gif=no"
-
-	use tiff && myconf="${myconf} --with-tiff" \
-		|| myconf="${myconf} --with-tiff=no"
-
-	use truetype && myconf="${myconf} --with-ttf --enable-reuse-font=no" \
-		|| myconf="${myconf} --with-ttf=no"
-
-	use xinerama && myconf="${myconf} --enable-xinerama" \
-		|| myconf="${myconf} --enable-xinerama=no"
-
-	use mmx && myconf="${myconf} --enable-mmx-optimization" \
-		|| myconf="${myconf} --enable-mmx-optimization=no"
-
-	use debug && myconf="${myconf} --enable-gdb --enable-warn --enable-gprof --enable-audit --enable-trace --enable-trace-x"
-
-	use !ppc && use debug && myconf="${myconf} --with-libefence"
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
 
+	if ! use ppc && use debug ; then
+		myconf="${myconf} --with-libefence"
+	fi
 
 	#implied intent of debug means you need the frame pointers.
 	use debug && filter-flags -fomit-frame-pointer
 
-
 	# Explanation of configure options
 	# ================================
 	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
@@ -65,9 +44,15 @@ src_compile() {
 	# --with-ungif=no - Use giflib instead of libungif
 	# --disable-availability - So we can use complete paths for menuitems
 	# --enable-ascp - The AfterStep ControlPanel is abandoned
-	#
 
 	econf \
+		$(use_enable nls i18n) \
+		$(use_enable mmx mmx-optimization) \
+		$(use_enable xinerama) \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with gif) \
+		$(use_with tiff) \
 		--with-helpcommand="xterm -e man" \
 		--with-ungif=no \
 		--disable-availability \
@@ -82,6 +67,11 @@ src_install() {
 	# see bug #31541
 	dodir /usr/share/gnome/wm-properties
 
+	# afterstep tries to detect the current resolution
+	# for documentation generation, causing access violations
+	# for the video device.  bug #87356
+	unset DISPLAY
+
 	make DESTDIR=${D} install || die "make install failed"
 
 	# This fixes a bug with shared libraries