Set reasonable choice of USE=gtk2 or gtk3 for nvidia-drivers depending on profile...

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8b0dbc0c9479a7ecbd64187dc5783f3af14a9f9d..83297d80a9b0c8707a83a7246d77bd2e7ed93ebb 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9798 2015/02/18 13:15:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9799 2015/02/19 02:58:01 tetromino Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  19 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  targets/desktop/gnome/package.use, targets/desktop/package.use:
+  Set reasonable choice of USE=gtk2 or gtk3 for nvidia-drivers depending on
+  profile so average users aren't forced to choose manually to avoid emerge
+  failure
+
   18 Feb 2015; Bernard Cafarelli <voyageur@gentoo.org> package.mask:
   Mask sys-devel/llvm-3.6.0_rc* ebuilds
 

diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index fb3f696336dd43e845429e63a7edba31f1a56050..eb42438939729fefe3e7d8f11babcabb1cf64c1b 100644 (file)
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.28 2014/06/29 00:41:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.29 2015/02/19 02:58:02 tetromino Exp $
 
 # For eautoreconf in =app-crypt/seahorse-3.10.2-r1
 app-crypt/gcr vala
@@ -78,3 +78,8 @@ www-servers/apache apache2_modules_dav apache2_modules_dav_fs apache2_modules_au
 
 # Required by app-admin/sabayon
 x11-base/xorg-server kdrive
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
+# Set reasonable default toolkit for gnome users to prevent emerge error
+# when USE=tools
+x11-drivers/nvidia-drivers -gtk2 gtk3

diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index b2047fe1013b7b294972e0b4b02868647693164f..c64df0d32f8ebe9868a6af15a5d2c97da33f7b31 100644 (file)
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.42 2015/02/18 05:17:33 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.43 2015/02/19 02:58:02 tetromino Exp $
+
+# Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
+# Set reasonable default toolkit for all desktops to prevent emerge error
+# when USE=tools
+x11-drivers/nvidia-drivers gtk2
 
 # Ben de Groot <yngwin@gentoo.org> (18 Feb 2015)
 # Enable sensible defaults for desktop users (bug #540046)