From b892b0c945efcdb667f299659b6a6cd920453c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <atratsevskiy@atratsevskiy.local.calculate.ru>
Date: Wed, 18 Nov 2009 11:06:51 +0300
Subject: [PATCH] Modify USE flags in profiles

---
 profiles/calculate/desktop/CLD/make.defaults |  1 +
 profiles/calculate/desktop/make.defaults     |  5 ++++-
 profiles/calculate/make.defaults             | 15 +++++----------
 profiles/calculate/server/make.defaults      |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/profiles/calculate/desktop/CLD/make.defaults b/profiles/calculate/desktop/CLD/make.defaults
index 4790c98a9..e61ce9d07 100644
--- a/profiles/calculate/desktop/CLD/make.defaults
+++ b/profiles/calculate/desktop/CLD/make.defaults
@@ -3,6 +3,7 @@ USE="lirc"
 
 # Network protocols
 USE="${USE} ldap rdesktop"
+
 # Sql support
 USE="${USE} mysql"
 #USE="${USE} postgres"
diff --git a/profiles/calculate/desktop/make.defaults b/profiles/calculate/desktop/make.defaults
index f2a4ac1ec..8da6ff1af 100644
--- a/profiles/calculate/desktop/make.defaults
+++ b/profiles/calculate/desktop/make.defaults
@@ -7,11 +7,14 @@ USE="${USE} alsa -arts audiofile id3tag flac mad mp3 mpeg nas ogg oggvorbis open
 # CD and DVD
 USE="${USE} cdparanoia cdr dvd dvdr dvdread vcd"
 
+# Documentation format
+USE="chm djvu ebook"
+
 # Guard and security
 USE="${USE} clamav crypt ssl"
 
 # Hardware
-USE="${USE} 3dnow acpi cairo dbus dri hal ieee1394 mmx mmxext nvidia opengl scanner smp sse sse2 sse3 sse4.1 sse4.2 sse4a sse5 ssse3 usb xcomposite"
+USE="${USE} 3dnow acpi cairo dbus dri hal ieee1394 mmxext nvidia opengl scanner smp sse3 sse4.1 sse4.2 sse4a sse5 usb xcomposite"
 
 #USE="${USE} apm bluetooth"
 
diff --git a/profiles/calculate/make.defaults b/profiles/calculate/make.defaults
index e4c7be896..050f258e6 100644
--- a/profiles/calculate/make.defaults
+++ b/profiles/calculate/make.defaults
@@ -1,32 +1,27 @@
-# Documentation format
-USE="chm djvu ebook"
-
 # Locale and Fonts
-USE="${USE} truetype nls slang unicode userlocales"
+USE="${USE} truetype slang userlocales"
 
 # Mail
 USE="${USE} -mailwrapper"
 
 # Net protocols
-USE="${USE} bittorrent ftp ipv6 nfs samba"
+USE="${USE} bittorrent ftp nfs samba"
 
 # Printing
-USE="${USE} cups foomaticdb" 
+USE="${USE} foomaticdb" 
 
 # System
-USE="${USE} logrotate nptl nptlonly"
+USE="${USE} logrotate"
 
 CXXFLAGS="${CFLAGS}"
-ALSA_CARDS="ca0106 emu10k1 hda-intel intel8x0 intel8x0m pcsp via82xx"
 AUTOCLEAN="yes"
 CAMERAS="*"
 DISTDIR="/usr/calculate/share/distfiles"
 FEATURES="parallel-fetch"
 FOO2ZJS_DEVICES="*"
-INPUT_DEVICES="keyboard mouse evdev synaptics"
+INPUT_DEVICES="${INPUT_DEVICES} synaptics"
 LINGUAS="en de es fr it pl pt_BR ru uk"
 LDFLAGS="-Wl,--as-needed"
 PORTAGE_NICENESS=19
 PORTAGE_TMPDIR="/var/calculate/tmp"
-VIDEO_CARDS="fbdev glint i810 intel mach64 mga neomagic nv radeon savage tdfx trident vesa vga via vmware"
 
diff --git a/profiles/calculate/server/make.defaults b/profiles/calculate/server/make.defaults
index 8582e03a6..a030732b4 100644
--- a/profiles/calculate/server/make.defaults
+++ b/profiles/calculate/server/make.defaults
@@ -1,5 +1,5 @@
 # Guard and Security
-USE="hardened kerberos sasl system"
+#USE="hardened kerberos sasl system"
 
 # Image
 USE="${USE} exif gif jpeg jpeg2k png tiff"