kdrive's VESA driver does not build on AMD64. (Bruno Roggeri, bug #145274)

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 33 insertions, 15 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 10b9e09bac29..8078b81a043c 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.161 2006/08/27 08:27:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.162 2006/09/03 14:48:35 joshuabaergen Exp $
+
+  03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  kdrive's VESA driver does not build on AMD64.  (Bruno Roggeri, bug #145274)
 
   27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 22cf4a07ea48..728cd49e7cbe 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -80,18 +80,18 @@ EBUILD xorg-server-1.0.2-r7.ebuild 6180 RMD160 d1748b4267c3c3cc1feb11207363e4a5c
 MD5 01f2a045449329d5b101e84f3d973c01 xorg-server-1.0.2-r7.ebuild 6180
 RMD160 d1748b4267c3c3cc1feb11207363e4a5c6c0ceed xorg-server-1.0.2-r7.ebuild 6180
 SHA256 e494d7527228f994346aa2781c1d5be1752a46f9309a94dbaa6c1b81cbef3320 xorg-server-1.0.2-r7.ebuild 6180
-EBUILD xorg-server-1.1.0-r1.ebuild 24304 RMD160 760cd8f506ebe6eab93db701cf76c797063592e2 SHA1 ee06f7edce63036cf8e8171b0e984d86ee0aaa79 SHA256 a80f3ed43296f3b7f8b1d9de618a4fb78bef3e5cd8afafc96f85202e9b7e1edb
-MD5 ea0d8f01b310dc041230e7ccae2ea2f8 xorg-server-1.1.0-r1.ebuild 24304
-RMD160 760cd8f506ebe6eab93db701cf76c797063592e2 xorg-server-1.1.0-r1.ebuild 24304
-SHA256 a80f3ed43296f3b7f8b1d9de618a4fb78bef3e5cd8afafc96f85202e9b7e1edb xorg-server-1.1.0-r1.ebuild 24304
-EBUILD xorg-server-1.1.1.ebuild 15372 RMD160 34229e05dc96696f064d88575fb55c623faad7b5 SHA1 912feb8e30a81c92643f0e8e247e2958b6b7ac7c SHA256 514dc02f622e7deaf2b1f9aba60d06549b677400c295869970cdd414224ce0e8
-MD5 c7e1040946574880453709542bcd675f xorg-server-1.1.1.ebuild 15372
-RMD160 34229e05dc96696f064d88575fb55c623faad7b5 xorg-server-1.1.1.ebuild 15372
-SHA256 514dc02f622e7deaf2b1f9aba60d06549b677400c295869970cdd414224ce0e8 xorg-server-1.1.1.ebuild 15372
-MISC ChangeLog 32863 RMD160 abc0cc6053f62576cb2936210096a2163183f294 SHA1 674de6bf4acd33cf773567988dfc4061c5a4bb1f SHA256 0d4676ed1898d2c5451a3b66799e024a85b9d23d55febc79a10eb3485e30bffb
-MD5 f3f3d9cc9fc53b9d8935e8d5d9cbb914 ChangeLog 32863
-RMD160 abc0cc6053f62576cb2936210096a2163183f294 ChangeLog 32863
-SHA256 0d4676ed1898d2c5451a3b66799e024a85b9d23d55febc79a10eb3485e30bffb ChangeLog 32863
+EBUILD xorg-server-1.1.0-r1.ebuild 24629 RMD160 6c55cc1b8e07d70e760850b46c5ca9aec5735e24 SHA1 77684308a87b0217c9dac1eb27b801a738a8b438 SHA256 6f7b6bd4e15aeca418623b365fae285ce17b5485931cd615142157d67b13fb76
+MD5 9e62bcf6311908c6b51cf2baa18aae22 xorg-server-1.1.0-r1.ebuild 24629
+RMD160 6c55cc1b8e07d70e760850b46c5ca9aec5735e24 xorg-server-1.1.0-r1.ebuild 24629
+SHA256 6f7b6bd4e15aeca418623b365fae285ce17b5485931cd615142157d67b13fb76 xorg-server-1.1.0-r1.ebuild 24629
+EBUILD xorg-server-1.1.1.ebuild 15697 RMD160 d9f04723d983a55ff7a0ce90c67f1af7fd83bc8e SHA1 202cd14869936b610c7d0c0e8ee8e49dc3459c1e SHA256 bf4fa6b3db19aba2936fb3393ecd21940ee97d2e1fd3c1ae6cdb939507cfcbb8
+MD5 be367a0cc0c71e5b88c181687f8642ca xorg-server-1.1.1.ebuild 15697
+RMD160 d9f04723d983a55ff7a0ce90c67f1af7fd83bc8e xorg-server-1.1.1.ebuild 15697
+SHA256 bf4fa6b3db19aba2936fb3393ecd21940ee97d2e1fd3c1ae6cdb939507cfcbb8 xorg-server-1.1.1.ebuild 15697
+MISC ChangeLog 33060 RMD160 7ac021bb51fa4fd005f10cc18f7c306ce91855d3 SHA1 1501cd6d6a28a0a83049f1ffe5bb215309b4a504 SHA256 0a06006a9531cf3e92a142e914ce0859ac60f727c642f15ede2e46b5e965f1a3
+MD5 58801bfca0e7d39994745f1460ed7185 ChangeLog 33060
+RMD160 7ac021bb51fa4fd005f10cc18f7c306ce91855d3 ChangeLog 33060
+SHA256 0a06006a9531cf3e92a142e914ce0859ac60f727c642f15ede2e46b5e965f1a3 ChangeLog 33060
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index 5b5ab5a9a6ae..0fd1babb29a4 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.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-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.18 2006/08/27 08:27:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.19 2006/09/03 14:48:35 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -501,6 +501,13 @@ LICENSE="${LICENSE} MIT"
 pkg_setup() {
 	use minimal || ensure_a_server_is_building
 
+	# Bug #145274 - anything that uses vm86.h is broken on AMD64
+	if use kdrive && use amd64 && use video_cards_vesa; then
+		eerror "kdrive's VESA driver does not build on AMD64 because it uses"
+		eerror "vm86.h.  Please build kdrive without VIDEO_CARDS=\"vesa\"."
+		die "kdrive's VESA driver does not build on AMD64."
+	fi
+
 	# localstatedir is used for the log location; we need to override the default
 	# from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies
diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
index 1b34ec4b4b76..7dc06c4ac73e 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1.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-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.15 2006/08/27 08:27:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.16 2006/09/03 14:48:35 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -272,6 +272,13 @@ LICENSE="${LICENSE} MIT"
 pkg_setup() {
 	use minimal || ensure_a_server_is_building
 
+	# Bug #145274 - anything that uses vm86.h is broken on AMD64
+	if use kdrive && use amd64 && use video_cards_vesa; then
+		eerror "kdrive's VESA driver does not build on AMD64 because it uses"
+		eerror "vm86.h.  Please build kdrive without VIDEO_CARDS=\"vesa\"."
+		die "kdrive's VESA driver does not build on AMD64."
+	fi
+
 	# localstatedir is used for the log location; we need to override the default
 	# from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies