Depend on pangox-compat if using pango-1.32.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

10 files changed, 27 insertions, 10 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/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 )