Removed build of unneeded drivers. 6.7.0-r2 Stable on hppa.

4 files changed, 23 insertions, 13 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index f070796dde0b..4d8f27aec8a1 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.125 2004/09/18 10:26:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.126 2004/09/18 12:16:26 gmsoft Exp $
+
+  18 Sep 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.7.0-r2.ebuild,
+  xorg-x11-6.8.0-r1.ebuild:
+  Removed build of unneeded drivers. 6.7.0-r2 Stable on hppa.
 
   18 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
   xorg-x11-6.8.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 64b83cd3768d..1b98a4d9998c 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,16 +1,16 @@
-MD5 272cf751ac77abcead6b1c67ad9097cf xorg-x11-6.7.0-r2.ebuild 37989
-MD5 2a98a321f347e10236ffbf22be6c1679 xorg-x11-6.8.0.ebuild 40180
-MD5 7a025fba9928b2f643aea2da070e52f5 xorg-x11-6.7.99.902.ebuild 39939
-MD5 54f7b5341467451bc4b70bfe0bfed641 xorg-x11-6.7.99.904.ebuild 42080
+MD5 d8c349b913a75b52756254f4649e8626 ChangeLog 28589
+MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
 MD5 c525cb4363e44aacb13f6ea3fec9e3ce xorg-x11-6.7.0-r1.ebuild 41733
-MD5 ce326893c0372d83a74f3366b8b57d61 xorg-x11-6.8.0-r1.ebuild 40179
+MD5 7a025fba9928b2f643aea2da070e52f5 xorg-x11-6.7.99.902.ebuild 39939
 MD5 07aebe7113492f714a1f2a88aa963c32 xorg-x11-6.7.99.903.ebuild 41120
-MD5 7332165a8866937751535b3b978fab98 ChangeLog 28426
-MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
+MD5 54f7b5341467451bc4b70bfe0bfed641 xorg-x11-6.7.99.904.ebuild 42080
+MD5 2a98a321f347e10236ffbf22be6c1679 xorg-x11-6.8.0.ebuild 40180
+MD5 a9f4779525f690f94b4b58e4bbc5f1e4 xorg-x11-6.7.0-r2.ebuild 38156
+MD5 f46e4413c4310a77a14ab90b73d437dd xorg-x11-6.8.0-r1.ebuild 40347
 MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
-MD5 8af7d21e954bd34d7c65725490f99c95 files/digest-xorg-x11-6.8.0-r1 904
-MD5 e6dd1c7e4f865e64c01945576857b351 files/digest-xorg-x11-6.8.0 904
 MD5 b8189a2f2288867fa7ebc39493946c95 files/digest-xorg-x11-6.7.99.902 516
 MD5 d64a77dbba4148d34f40f03c002c1122 files/digest-xorg-x11-6.7.99.903 516
 MD5 f8c7cefa19b8d2f20c88acceac920fe7 files/digest-xorg-x11-6.7.99.904 516
+MD5 e6dd1c7e4f865e64c01945576857b351 files/digest-xorg-x11-6.8.0 904
+MD5 8af7d21e954bd34d7c65725490f99c95 files/digest-xorg-x11-6.8.0-r1 904
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index b39a396356fd..ffe963f82147 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.21 2004/09/18 05:27:22 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.22 2004/09/18 12:16:26 gmsoft Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -66,7 +66,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD FTL | GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc64 amd64 ppc mips ~ia64 ~hppa alpha ~sparc"
+KEYWORDS="~x86 ppc64 amd64 ppc mips ~ia64 hppa alpha ~sparc"
 
 # Need portage-2.0.50_pre9 for `use !foo`
 DEPEND=">=sys-apps/baselayout-1.8.3
@@ -355,6 +355,9 @@ host_def_setup() {
 		if use hppa
 		then
 			echo "#define DoLoadableServer NO" >> config/cf/host.def
+			echo "#define BuildXF86DRI NO" >> config/cf/host.def
+			echo "#undef DriDrivers" >> config/cf/host.def
+			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
 		fi
 
 		if use alpha
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
index d68003bfcef6..1a083217c608 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.4 2004/09/18 10:26:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.5 2004/09/18 12:16:26 gmsoft Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -380,6 +380,9 @@ host_def_setup() {
 		if use hppa
 		then
 			echo "#define DoLoadableServer NO" >> ${HOSTCONF}
+			echo "#define BuildXF86DRI NO" >> config/cf/host.def
+			echo "#undef DriDrivers" >> config/cf/host.def
+			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
 		fi
 
 		if use alpha