Depend on pangox-compat if using pango-1.32.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

11 files changed, 44 insertions, 27 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index e7fb2e052476..f5fdc0cd7732 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.414 2012/12/11 15:20:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.415 2012/12/19 16:52:01 tetromino Exp $
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  nvidia-drivers-96.43.20.ebuild, nvidia-drivers-96.43.23.ebuild,
+  nvidia-drivers-173.14.35.ebuild, nvidia-drivers-173.14.36.ebuild,
+  nvidia-drivers-295.71.ebuild, nvidia-drivers-295.75.ebuild,
+  nvidia-drivers-304.60.ebuild, nvidia-drivers-304.64.ebuild,
+  nvidia-drivers-310.19.ebuild:
+  Depend on pangox-compat if using pango-1.32.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   nvidia-drivers-295.71.ebuild, nvidia-drivers-295.75.ebuild,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5a11e09a9098..7fbe0bce03fc 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -49,25 +49,25 @@ DIST NVIDIA-Linux-x86_64-304.64.run 67695715 SHA256 b3c3bb7f136ccd978c9c5a511a02
 DIST NVIDIA-Linux-x86_64-310.19.run 68022245 SHA256 3326cf9eb432a10fee5cb663132cd6c175813d0225750ef237dcc7feefd20fca SHA512 035a0cb62f4d307683ada7fff380fbe8a9433cee0ee6a8b1986e9d59b55a23484305903f84e77fb6a7440e06efce012feae1da658a304e790e2022c028541a69 WHIRLPOOL 523a9ca07d18cfa1afb1f4e527cecf1c4778650eaa81d1e627fd1c65b4ab459d02e5ce726d0190c57e677c6ef3c22afef8c6aaa99892731faf3415138e9e7635
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18 SHA512 ca89961463bc705b1aa0e5fcbb284317e60e455d444035ba8f6a44cb3884f3a4b4c98ed5a37465d6f70a0eb6578a7d865b25f15a6b6f48bdbcb5aaca6e541623 WHIRLPOOL 873e32237ee1441625c1335e1d325649f139306a49bc87fc25afe81ec37671984a2f0bb904b2d7b435d5ceb52572740bb910fac32853627ce5583655178674dc
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
-EBUILD nvidia-drivers-173.14.35.ebuild 16668 SHA256 50d53cbce419e474e7e6611d8d8a96988d4863f0934cca843e50d3ba857b0840 SHA512 ac31942bf15278e4ae90376a55e06925c639592325b34cac7d3df386ef863bbaa8d9b554cfc6431ab72777440c08387af5ffd8bf03a711dd34596e9553c5f073 WHIRLPOOL 145bbd21f812553547065bcaf5f2e264de5b05b72bbd068fc0498f0ecc9188993d293c086680b9a4e19479b62d88cab727e12f02666d13319bcbe85b5f7a5b68
-EBUILD nvidia-drivers-173.14.36.ebuild 16665 SHA256 e50b340ce8563da8d6eac511df59b3034bf51b8c571b944a2bb30d46f6d958ae SHA512 ad2c06bf6c875aee05b612e9a56be627e293a911170c520bfa9bad7fb5205a37fa522b592a132ae2e7afefbc0ec2b8d0bd565c3c915dec2e113a23a4d91d1bc9 WHIRLPOOL 6a964b7b6c72bcf0accd7ac7c40288c05031fe0d1801efb3270b1281d2f801e8bed1052b9ebde82c75820e84904966bed6bb2faaa8f48a1ab3100a07dec84ade
-EBUILD nvidia-drivers-295.71.ebuild 18408 SHA256 1bd4ffb066cd1a988bb69cca9f8abd5116046ed2d627f079343daa489b6f1d38 SHA512 0fcde02cdfcf09579a7251f37901771de6570dab0f060de162247f1567287bdcb32bd384cfbf5b3271991edd9160f9589d9260bb115b96872a1f382400e977ee WHIRLPOOL 3637e7363f7c536f5b631bc45ed272a02b9753538168886511e7753e66f555bdf814b16f6e1cd0a23702f1ed6113ee56c8bdea03e4ed7b2ff0d85c12a6da738b
-EBUILD nvidia-drivers-295.75.ebuild 18396 SHA256 28ef1f61e759d0cfe9fe719d456ed7155c5171b87786340fd41a2fd731354d5d SHA512 f9f0cd7aa74f1ded8c48a32c32e670f5f5fdf81665480ba1277d10ca7b1381e6321230f956a868acfa517540c7c4f026e870d816482b750cbdeca6e3742079a8 WHIRLPOOL b94f4f910b2da3ae7a1bb36d314f1eb6146fae8f77834dfbbe492014a8ebad8e4fbedb455086d1c1878bf15be4c1904c3f96d1dcfe4599562fa6a302d0527463
-EBUILD nvidia-drivers-304.60.ebuild 12686 SHA256 50589577d1ab12cf807e5a840cc3dd95109af8b9ad64868b3c3cacd253e043b1 SHA512 ecea6e95df5a32c55f2c0042139c910ec505591a53508920536701df7290763eec64bcba53eaf6a2e8cfce41628272c1379b45fc5d1fa4b1a1bc8aa415dc23f3 WHIRLPOOL 10e2981d3d032ccbff8015862f06d38b180ebcc0caa630ff419fa195db803a7dd4f53b32b54cd458b191fe1c792f71926881c7d27b824f54d8bd63093ccc2b7e
-EBUILD nvidia-drivers-304.64.ebuild 12686 SHA256 d5796d1f1466553a39d52170a1eb1c8ecb45d40b0fd10482e67c8f28ef8edbf8 SHA512 55a5dfa39dc1865ffe5c8d2fde31f8ee96e6d714842c176801418f664d24fbd840d7ca4b8a439e06ef4e130b338932d902f36c8ecf87319ed3121b742af52d62 WHIRLPOOL 797b4dc1c0a40b247d560ae36fd2a5d8fdd0359e3ff0863d8d2c3cb05cfb8b402df459c0b65b80503572f5aa74d446d99ef7300329ea7b4bd764c1291a09d8cb
-EBUILD nvidia-drivers-310.19.ebuild 12278 SHA256 a7618ba67713065adba215a63e7a007b069dd351b3ecd1d657dde6bdfa9e6e00 SHA512 f008c5d8683f38d87fe5b5e17c00ff43f18628149a2fe5948279f5aa9832082d52e95c441481b3ce4c1ac2d454126c4930d63a3ecfa3ed7a8cd8ed50c7e7c036 WHIRLPOOL a4947ed41f8d55f0bfef565bede29a8474826a36286640d14dc26806ab344e89f214eb149ca49aa4526a88990df21210460f5c2d645cbaaf267a6f3af4a68a0e
-EBUILD nvidia-drivers-96.43.20.ebuild 15283 SHA256 dc5391522b493ae6fd04526f41ef1d78cc43d4bc063f06a2f9f04fa6f996bf16 SHA512 f5c198dcadc904d8e96f0071dbf1449a418b147b132b697b110fa9b313cb6678e8c3a3b496c8654655b9f3eb03360742a11b5b689062c4b653baa750d670e21f WHIRLPOOL 0224ba1195f9a231036b8f74bc291776d4eda966f82b7eb7a5f81744d989494d26b8e86ac83e866104bf847f3fded537dd386c9b11f897af3d92ee37881eaa0b
-EBUILD nvidia-drivers-96.43.23.ebuild 15282 SHA256 ee3f8a5239d5ec450430ad3893bd727d3b5c0cfafb243cd7b7385e7bf8d729f4 SHA512 7410054bfeaeb7c51057945e9bf5be11a5505737200df7f5dedf385fe9b4c1c80779644ffc463a55d642233a44886e0a9646e4cdb6033b19885b9f5feea0ed0f WHIRLPOOL 09a674e586e770467cc41af828854065554df979c9b77f5edc01e3107a40ce4a632670f08b78458773b5a8bf430118d4993bb2ecbe0e0a147cfe5583349cf8f6
-MISC ChangeLog 86931 SHA256 dd8b65f92e370c5a180a5230275410988defc8d2da824191f42699898c3ff4ab SHA512 037444ef5a5a974c561e421ca81d3afaff7be7e4800e9fa0da85d2695ac5b174d8e6c39f3397b264fb8b8b5af9feba713f0616c49579823e2c8d832ddbcf004e WHIRLPOOL 01a48d0dccaacf6ca23adc4af6d9cd15e913fcc3c117676df8ae45b3270f45f5a28eeb7aea62b5bb49784b6453e5aa9d36a9fa7ae244cc91dcdef8b31f3f7819
+EBUILD nvidia-drivers-173.14.35.ebuild 16728 SHA256 b661b880e4e151badaecb1bc531faaf68d2e9f3b6d29595bfccf9fa28906b406 SHA512 a3eddcd35193a86cbca7c9f8bfcf91ccbef0e21e75d2a792b421b410b4d31b0b878ef87c5fb4505a8b9f5e7597e4b7c1602d1c75f013656391315290da73a0a6 WHIRLPOOL 34dae0ce95a5732f5023f88c3b498b876b9ee18649d62913bb7f813fe197884272d9872226ae0619411087f59a73689bb8a5f64e82fe76f276ad45591e61fb21
+EBUILD nvidia-drivers-173.14.36.ebuild 16727 SHA256 10148fe2463c2156801998cf9fabd5dc78be19343dd2b70847d2f3c03f60cdd8 SHA512 482d1205e8d576b9b6b828d30b5b27bf0a554f5f05495bbf64624dce26729b72975ef6557e0950a09e17ac69a28e1d2e00565758e2212c8a95cc2d7120fed850 WHIRLPOOL 5e14bfa73299968f54b6cd5a51a4121cfbfa335971768da0c09cb48e2d17a7a8a473840146cd26b5782e44fdbc13e46eb120ee166b53beb87de1f86f2b0afeeb
+EBUILD nvidia-drivers-295.71.ebuild 18464 SHA256 62a7647d388479b783557b7022d2c0d118b97d1b1282de369dc25aa80b5e1dab SHA512 75074e3acc93f18dbec869135dc1872a7ba086fcd1d9b4a529181b17cb90d7b6125e4382acdfbd8e2c122dce4c5caabad0c1b827bdec20488b5b8e8a910180a1 WHIRLPOOL c23c0e8d038446976cfa04406ea40a0688c26482241dc359c9d68ce79782f832479230d40450858f5382382825cd0946bb27b6b0a555e4a39b574f9b26b46e39
+EBUILD nvidia-drivers-295.75.ebuild 18452 SHA256 bbd8467ebee9e3e5dfe750fec2cbcd8d259a36bcef26ecd277384f84a0886940 SHA512 46e34c1772b1303db6e4aeacdce8ff1a5e763355ab9ce328952f7b683529b2fad54eb39a8c4f9ec3a826387351dd3f9807956841213cc6a8ed17aa83da2c4c77 WHIRLPOOL 91d847540b612f654933261610e16da1b84197a8c08b981f6e219923865da127a8f718d9f87f56e085a1a03867d919b992b10648f52360c26d6f604803e41c91
+EBUILD nvidia-drivers-304.60.ebuild 12742 SHA256 bb0b4d67e409db094711bacc527612011b516f8061af69c98fafd6ac3d1d3925 SHA512 8270dcf329be9ccef411a9e1859721c679b4d570cf52d8458c0100a5eaeacd9a58ac4dec2380235bdd8c3393216810acf2709fa46668c8b7f1ecf627e2cbbc35 WHIRLPOOL cf29f06c87b12f4206614228d82208ac1a1d0d90770b29cf75d36d348be03c9e82f6f5d275e63db7956ade4eea360d17977f12214cc4a1ca101616ecedece040
+EBUILD nvidia-drivers-304.64.ebuild 12742 SHA256 bae8fe02ef6129f3015c37d976a6812529ca402d34dc17eec4f51f32d8e8d991 SHA512 b2d769d594f39ae0a8afa70f3113b7f4a755925e536fdc2b44c4313059e1eed74146844acf93bbb05da481272d1be897c977726d500cb395b92f796ef39effc8 WHIRLPOOL 9cec9dfa9056512bf4b9e7297cf28e49e3688bc97616dfe62bcb35e0aff84829bdd5213c6e779510e83a5e4a00d493737648f944519b7b7dc18dd58eb9bd325d
+EBUILD nvidia-drivers-310.19.ebuild 12334 SHA256 c39637db1be51e2f7d9a08350f88111ddb807ed2aa363051d45e4aff06941410 SHA512 00d1431f4fd601fe33bc2e0784d2745ac59a269db65ce76753493c4332f9e4a381e6ede795ab6049968a37ce933823f6f701aae2c7a235840c8ee9106e00aef3 WHIRLPOOL 1eeeb052c792328c9367cce1527d47dafc6dfb37836bf6da51a36202285db7f21955b87fd51630467e8de0e7c0358efcbd28049f28182b5cf00e9359f14b5993
+EBUILD nvidia-drivers-96.43.20.ebuild 15342 SHA256 68e599f8e5982747e398ac782647af9e0a9dfc0056f1f3b4b2c138db9df91890 SHA512 c0095b5632ec20784de51f92b45f1b7e4bb65f78659bbe538fc0ed5daf41a39aa9085a37b1e2b95f742bd3899e0c24d1939b6d6e34e67681ad2a3d4406deb99d WHIRLPOOL 6a9490162350f3762f46218e13442d606df691fe0f9d20d7374c8dd4af81e4a53241681495da56e376b07ea4b2acc72d79b1dc7ec93ac4fab6a9acd640fdffd9
+EBUILD nvidia-drivers-96.43.23.ebuild 15344 SHA256 1f59dea1cb862ae607eb3ff5fa262cc91c4ed5ce13b02702e1028ba760581724 SHA512 c7b00042c4a233c6371505a9df13f00094bbca1c183d6ffd468cd4ac1d019116bc8435c4200b9b41dd99e7554f22d5e7ebdae57ecb67ca7de140676b38f9a82d WHIRLPOOL bc7503a5593e828f1a931e5aba8f5c96d9eb29eac3aed978d490e29ad16ad20a60381ca82f4178a0084b4c6ef65dd92c0798c0303bee238869af585e27620b88
+MISC ChangeLog 87328 SHA256 7006effafca264a123211e4f9a1b5f2a6d35fb7e15c3707dad4a2dd15d1bc84e SHA512 bc52ebcef854b0f8680b30da1b87eb0c1acdb071a3fba793d18a31f84a2422b04e8f8415181dc6af7c1525569bb4b54a48e71efaf5cb9afc10e6b08a087e1897 WHIRLPOOL 09f60a5e90d7392c4b87e6342252843613124de69d9eadbacfceddb412773b89b3426aa898e1dda66dee71da201a53e06318bb7a9ee62e85015f684ec5ff5dfd
 MISC metadata.xml 937 SHA256 807dcc6ae2775af89d15e2253a264ea0d24803bd876f93519d9dfa46abcd8c80 SHA512 85a7324e9a065c9bd003e1f9067adf5ad5408cabd5e37480422066fef392da841622aa6049aba0fabe249cc7e5014d4cb8435e4ad8507645802fad48f2021af9 WHIRLPOOL e87f8890be0329cffefc58b491cde96920344b0cfec5b04589dfd49f3805250c6ff7ecff2e8709fc930b7b77a32ff65ca530596ea521aaf9e97b6f82ccbc6e01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQx09aAAoJEEdUh39IaPFN6cAIAJMcIFAXO0swQhDlHqX37TGC
-3mlB9pU3RM5MN5RaXEQwFBFmi1fRdBb0LzWsJy8918qr7QNNEBHJERBPmaZ/kOL+
-IhUGO9fi0VIkv+scVUJQK12wHMPaEeUlJ0YN54wnwXhGHxcjCwOtjr5ptOIZn9k4
-w6j1HoodEHxqzg9v2mM8JMmX+EkGjaHQZOT5MIyJSbH5zgiql7Q9U8jQEZLDAqCB
-6XvMtHDGzzlWGFM7Gc9Gu9eX72S51KpY5nyAjGW3eMBS390wZMkJhLRCNjEJJnvZ
-sG1CZncIefFD1Sm6OBdZpHUN6VcqpHIlgvIYUd1R1cB4xWxjR0wvG/2VBpjW9MM=
-=F6T5
+iQEcBAEBCAAGBQJQ0fC0AAoJEJ0WA1zPCt1hilwH/jy6h+S24FHgwLrtd7YhLb6k
+YTCcxiP7ZevtwiXYQ10eObcnhTrqNANmmedmfrIJmoSsQSgd6vskuPlesMwK+cu2
+9R2f7S+0brdnRBVOQpoP4bRwdeaD7JtJpS611+ulPM9Jmrgnti1DPx7bDwHNXjTj
+Jd0hKtwrVGR/f0dPpjkd48a8RFj/jNEZVt/wipGnN7kQuBDT6AhW6HU0nYT/k8Fg
+GRA/qJx2qoGglUbb6hhklCu+6K2f0rqJa4KNhTFVIgJ2EWUvq6m6JVv8gQVjQJhP
+T682zW69SYo+GZ4OAmdnsJ0mVeHYpTKaPv8Ek27d1tsBJBv+tcNJr1MzZTFaEQg=
+=WRVJ
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
index 0a19f38b3a62..2f3057eae681 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.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/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.9 2012/09/24 00:48:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.10 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI="2"
 
@@ -40,6 +40,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild
index 9332a1c99387..1035346d360a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.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/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild,v 1.3 2012/11/18 11:18:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild,v 1.4 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI="2"
 
@@ -40,6 +40,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
index fe493d8cebc8..78765a74cf78 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.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/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.7 2012/12/11 15:20:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.8 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI="2"
 
@@ -44,6 +44,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild
index c926bb093ef2..5c3658813c75 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.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/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild,v 1.4 2012/12/11 15:20:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.75.ebuild,v 1.5 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI="2"
 
@@ -44,6 +44,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild
index bd95c67746bb..07fe1acf8e16 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.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/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild,v 1.4 2012/12/11 15:20:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.60.ebuild,v 1.5 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI=4
 
@@ -48,6 +48,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	X? ( x11-libs/libXvMC )"
 PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild
index 003272cc9eec..757a7ff27925 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.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/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild,v 1.3 2012/12/11 15:20:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.64.ebuild,v 1.4 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI=4
 
@@ -48,6 +48,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	X? ( x11-libs/libXvMC )"
 PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild
index 19bb70528dad..b050cc07db24 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.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/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild,v 1.3 2012/12/11 15:20:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-310.19.ebuild,v 1.4 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI=4
 
@@ -47,6 +47,7 @@ RDEPEND="${COMMON}
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	X? ( >=x11-libs/libvdpau-0.3-r1 )"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
index 4a0841ec83c3..9130e13e3233 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.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/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.11 2012/09/24 00:48:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.12 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI="2"
 
@@ -34,6 +34,7 @@ COMMON="<x11-base/xorg-server-1.11
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-opengl )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
index 193b91ab6fca..015b104b101c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.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/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.5 2012/11/19 15:11:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.6 2012/12/19 16:52:01 tetromino Exp $
 
 EAPI="2"
 
@@ -34,6 +34,7 @@ COMMON="<x11-base/xorg-server-1.12.99
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-opengl )