Add versioned dependencies on wayland, bug 428162.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

4 files changed, 26 insertions, 22 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 5aa70df61ff0..e738bbd16e46 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.453 2013/01/21 01:31:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.454 2013/01/21 17:54:17 mattst88 Exp $
+
+  21 Jan 2013; Matt Turner <mattst88@gentoo.org> mesa-8.0.4-r1.ebuild,
+  mesa-9.0.1.ebuild:
+  Add versioned dependencies on wayland, bug 428162.
 
   21 Jan 2013; Mike Frysinger <vapier@gentoo.org> mesa-9.0.1.ebuild:
   Add s390 keywords #453114 by Sergey Popov.
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b0edeb5068cd..504dd8b791ac 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -18,24 +18,24 @@ DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92
 DIST mesa-8.0.4-gentoo-patches-01.tar.bz2 2380 SHA256 bad7443e7163b87b3c14f8f56568551300fe190f58531fdba4fdabd36c2db842 SHA512 855834bc13decb46ab0b81e75002d873d2f40f67c9b1770b2d33e892beffffb32c229db71df72bea24d74ec515a0890a89dc9221cb22bba59c50182c654be676 WHIRLPOOL c78b4fe32d6b3246c7dffa2b7b9c216e13323ece677129618b2333d620f81777e8a23f13c956f88cd3aa0ae790d0a102d4f1c1e96c9ca5a13b3583a14cb2288b
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 0539d7b38201da07040eae24c996346d5e3fc2c9c2cd7271a91886bbfa8a503c SHA512 e87083af5e10b923863369f225a3791adb91c085933aea7c449f879510a3202c63b849abc89b272ded7b90428413ec5480cf14d101eba3756b8d2603d8798d27 WHIRLPOOL 722c321abbc61ba2ac5f7f727b370d760ab17c0da0baddc353aa45acfc874f762f68066010b451f7e048b7f9f50b5a59d88eeb6f0cedf9159ac4efb54143f7ef
 EBUILD mesa-7.11.2.ebuild 9981 SHA256 f0c47c532ad67ed7fc2abe30eecc727bba71bbe8fc302df4920ef6ddee6d5776 SHA512 6c3968a4bb3601dd9dc8ec4ab415cd3df11e6505e9327ea66d62594337f27bfba65cac00a262ad6066b5fb49ec8b10217cdb66f139123bc254a1582c78925a30 WHIRLPOOL 0ddc6b9fe995216db9b4611e5a97e3cba1dc7a08a3a59e0ce1706495643f89eb3d6b12fbc41b42db4b092ece690ba1c90464df29b09f00cd79a124faa6da5c89
-EBUILD mesa-8.0.4-r1.ebuild 10836 SHA256 95da0a6b7a705b6cae3cf2ab35f1a6947a49c38f77ff199f2faaaf13ac2c8271 SHA512 938e57b3995c8bc5ef87753f2e187b081e6285635aa7fd72e3337df470ca9b319102ed6df9468ff3e9791217560f93fc9cd7e836d50e341910af316c58dfae46 WHIRLPOOL a8ff37edfa045b044ae73180b49b18f15c1f8adf8adb624c13017237ab6ca70323be828ecb363cca3c1f96f7e9ef15e7598d8b850eb0beaed5a6ebe308628e80
-EBUILD mesa-9.0.1.ebuild 11065 SHA256 11c4ca8378850cf372fe7562794c91a2510874de2f618847316084cbfaac344d SHA512 594c143f5758c2581cc81a3583524bde6beeffb44db669da8982d2a0bc2905dfa52fa4336f1ab82bae67f06664c68eb64d659cb7eaa647a8f562f8700744911a WHIRLPOOL 9e110e8f3f821b7340b1a6e609820de3437bc7ef0c3f783de4c0bc7c42e2494f3786676718f7655f986dbf6dc25cbdf335a638a871c8d938e60793f63976d126
-MISC ChangeLog 73920 SHA256 02a82f7bbc87cb441fcb7f475f990248114bc98cc6d32b334a8c310d9c5a5416 SHA512 fc2306e242c6030d19f8c38ba31bb4b20ac4884153fc6bb8296a866c48e123e5147714964a9eacb3220bd65708287962749d90a6fc6fec8c133c56a3aa900fea WHIRLPOOL f954512dac1754fd1de664fd5ff9dbbb0b4d0178fe185d4c032a6a1e6c0ac47dbea699fa85fd0e9b93b5c3d27ee8c0376b9afd85f8389d3576469bf011ce92b3
+EBUILD mesa-8.0.4-r1.ebuild 10843 SHA256 e2d5aa6a67796611e3e2eddd97f8be407b2aa04cf7f70c1a874084d269f37331 SHA512 291e02e7990ae4eb8fe7394e1eefda0493b9dd4f5439720ca3989a935b7448ee3ed58e95b8e187f4839b7466f4b0974796d9180498de487deb992ecde09beda9 WHIRLPOOL d4724d1a98f4ab09e6982e75e1f986d7f2b8fb1c67c7b0d269c8df3fd03f9271e9e9f9ec36b194240bdccd58d4f6a07842468e68f1600bf6f0164eebe164a140
+EBUILD mesa-9.0.1.ebuild 11075 SHA256 4f0802521b49c30c572f3ba476f4b164ceca3ea921b67892c1e14ee09bb189ac SHA512 25f8190a5d32fd8560d23cbebcd2ca67efcd2cb0cceb23cb9c9b761adc61347037f2574b1fc4c490ea4c5178f5ca357f442b1f60eeb5b75657702155d66f7d25 WHIRLPOOL 4118b6a10310f0cd3e1bb7a805ba2ea3f17a5c7bb6274aeca321bde4b4eca19614fcf852b34c0483c417a8dcd8efd6abb656de1ee99a2dde25b89717e290ff04
+MISC ChangeLog 74068 SHA256 132ebe5607848138666379ddd4b7bbba3cb98fad8a61b51dd1a9eb69f140f1bb SHA512 b01ab0d754067b5db7d46e3e50e7c84311179fd21b79ef3a4f3579e202e757d4447fd87a34161ed165f27197730e4895744e494f05d9363a076e999f2f6e988e WHIRLPOOL 62df112debc04564c23e1800567f23a9f0bfaf605c9f03b85449b8eef96ffab427c4423eefc6d540ab4534c6fccf9ccf0b057a936a1d60664771dfb0eea3a994
 MISC metadata.xml 1986 SHA256 7a518f3eb77d4b51d4dc5c5cd347bebdc2c849e43d17d1057afeae6be2dc13ad SHA512 1dccfd236b8b8e39560d5056281e774979cd8e2299623b34c2e0f0d9e1ae84906932cfbc0ab15bdd1effc1d82cb484ca4d23acf7cd8d849a33a82f9ee2c60b90 WHIRLPOOL 14e19a3782775f7ca600526f1bf852ed55e328585b7e095a8ab239697ca351f812bf914205166faf714420d179ac7e36b6d1b10fe74188a028c580d40640e31c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/JtiAAoJELEHsLL7fEFWEawQAJskURKseQDuwbClxs3QNodq
-TgCOLlkWzMOAQnBVQP4KNjwMazGXXku/D54B7wshrf/xkbZUCSQjJHhUKxtUTKY6
-fOXHRLxJ9xBSWj/GLhDpw0s0yqPMVLKEPSVzIT35LQIsULEEVuK9JPNhtFQNdYGv
-yam6egOOr0c7/b0owqnDu4jD8MByr/rZRbWzVe/h50cOHdHDMilQMTfQICmsQutH
-HPKV8LrWT6OdvR8l/cfjywK6b3iBsX0oOJLBnaKJNuQOcvWKphS3JENbwAJhbVbX
-sovn1E0ZC0hHItyG6al1ONzyKUzblIjmEsGxzShWKBIzZgFtOJGs0UyHDFFaGaDL
-6IJeTk8ldXSglUKW7kqZiglqxCbqk0wFyWRlHSxvlV8xbyzhxO7lI+G6gmXcy5p8
-Cs3t7DGImNs1Xs+29sHAuqDtCV16yuxutV/XsFP4EFN7+XZhULQ/gko1li1EVicD
-Pvr4ZJ2eSsuHtqzEfmk0MPX/L9sFchnSG1a+gw7RyjCSDA8JqCLtyDZzUnTWE/lK
-mtjhX1kO/7gbIBAgbhtzukdPWC8BBoS6mTZ+Ikb+PZ25LpaSehB2Sce/I4gdiXtg
-B7l1xdGLneaCfDdHUl61h0bK1oI6dKRU0U2Ia4d69CNFMSjSCZg51JI5PcLulrOL
-B3RZ6eSPTY0GK4MOKHXS
-=mknj
+iQIcBAEBCAAGBQJQ/YFyAAoJEA/daC2XTKcqZBgP/isjCN6r4rS25BR3VDmRA4mE
+EaMQ8EmSXHSC2m1Cq34hrIYjSjG2PSv6I02Y+YkkhQCD3v8UfE7p+T6mgWOSBfBa
+3tIotu3YeMC7L40RxIK1zZdZfo6r/mQjyi380FMxQ3jDVIXeB46nrg4P4QR35XjN
+XEgVHMv7eB8IFwUfuxfQP9wuIqltIov0HUwKUMC8/n+JSmvWBn/kUS0pOQlMgUDn
+P95keOV4s4Jb4MxJOxx2/ED1ZstveXAuYgJXWFDfdXo4QxlBkjWhO7zqez80XeIH
+ojMcxbY3yTZcJoFeJoFePfmYqsK9D9mMqZtHNphy7PgvA/4G4M6FpH+8asfU/z3t
+9gJtP4L0qRI98rWDivtMpCLBr9Htnlh5nbfuw9RWwrtp4HnVdvoOTopGzedxgSEH
+trzrG+SJbvp4RrP1noSXUmIsEvZyjSdCzHa0OmO41oGlnDYlxJOs1mP2+Jn2YJ+5
+o3GdyMjI0DJtW2pH9ONmnQzAjUHfIRMq9SyXMh0QcFsARzbNFCCUVTXy0ftod7xz
+Rti7wFcZgSq3L63ZrB6oAnNd7/3vFevqCje3oCBMfD6HApzuS6BKJv6VMvvJpn5z
+VJiCV6RNMz9w5As0YDY0vnltohKSs6sBcvduU6SS74XRjHSa/guzCwSlloxQhchB
+bCrnStWQSQ5Cn7shWNVx
+=W0+L
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-8.0.4-r1.ebuild b/media-libs/mesa/mesa-8.0.4-r1.ebuild
index 15dbfeabf854..5e636b5412ad 100644
--- a/media-libs/mesa/mesa-8.0.4-r1.ebuild
+++ b/media-libs/mesa/mesa-8.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.4-r1.ebuild,v 1.10 2012/12/03 02:42:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.4-r1.ebuild,v 1.11 2013/01/21 17:54:17 mattst88 Exp $
 
 EAPI=4
 
@@ -93,7 +93,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXxf86vm
 	>=x11-libs/libxcb-1.8
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
-	wayland? ( dev-libs/wayland )
+	wayland? ( =dev-libs/wayland-0.95.0 )
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
diff --git a/media-libs/mesa/mesa-9.0.1.ebuild b/media-libs/mesa/mesa-9.0.1.ebuild
index 3066fc4212c6..fd0d08f23859 100644
--- a/media-libs/mesa/mesa-9.0.1.ebuild
+++ b/media-libs/mesa/mesa-9.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.1.ebuild,v 1.14 2013/01/21 01:31:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.1.ebuild,v 1.15 2013/01/21 17:54:17 mattst88 Exp $
 
 EAPI=4
 
@@ -94,7 +94,7 @@ RDEPEND="!<x11-base/xorg-server-1.7
 	x11-libs/libXxf86vm
 	>=x11-libs/libxcb-1.8.1
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
-	wayland? ( dev-libs/wayland )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
 	xorg? (
 		x11-base/xorg-server
 		x11-libs/libdrm[libkms]