From 32469d8fa0891c74a3736c4ab2ecfac27627286e Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Fri, 1 Dec 2017 10:04:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=84=D0=BB=D0=B0=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 profiles/base/desktop/make.defaults      | 3 ---
 profiles/base/desktop/package.use        | 2 ++
 profiles/base/package.keywords/default   | 3 +++
 profiles/base/package.unmask/default     | 4 ----
 profiles/base/package.use/exactly-one-of | 6 ------
 profiles/base/package.use/required-by    | 3 ---
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/profiles/base/desktop/make.defaults b/profiles/base/desktop/make.defaults
index ae6f09bd4..bff5e3c94 100644
--- a/profiles/base/desktop/make.defaults
+++ b/profiles/base/desktop/make.defaults
@@ -1,5 +1,2 @@
 PORTAGE_NICENESS="19"
 PORTAGE_IONICE_COMMAND="ionice -c 3 -p \${PID}"
-
-#
-USE="${USE} -python_single_target_python3_4"
diff --git a/profiles/base/desktop/package.use b/profiles/base/desktop/package.use
index fbb02f957..9d79f635f 100644
--- a/profiles/base/desktop/package.use
+++ b/profiles/base/desktop/package.use
@@ -4,3 +4,5 @@ sys-apps/calculate-utils backup client desktop console qt4
 # Calculate themes dependence
 sys-kernel/calculate-sources themes
 
+###
+media-sound/audacious -gtk qt5
diff --git a/profiles/base/package.keywords/default b/profiles/base/package.keywords/default
index ddd070a29..418fabc73 100644
--- a/profiles/base/package.keywords/default
+++ b/profiles/base/package.keywords/default
@@ -113,8 +113,10 @@
 ~media-libs/mesa-17.2.6 amd64 x86
 ~media-libs/phonon-4.9.0 amd64 x86
 ~media-libs/phonon-gstreamer-4.9.0 amd64 x86
+~media-plugins/audacious-plugins-3.9 amd64 x86
 ~media-plugins/kipi-plugins-5.5.0 amd64 x86
 ~media-plugins/qmmp-plugin-pack-1.2.0 amd64 x86
+~media-sound/audacious-3.9 amd64 x86
 ~media-sound/bluez-alsa-1.2.0 amd64 x86
 ~media-sound/cantata-2.1.0 amd64 x86
 ~media-sound/clementine-1.3.1 amd64 x86
@@ -236,6 +238,7 @@
 ~x11-plugins/pidgin-mpris-0.2.6 amd64 x86
 ~x11-terms/qterminal-0.7.1 amd64 x86
 ~x11-terms/roxterm-3.1.5 amd64 x86
+~x11-themes/audacious-themes-0.0.4 amd64 x86
 ~x11-themes/mate-themes-3.22.7 amd64 x86
 ~x11-themes/mate-themes-meta-3 amd64 x86
 ~x11-themes/pidgin-penguins-smileys-1.0 amd64 x86
diff --git a/profiles/base/package.unmask/default b/profiles/base/package.unmask/default
index 110ab3d2f..fa6816970 100644
--- a/profiles/base/package.unmask/default
+++ b/profiles/base/package.unmask/default
@@ -1,5 +1 @@
 sys-apps/v86d
-
-media-sound/audacious
-media-plugins/audacious-plugins
-x11-themes/audacious-themes
diff --git a/profiles/base/package.use/exactly-one-of b/profiles/base/package.use/exactly-one-of
index 83aba9290..6f9eea8ea 100644
--- a/profiles/base/package.use/exactly-one-of
+++ b/profiles/base/package.use/exactly-one-of
@@ -8,12 +8,6 @@ app-accessibility/julius -pulseaudio
 x11-terms/qterminal qt5
 x11-libs/qtermwidget qt5
 
-# exactly-one-of
-media-video/openshot python_single_target_python3_4
-
-# exactly-one-of
-app-editors/gedit python_single_target_python3_4
-
 # hcache? ( exactly-one-of ( berkdb gdbm lmdb qdbm tokyocabinet )
 mail-client/mutt -gdbm
 
diff --git a/profiles/base/package.use/required-by b/profiles/base/package.use/required-by
index bc8246cf7..40380e035 100644
--- a/profiles/base/package.use/required-by
+++ b/profiles/base/package.use/required-by
@@ -295,9 +295,6 @@ sys-fs/lvm2 thin
 # required by media-gfx/simple-scan-3.18.2
 dev-libs/libgusb vala
 
-# required by media-video/openshot-2.0.7-r1
-media-libs/libopenshot python_single_target_python3_4
-
 # required by sci-visualization/qtiplot-0.9.8.9-r3
 dev-libs/quazip qt4