summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-11-15 17:44:35 +0000
committerJeroen Roovers <jer@gentoo.org>2014-11-15 17:44:35 +0000
commitd0004b5c1daf2125b3b819666be697dd9731a425 (patch)
treeafdcecd3d2d3f0726325e24a5265db15ed849ac6 /x11-drivers
parentRun some eclass _src_prepare() (bug #529364). (diff)
downloadgentoo-2-d0004b5c1daf2125b3b819666be697dd9731a425.tar.gz
gentoo-2-d0004b5c1daf2125b3b819666be697dd9731a425.tar.bz2
gentoo-2-d0004b5c1daf2125b3b819666be697dd9731a425.zip
Change REQUIRED_USE X? ( || ( gtk2 gtk3 ) ) to tools? ( || ( gtk gtk3 ) ) (bug #529362 by bwcknr).
(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/ChangeLog6
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild13
2 files changed, 11 insertions, 8 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 7462006b2a8f..b9cb69a55830 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.592 2014/11/14 22:42:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.593 2014/11/15 17:44:35 jer Exp $
+
+ 15 Nov 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-346.16.ebuild:
+ Change REQUIRED_USE X? ( || ( gtk2 gtk3 ) ) to tools? ( || ( gtk gtk3 ) )
+ (bug #529362 by bwcknr).
14 Nov 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-346.16.ebuild:
Set sub-SLOT dependency on x11-base/xorg-server. Install nvidia-drm-
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild
index 8c56463037b7..06266d5a4ec3 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.4 2014/11/14 22:42:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v 1.5 2014/11/15 17:44:35 jer Exp $
EAPI=5
@@ -25,10 +25,14 @@ 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 gtk2 gtk3 +X uvm"
RESTRICT="bindist mirror strip"
EMULTILIB_PKG="true"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+ tools? ( X || ( gtk2 gtk3 ) )
+"
+
COMMON="
app-admin/eselect-opencl
kernel_linux? ( >=sys-libs/glibc-2.6.1 )
@@ -69,11 +73,6 @@ RDEPEND="
)
"
-REQUIRED_USE="
- tools? ( X )
- X? ( || ( gtk2 gtk3 ) )
-"
-
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/