diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-14 22:13:00 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-14 22:13:00 +0000 |
| commit | 29d59d06ba31b02692ecc9d73a27707c626d8f25 (patch) | |
| tree | 302f7a01127962bf332ad6104d8fb380af035d16 /x11-drivers | |
| parent | sci-libs/scikits_learn: Version BUmp (diff) | |
| download | gentoo-2-29d59d06ba31b02692ecc9d73a27707c626d8f25.tar.gz gentoo-2-29d59d06ba31b02692ecc9d73a27707c626d8f25.tar.bz2 gentoo-2-29d59d06ba31b02692ecc9d73a27707c626d8f25.zip | |
Add missing GTK+ support library for nvidia-settings.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/metadata.xml | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild | 14 |
3 files changed, 17 insertions, 5 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 403c1cdad4b5..45f2afd62587 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.589 2014/11/14 14:25:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.590 2014/11/14 22:13:00 jer Exp $ + + 14 Nov 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-346.16.ebuild, + metadata.xml: + Add missing GTK+ support library for nvidia-settings. *nvidia-drivers-346.16 (14 Nov 2014) diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml index 6932f5df6a0c..d4fc77506799 100644 --- a/x11-drivers/nvidia-drivers/metadata.xml +++ b/x11-drivers/nvidia-drivers/metadata.xml @@ -6,6 +6,8 @@ </maintainer> <use> <flag name='X'>Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag> + <flag name='gtk2'>Install nvidia-settings with support for GTK+ 2</flag> + <flag name='gtk3'>Install nvidia-settings with support for GTK+ 3</flag> <flag name='pax_kernel'>PaX patches from the PaX project</flag> <flag name='tools'>Install additional tools such as nvidia-settings</flag> <flag name='uvm'>Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag> diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild index e0277cb984c2..2409567fd3fb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v 1.1 2014/11/14 14:25:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v 1.2 2014/11/14 22:13:00 jer Exp $ EAPI=5 @@ -25,7 +25,7 @@ SRC_URI=" LICENSE="GPL-2 NVIDIA-r2" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm" +IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" @@ -48,7 +48,8 @@ RDEPEND=" dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.4:2 + gtk2? ( >=x11-libs/gtk+-2.4:2 ) + gtk3? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] @@ -68,7 +69,10 @@ RDEPEND=" ) " -REQUIRED_USE="tools? ( X )" +REQUIRED_USE=" + tools? ( X ) + X? ( || ( gtk2 gtk3 ) ) +" QA_PREBUILT="opt/* usr/lib*" @@ -339,6 +343,8 @@ src_install() { if use tools; then doexe ${NV_OBJ}/nvidia-settings + use gtk2 && donvidia libnvidia-gtk2.so ${PV} + use gtk3 && donvidia libnvidia-gtk3.so ${PV} insinto /usr/share/nvidia/ doins nvidia-application-profiles-${PV}-key-documentation insinto /etc/nvidia |