works with debug in USE

4 files changed, 20 insertions, 6 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index fe894f61d862..230f06608fd0 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.137 2003/06/01 05:36:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.138 2003/06/02 08:08:16 seemant Exp $
+
+  02 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild,
+  xfree-4.3.0-r3.ebuild:
+  works with debug in USE now.  Closes bug #20511, by Cesar Eduardo Barros
+  <cesarb@nitnet.com.br> 
 
   31 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild,
   xfree-4.3.0-r3.ebuild:
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index e98f0a385cbc..4c091903458e 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,9 +1,9 @@
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
-MD5 7aa80aa5a30fda5ff9fae0c7b92c632a xfree-4.3.0-r2.ebuild 30492
+MD5 4dae96c0a3c72be85e78eb6d34d29bc5 xfree-4.3.0-r2.ebuild 30558
 MD5 e98a09bb43033618521bf046d8d218fd xfree-4.3.0-r1.ebuild 25059
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 cbf65f67f149849d5a989b613d0fbcd9 xfree-4.3.0-r3.ebuild 31109
-MD5 83ad63501206d4ac3e72ae650fd8cdad ChangeLog 30356
+MD5 d19cad1047983f60fa51db74193dfb7b xfree-4.3.0-r3.ebuild 31252
+MD5 6b2a768ae088742cf446787ca324770e ChangeLog 30558
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index dcc60c6a35ca..93f0f199918f 100644
--- a/x11-base/xfree/xfree-4.3.0-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.24 2003/06/01 05:36:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.25 2003/06/02 08:08:16 seemant Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -204,6 +204,8 @@ src_unpack() {
 	if [ -z "`use debug`" ]
 	then
 		rm -f ${WORKDIR}/patch/202_all_4.2.99.3-acecad-debug.patch.bz2
+	else
+		rm -f ${WORKDIR}/patch/120_all_4.2.99-parallel-make.patch
 	fi
 # FIXME: bug #19812, 075 should be deprecated by 076, left as
 # TDFX_RISKY for feedback (put in -r3 if no problems)
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index c13dc289b614..cc18234c2c26 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.11 2003/06/01 05:36:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.12 2003/06/02 08:08:16 seemant Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -446,6 +446,12 @@ src_unpack() {
 			fi
 		done
 	fi
+
+	if [ use debug ]
+	then
+		sed -i 's|libidriver.a: $(SUBDIRS)|libidriver.a: all.subdirs|' \
+			programs/Xserver/hw/xfree86/input/Makefile
+	fi
 }
 
 src_compile() {
@@ -461,6 +467,7 @@ src_compile() {
 	unset MAKE_OPTS
 
 	einfo "Building XFree86..."
+
 	emake World || die
 
 	if [ -n "`use nls`" ]