Adjust dependencies for nouveau API change.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

9 files changed, 28 insertions, 26 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 49d56d6c98fd..ea7bec902023 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.394 2012/05/10 18:23:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.395 2012/05/11 00:45:56 chithanh Exp $
+
+  11 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-7.10.3.ebuild, mesa-7.11.2.ebuild, mesa-7.11.ebuild,
+  mesa-8.0.1-r2.ebuild, mesa-8.0.1.ebuild, mesa-8.0.2.ebuild, mesa-8.0.ebuild:
+  Adjust dependencies for nouveau API change.
 
   10 May 2012; Alexis Ballier <aballier@gentoo.org> mesa-8.0.2.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d3aabd6eb808..7f60d2337b3c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX eselect-mesa.conf.7.10 1670 RMD160 a500c3af1c036678a84548b92e348b12a72ec117 SHA1 38cc1b51398382f5a2d1b89da4f16d3fa0e55450 SHA256 3ff15cedc353feeb2da450533c2ea2efc33ed1c8434a7b3037999c4965907149
 AUX eselect-mesa.conf.7.11 1670 RMD160 74d85b0481f36a8e2b2e09245d49d09671500946 SHA1 5c5f468feaae946e5901698d1c0ffe8fc480b783 SHA256 448d08e97e931563aa2e33f22feeaf911caf9a2eb9fd7b446485311d1dcc1225
 AUX eselect-mesa.conf.7.9 1652 RMD160 922a0cc81e31548eacc7bc079448a93912124180 SHA1 2fb5a1fad37cc907871541ba8daca927dca968bb SHA256 bee4d061f1fb63c4c70d3f643fee7b53726c8826782f57b988f545e12eccd8c1
@@ -17,20 +14,13 @@ DIST MesaLib-8.0.2.tar.bz2 5705573 RMD160 a7c4e396d82c890eed462fd45b433812f3fad0
 DIST MesaLib-8.0.tar.bz2 5687424 RMD160 c25d4dd038c56185ac2fbcb06bbb62acaf90b936 SHA1 fc07c2224189e6445ea078a4eb2193398a260daa SHA256 a69adfe4fdda792ed145f7610075b8003961f080e5c515f1dfd326e172aa8543
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 RMD160 acc52b4f05b82a98e7994dc005699630270de360 SHA1 f38c616eeacbeebe597ed4bc98b84a41caa18108 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 RMD160 45196d33a7e2f6d3766ddf9cf5e5ab1b5becff18 SHA1 51e567e8549477160ddceaa2a618dd6dfe3656e1 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b
-EBUILD mesa-7.10.3.ebuild 9790 RMD160 05e7eca4e48553f9740cabeab4cd6e6877769d02 SHA1 faa9c013dceff0c686785617b20862eb3af4e6a8 SHA256 7b57278b718a7a418b70757acfc53a402845d0e39818e8c8f4c33d13d905338d
-EBUILD mesa-7.11.2.ebuild 9939 RMD160 809f2900c572b37b1a1a3781ddc154db24b89573 SHA1 2b405d5fa13f98a5440c40fa76444b7731782609 SHA256 4c74c264952d709385f87a4c4480371f9a60910de058f52f6864aa4b21018ee4
-EBUILD mesa-7.11.ebuild 9946 RMD160 1361a1c2380e4c308374bc2f1719f72c63e5ebaa SHA1 fea1516ff00f89e461df1a71d3c761bb1f7c0c8b SHA256 df60c0c20bb85d9588a79733a83cd068e922d656ff817c9d98d06b276007adfe
+EBUILD mesa-7.10.3.ebuild 9842 RMD160 a331186abc3031d021156d506a8e3c632630cd02 SHA1 d8f7c54ea40f852421ce48ec0c112a9aa0acc3c7 SHA256 655c8ccabf2b476cf5e0c5c8936ceb04ad91f6fa2e009bae2103978368914da6
+EBUILD mesa-7.11.2.ebuild 9991 RMD160 9f04005f94d87ba16ed1684555a1f4abb9e729d2 SHA1 16e1e66c5f858970c1126825cefb2e57193ca471 SHA256 bfb44d32edbdb69fd5f3acfe13064fb2d5132681130dc83baf704736e9309df3
+EBUILD mesa-7.11.ebuild 9998 RMD160 da9f7172f1dac55fdf45ef87341300775e8d381b SHA1 d200be7b954018642bc359bdecbebadbe2f6d2ac SHA256 6331d9a272cf58684bdefa3a87b2f7b428bf70233d56954a1e515ed39b6b5fbc
 EBUILD mesa-7.9.2.ebuild 8934 RMD160 c5d363dabdb89ece9cf90a9d2ea6c7625a06f74f SHA1 17e14ade2e4cfd4414bffe8d9d7be61cb0e33d7c SHA256 cb5a3cfd8338290e281d41f091d64d872d10390f13195e8f5e5be73c6d7fc41a
-EBUILD mesa-8.0.1-r2.ebuild 10486 RMD160 aa987e027748ada9e6c1f6eed45276608dfc5fc5 SHA1 73025325ab072ec721d6dd1d27b4e8531ad0cf92 SHA256 d9721b2e166b5bf95b941e4ef41e039ecec5c58ca56afac37bed977177236092
-EBUILD mesa-8.0.1.ebuild 10439 RMD160 588343c84830c45976b1b00765fb928fea38e76c SHA1 5248dbb4c743eb43275b8483f8ffd3a6ed47f7b7 SHA256 46dc2f5031b0cc2f4e80079e23be7b2562774996bd7cb8325873c91f898819db
-EBUILD mesa-8.0.2.ebuild 10636 RMD160 62413080ebbd5fc473122ffa9cc67aa9715c78de SHA1 997dcf80f8f52a5e837135412844f86ac27d7d34 SHA256 505309cd4f13327153a3ce773efb8e3b20a614a4bd0353f878cf4ead7a2307f6
-EBUILD mesa-8.0.ebuild 10430 RMD160 61e5227fe868462bf213faf775642ba7d9b59cc7 SHA1 490be5d96e8d99bd1622ac59f5df64bd8e7e2dc1 SHA256 84a20798077c32b54398c4181c29f13ff3795fd8365110f4f2b632ae058d28ca
-MISC ChangeLog 64674 RMD160 0cfddbca9ef46d6708d9cb9c24c7f71045029026 SHA1 1570a9d1a5ebc1b3c5f28675cb0523af88bf3f42 SHA256 1bbf819575362bf782eb16c59200f5e1d97baf4c4259dbc76ebc8596b8c872f8
+EBUILD mesa-8.0.1-r2.ebuild 10538 RMD160 9142763d4adcf24dae32ba020b095b7089634870 SHA1 f833c3b2bbd370e650e2b0dc0c350033034b861d SHA256 88034561344751093604afd304f8e055c0315beb54428d834aee049619680214
+EBUILD mesa-8.0.1.ebuild 10491 RMD160 32aa32f341c7cdf46009b4bd5f2cffcf6de22a78 SHA1 49f16eafcedfd6367932eed9c7f2e9cf21c63508 SHA256 2c51ea16d8966a9ca98277fe87feee33ed2bcda5cc366c458a0d6739ebd49e73
+EBUILD mesa-8.0.2.ebuild 10686 RMD160 4610545d825c84db8ff7db4ad34214cb2c0e0243 SHA1 3c6450807bf2104ca770e93ecf7b71d6b98e9199 SHA256 21a4f9450927af5cff319f21309b0e249c1e826b0ef1918607a898e49f76f607
+EBUILD mesa-8.0.ebuild 10482 RMD160 6c41360bd919035806726994761f581095ef46db SHA1 5110b0a1abee17118c4ee67de6acbdd260bc43c9 SHA256 34d14bc3a5f7b48125dc6616634a41885052c104c4e0c197816565e517ce8c05
+MISC ChangeLog 64929 RMD160 34f2ed48e296084e3fb8f50d64976e572090d532 SHA1 f34eca34aabefc36c310cb07da20e1e16f5df753 SHA256 70a1712c30a43b7374c96c885d730bc024ed5a691a74c736a3bfc2372ecc51ee
 MISC metadata.xml 1719 RMD160 105cf3250b1737a8af62fe673121c8758ed77952 SHA1 44f70796e307d3b1347f67e0a192dd5ace4031f7 SHA256 48b27a829c1fee92ff4119093789a4cf8f57d56bea30df6d6fac26b13f80cabb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+sB6YACgkQvFcC4BYPU0q6CQCgtmfovJl/KUkNDXirKnmOR3I2
-x24An1GPTUi5lGGPVS/Pj+CxQf7HJ1vO
-=t71i
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.10.3.ebuild b/media-libs/mesa/mesa-7.10.3.ebuild
index e2c466ef0bf1..bc0e1b39ea75 100644
--- a/media-libs/mesa/mesa-7.10.3.ebuild
+++ b/media-libs/mesa/mesa-7.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.13 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.14 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=3
 
@@ -84,6 +84,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 		)
 	)
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
diff --git a/media-libs/mesa/mesa-7.11.2.ebuild b/media-libs/mesa/mesa-7.11.2.ebuild
index 325fc82cf5ee..78de972a13ad 100644
--- a/media-libs/mesa/mesa-7.11.2.ebuild
+++ b/media-libs/mesa/mesa-7.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.10 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.11 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=3
 
@@ -77,6 +77,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 		llvm? ( >=sys-devel/llvm-2.8 )
 	)
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
diff --git a/media-libs/mesa/mesa-7.11.ebuild b/media-libs/mesa/mesa-7.11.ebuild
index 9e76c6a3d1a9..b83458ff47ac 100644
--- a/media-libs/mesa/mesa-7.11.ebuild
+++ b/media-libs/mesa/mesa-7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.ebuild,v 1.16 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.ebuild,v 1.17 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=3
 
@@ -77,6 +77,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 		llvm? ( <sys-devel/llvm-3 )
 	)
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
diff --git a/media-libs/mesa/mesa-8.0.1-r2.ebuild b/media-libs/mesa/mesa-8.0.1-r2.ebuild
index 65f098a20750..f8b0284ae822 100644
--- a/media-libs/mesa/mesa-8.0.1-r2.ebuild
+++ b/media-libs/mesa/mesa-8.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.1-r2.ebuild,v 1.4 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.1-r2.ebuild,v 1.5 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=4
 
@@ -98,6 +98,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	wayland? ( dev-libs/wayland )
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
diff --git a/media-libs/mesa/mesa-8.0.1.ebuild b/media-libs/mesa/mesa-8.0.1.ebuild
index 4539217a86f3..cd465e6b61fb 100644
--- a/media-libs/mesa/mesa-8.0.1.ebuild
+++ b/media-libs/mesa/mesa-8.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.1.ebuild,v 1.4 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.1.ebuild,v 1.5 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=4
 
@@ -97,6 +97,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	wayland? ( dev-libs/wayland )
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
diff --git a/media-libs/mesa/mesa-8.0.2.ebuild b/media-libs/mesa/mesa-8.0.2.ebuild
index 52695cc97a80..f19beb0028c1 100644
--- a/media-libs/mesa/mesa-8.0.2.ebuild
+++ b/media-libs/mesa/mesa-8.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.2.ebuild,v 1.4 2012/05/10 18:23:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.2.ebuild,v 1.5 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=4
 
@@ -98,6 +98,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	wayland? ( dev-libs/wayland )
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
diff --git a/media-libs/mesa/mesa-8.0.ebuild b/media-libs/mesa/mesa-8.0.ebuild
index 3382187683cc..1e05a066e81b 100644
--- a/media-libs/mesa/mesa-8.0.ebuild
+++ b/media-libs/mesa/mesa-8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.ebuild,v 1.4 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.ebuild,v 1.5 2012/05/11 00:45:56 chithanh Exp $
 
 EAPI=4
 
@@ -97,6 +97,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	wayland? ( dev-libs/wayland )
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}