From a3e7dd1e2868b4b1d8fbb47ae6a7c5d774b78208 Mon Sep 17 00:00:00 2001
From: root <support@calculate.ru>
Date: Thu, 10 Feb 2011 10:05:59 +0300
Subject: [PATCH] Updated profile CLD/grp/i686

---
 .../desktop/CLD/x86/binary/package.mask       | 24 ++---------------
 .../desktop/CLD/x86/binary/package.unmask     | 26 +++----------------
 2 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/profiles/calculate/desktop/CLD/x86/binary/package.mask b/profiles/calculate/desktop/CLD/x86/binary/package.mask
index 3463f1633..9cef6a572 100644
--- a/profiles/calculate/desktop/CLD/x86/binary/package.mask
+++ b/profiles/calculate/desktop/CLD/x86/binary/package.mask
@@ -105,7 +105,7 @@ app-misc/strigi
 app-mobilephone/obex-data-server
 app-mobilephone/obexd
 app-office/akonadi-server
-app-office/openoffice
+app-office/libreoffice
 app-pda/libimobiledevice
 app-pda/libplist
 app-pda/usbmuxd
@@ -136,7 +136,6 @@ app-text/iso-codes
 app-text/ispell
 app-text/libpaper
 app-text/libspectre
-app-text/libwpd
 app-text/poppler
 app-text/recode
 app-text/rman
@@ -147,28 +146,12 @@ app-vim/gentoo-syntax
 app-vim/vimcommander
 dev-cpp/clucene
 dev-cpp/eigen
-dev-db/hsqldb
 dev-db/libiodbc
 dev-db/mysql
 dev-db/mysql-init-scripts
 dev-db/sqlite
 dev-db/virtuoso-odbc
 dev-db/virtuoso-server
-dev-java/ant-core
-dev-java/ant-nodeps
-dev-java/bsh
-dev-java/icedtea6-bin
-dev-java/java-config
-dev-java/java-config-wrapper
-dev-java/javacc
-dev-java/javatoolkit
-dev-java/junit
-dev-java/libreadline-java
-dev-java/lucene
-dev-java/lucene-analyzers
-dev-java/rhino
-dev-java/servletapi
-dev-java/tomcat-servlet-api
 dev-lang/nasm
 dev-lang/perl
 dev-lang/python
@@ -283,6 +266,7 @@ dev-util/bin_replace_string
 dev-util/boost-build
 dev-util/chromium-tools
 dev-util/cmake
+dev-util/cppunit
 dev-util/ctags
 dev-util/desktop-file-utils
 dev-util/dialog
@@ -297,7 +281,6 @@ gnome-base/gnome-common
 gnome-base/libglade
 gnome-base/librsvg
 gnome-extra/libgsf
-java-virtuals/servlet-api
 kde-base/activitymanager
 kde-base/akonadi
 kde-base/akregator
@@ -551,7 +534,6 @@ media-libs/libv4l
 media-libs/libvorbis
 media-libs/libvpx
 media-libs/libwmf
-media-libs/libwpg
 media-libs/mediastreamer
 media-libs/mesa
 media-libs/mlt
@@ -852,9 +834,7 @@ virtual/editor
 virtual/eject
 virtual/glu
 virtual/init
-virtual/jdk
 virtual/jpeg
-virtual/jre
 virtual/libffi
 virtual/libiconv
 virtual/libintl
diff --git a/profiles/calculate/desktop/CLD/x86/binary/package.unmask b/profiles/calculate/desktop/CLD/x86/binary/package.unmask
index ca8494c00..390e104db 100644
--- a/profiles/calculate/desktop/CLD/x86/binary/package.unmask
+++ b/profiles/calculate/desktop/CLD/x86/binary/package.unmask
@@ -88,7 +88,7 @@
 =app-misc/cl-multimedia-meta-11.0-r2
 =app-misc/cl-nettools-meta-11.0-r5
 =app-misc/cl-network-meta-11.0-r5
-=app-misc/cl-office-meta-11.0-r6
+=app-misc/cl-office-meta-11.0-r7
 =app-misc/cl-printer-meta-11.0-r3
 =app-misc/cl-tools-meta-11.0-r7
 =app-misc/cl-wireless-meta-10.9-r3
@@ -105,7 +105,7 @@
 =app-mobilephone/obex-data-server-0.4.5
 =app-mobilephone/obexd-0.37
 =app-office/akonadi-server-1.5.0
-=app-office/openoffice-3.2.1-r1
+=app-office/libreoffice-3.3.0
 =app-pda/libimobiledevice-1.0.2
 =app-pda/libplist-1.3
 =app-pda/usbmuxd-1.0.4
@@ -136,7 +136,6 @@
 =app-text/ispell-3.3.02-r1
 =app-text/libpaper-1.1.23
 =app-text/libspectre-0.2.5
-=app-text/libwpd-0.8.14
 =app-text/poppler-0.14.5
 =app-text/recode-3.6_p17-r2
 =app-text/rman-3.2
@@ -147,28 +146,12 @@
 =app-vim/vimcommander-80
 =dev-cpp/clucene-0.9.21b-r1
 =dev-cpp/eigen-2.0.13
-=dev-db/hsqldb-1.8.1.2-r1
 =dev-db/libiodbc-3.52.7
 =dev-db/mysql-5.1.51
 =dev-db/mysql-init-scripts-1.2
 =dev-db/sqlite-3.7.2
 =dev-db/virtuoso-odbc-6.1.2
 =dev-db/virtuoso-server-6.1.2
-=dev-java/ant-core-1.8.1
-=dev-java/ant-nodeps-1.8.1
-=dev-java/bsh-2.0_beta4-r3
-=dev-java/icedtea6-bin-1.9.5
-=dev-java/java-config-2.1.11-r3
-=dev-java/java-config-wrapper-0.16
-=dev-java/javacc-4.2
-=dev-java/javatoolkit-0.3.0-r4
-=dev-java/junit-3.8.2-r1
-=dev-java/libreadline-java-0.8.0-r3
-=dev-java/lucene-2.3.2
-=dev-java/lucene-analyzers-2.3.2
-=dev-java/rhino-1.5.5-r4
-=dev-java/servletapi-2.4-r5
-=dev-java/tomcat-servlet-api-4.1.36
 =dev-lang/nasm-2.08.02
 =dev-lang/perl-5.12.2-r6
 =dev-lang/python-2.6.6-r1
@@ -283,6 +266,7 @@
 =dev-util/boost-build-1.42.0
 =dev-util/chromium-tools-0.1.6
 =dev-util/cmake-2.8.1-r2
+=dev-util/cppunit-1.12.1
 =dev-util/ctags-5.7
 =dev-util/desktop-file-utils-0.17
 =dev-util/dialog-1.1.20080819
@@ -297,7 +281,6 @@
 =gnome-base/libglade-2.6.4
 =gnome-base/librsvg-2.26.3
 =gnome-extra/libgsf-1.14.18
-=java-virtuals/servlet-api-2.3
 =kde-base/activitymanager-4.6.0
 =kde-base/akonadi-4.4.9
 =kde-base/akregator-4.4.10
@@ -551,7 +534,6 @@
 =media-libs/libvorbis-1.3.1
 =media-libs/libvpx-0.9.5-r1
 =media-libs/libwmf-0.2.8.4-r3
-=media-libs/libwpg-0.1.3
 =media-libs/mediastreamer-2.6.0
 =media-libs/mesa-7.9.1
 =media-libs/mlt-0.5.10
@@ -852,9 +834,7 @@
 =virtual/eject-0
 =virtual/glu-7.0
 =virtual/init-0
-=virtual/jdk-1.6.0
 =virtual/jpeg-0
-=virtual/jre-1.6.0
 =virtual/libffi-0
 =virtual/libiconv-0
 =virtual/libintl-0