Depend on x11-libs/pango[X] when installing nvidia-settings, by Nicolas Bigaouette (bug #430760).

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

8 files changed, 22 insertions, 15 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 6274b19b587e..d4968c3750b3 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # 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.379 2012/08/10 11:32:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.380 2012/08/10 14:40:54 jer Exp $
+
+  10 Aug 2012; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.20.ebuild,
+  nvidia-drivers-173.14.35.ebuild, nvidia-drivers-295.59.ebuild,
+  nvidia-drivers-295.59-r1.ebuild, nvidia-drivers-295.71.ebuild,
+  nvidia-drivers-302.17-r1.ebuild, nvidia-drivers-304.22.ebuild:
+  Depend on x11-libs/pango[X] when installing nvidia-settings, by Nicolas
+  Bigaouette (bug #430760).
 
   10 Aug 2012; Jeroen Roovers <jer@gentoo.org> files/nvidia-autostart.desktop:
   Fix quoting to satisfy desktop-file-validate.
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 5742a2de37a2..83f8fa1a5ec5 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.7 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.8 2012/08/10 14:40:54 jer Exp $
 
 EAPI="2"
 
@@ -39,7 +39,7 @@ RDEPEND="${COMMON}
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild
index 61b629961ae3..643c0bb1e63a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.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.59-r1.ebuild,v 1.4 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.59-r1.ebuild,v 1.5 2012/08/10 14:40:54 jer Exp $
 
 EAPI="2"
 
@@ -46,7 +46,7 @@ RDEPEND="${COMMON}
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.59.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.59.ebuild
index 2d97265725ea..f7b796a46a0b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.59.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.59.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.59.ebuild,v 1.5 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.59.ebuild,v 1.6 2012/08/10 14:40:54 jer Exp $
 
 EAPI="2"
 
@@ -43,7 +43,7 @@ RDEPEND="${COMMON}
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild
index 67671b8eb099..67441c94311d 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.2 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.3 2012/08/10 14:40:54 jer Exp $
 
 EAPI="2"
 
@@ -43,7 +43,7 @@ RDEPEND="${COMMON}
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
index bb70db0872fa..c9c34bb20b9e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.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-302.17-r1.ebuild,v 1.4 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-302.17-r1.ebuild,v 1.5 2012/08/10 14:40:54 jer Exp $
 
 EAPI="2"
 
@@ -46,7 +46,7 @@ RDEPEND="${COMMON}
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild
index 2980d12377eb..217fa62f8f59 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.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.22.ebuild,v 1.10 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild,v 1.11 2012/08/10 14:40:54 jer Exp $
 
 EAPI=4
 
@@ -47,7 +47,7 @@ RDEPEND="${COMMON}
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)
 	X? ( x11-libs/libXvMC )"
 PDEPEND="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 debe2ae0ebd4..7df8be63cace 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.9 2012/08/10 11:28:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.10 2012/08/10 14:40:54 jer Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@ COMMON="<x11-base/xorg-server-1.11
 		x11-libs/gtk+:2
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/pango
+		x11-libs/pango[X]
 	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-opengl )