restrict building of libdrm_intel to amd64 and x86

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 18 insertions, 21 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 12d42072808b..566faa37b794 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.113 2010/04/18 20:51:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.114 2010/04/24 16:47:30 chithanh Exp $
+
+  24 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  libdrm-2.4.18_pre20100211-r1.ebuild, libdrm-2.4.20.ebuild:
+  restrict building of libdrm_intel to amd64 and x86
 
   18 Apr 2010; Markus Meier <maekke@gentoo.org>
   libdrm-2.4.18_pre20100211-r1.ebuild:
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 25d0bbbe75a8..74f1b1c11e25 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch 2255 RMD160 ac0534ce5dffb7b60d1fdd115fea09b3217fee0e SHA1 38b37d6b77bca429bed3de54be8213dc4f02616e SHA256 dc8a064518fac48f69732074298d1cde7ff2fcbd2edb3de028ae772dc65818fd
 AUX 2.4.15-0002-configure-Typo-in-error-message.patch 1098 RMD160 a732fb1a2d51c921e2b6cfdd5ef090940c127076 SHA1 9f5a3bee36b5fd445f8be2edb5ac0a712852bca1 SHA256 e3e0b847e2b4fe4703573e5fd3b5d78d8d409670d023d5a164e9916688d9838b
 AUX 2.4.15-0003-intel-Fallback-to-atomic-ops.h-libatomic-ops-dev.patch 2773 RMD160 3855124cf786e2c5d8b59450988d1de89a74439f SHA1 347c46a966eb12d642b976dbf57e55553cd76285 SHA256 42b004be6d5ca582119daf2df57a334f53ea01678460941dbd441d73eec36355
@@ -18,16 +15,9 @@ EBUILD libdrm-2.4.15.ebuild 1418 RMD160 cb45f6dca2d68c8319c9dbff139551df4f94831f
 EBUILD libdrm-2.4.16.ebuild 1131 RMD160 a8138a33656af798d729156b43203ffbe8c7a3ad SHA1 3326ecc75262dffd6d13f93078e4c58a11a4a7da SHA256 722c926fedd40856cc4329d704af7f0284b84bcb2a75b6d74013d69d196c5f8f
 EBUILD libdrm-2.4.17.ebuild 1131 RMD160 3e6253974f1dee585a6b81271616ced34fa40819 SHA1 ad62937c2b4c97d4feab1832d62ca2206458951c SHA256 8cd6decd895d60d6354d2210d664a4c2f646a8aa1eb32c3e19c65061737b591e
 EBUILD libdrm-2.4.18.ebuild 1112 RMD160 685e5e3cbbf0f71dd4572f5eb0f40d8374c829b3 SHA1 bd466542eb0c70143e8204cbd21a61493b2ba7cf SHA256 18ce51b2ce6311f00a4f9846b396cf39b889becd60fdca213d7b9e8a1b40ae44
-EBUILD libdrm-2.4.18_pre20100211-r1.ebuild 1280 RMD160 b74b5172f90eb1847b30ad6c8eabfe683a420547 SHA1 1d4d62cde2404ea0c852d683b23e92d949b7eead SHA256 ee0af1a4f97c4fa44768aa2eff5d7891c06137939641eeb568e7dcfb01a7b711
+EBUILD libdrm-2.4.18_pre20100211-r1.ebuild 1406 RMD160 cf481902b62bfb6ac3e0cbe6bf1558cd565aa60d SHA1 10a4255f826b45e88dee5ef8e17e6ada55bae2b3 SHA256 ddaf135493023ae5e7dd8b6830864c486b4dd976fe19aac98c41e292bf4cda8c
 EBUILD libdrm-2.4.18_pre20100211.ebuild 1129 RMD160 a11bbd10c51eb382841dca4cc9f187d5c70df428 SHA1 9c67caecfcda79a595d8a17ec908293e6cd4b67d SHA256 57fb476ee18022161219c9503ad37eba8773512932137e1ff9a176ba9aad796d
 EBUILD libdrm-2.4.19.ebuild 1157 RMD160 33616037c5d4dfbcb7ecef4347223cc62d6883dc SHA1 08669dc6973253ee74bcc7006fae0c8a3510dab8 SHA256 5ec6eee1696bccd73ab928b77590dbe3f85f407a2aed52c9e7dd8c3a97247da3
-EBUILD libdrm-2.4.20.ebuild 1206 RMD160 adb157b681f6749525d9e9355fbc9e0b66d57d93 SHA1 191c152d09c087d941d6319efef675f847bd0f6f SHA256 23a9a6e3b36a5407d8bbb853fdcb21c5e5c34c2798f55ff45960bfa29179d2fb
-MISC ChangeLog 15552 RMD160 908e39aec8bda81ab1dc1702c366d35bd8b23c8f SHA1 d8dfd4d098c03f241345ad6bc10b9d89427e1eee SHA256 99442fa368f2bada8296c8f4835024a6c15009da8bbac1463ccc85749c66b9d5
+EBUILD libdrm-2.4.20.ebuild 1327 RMD160 2098b34d0875fc352173b4f24f90168fba012567 SHA1 9a7cd1862db9e53c14091994c3b9815d07e61af5 SHA256 a56a1660f7d537e6c5d68d208a23f20d44febd2b191542312331cd243bb11909
+MISC ChangeLog 15738 RMD160 49447847fcb2b63932f11431876732c97c1c43ba SHA1 65e54f82d19120f7a3864e853842ba0e7de96021 SHA256 9e0d9f6cab95e5a461fd390bae777dbd100fa1eb53543a60aba921f473779205
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvLcIsACgkQkKaRLQcq0GIqRwCfbiCj/NlpQfXyi9RgLA3o8WS8
-8UsAnRu4nQdtXCJxDpA6cdT7Kad2182e
-=CBvk
------END PGP SIGNATURE-----
diff --git a/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild
index 542983214757..8b4aca31c9a4 100644
--- a/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild,v 1.5 2010/04/18 20:51:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.18_pre20100211-r1.ebuild,v 1.6 2010/04/24 16:47:30 chithanh Exp $
 
 EAPI=2
 SNAPSHOT="yes"
@@ -30,8 +30,10 @@ PATCHES=(
 	)
 
 pkg_setup() {
-	# Fails to build on ARM if dev-libs/libatomic_ops is installed, bug 297630
-	CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api $(use_enable !arm intel) $(use_enable !arm radeon)"
+	# libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is
+	# installed, bugs 297630, bug 316421 and bug 316541, and is presently only
+	# useful on amd64 and x86.
+	CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api $(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/libdrm/libdrm-2.4.20.ebuild b/x11-libs/libdrm/libdrm-2.4.20.ebuild
index 776b32c10f98..9d58cb44423b 100644
--- a/x11-libs/libdrm/libdrm-2.4.20.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.20.ebuild,v 1.2 2010/04/13 10:14:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.20.ebuild,v 1.3 2010/04/24 16:47:30 chithanh Exp $
 
 inherit x-modular
 
@@ -22,13 +22,14 @@ RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
-	# Fails to build on ARM if dev-libs/libatomic_ops is installed, bug 297630
+	# libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is
+	# installed, bugs 297630, bug 316421 and bug 316541, and is presently only
+	# useful on amd64 and x86.
 	CONFIGURE_OPTIONS="--enable-udev
 			--enable-nouveau-experimental-api
 			--enable-vmwgfx-experimental-api
 			$(use_enable kernel_linux libkms)
-			$(use_enable !arm intel)
-			$(use_enable !arm radeon)"
+			$(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")"
 }
 
 pkg_postinst() {