From 206e7b5495e1b12558685ae794a85a589b346fa3 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?= Date: Tue, 15 Dec 2020 10:09:44 +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/default/desktop/make.defaults | 3 ++ profiles/default/make.defaults | 3 -- profiles/default/package.use/abi_x86_32 | 16 -------- profiles/default/package.use/any-of | 6 --- profiles/default/package.use/at-most-one-of | 4 -- .../default/package.use/circular-dependencies | 2 - profiles/default/package.use/default | 40 +------------------ profiles/default/server/make.defaults | 3 -- 8 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 profiles/default/package.use/circular-dependencies diff --git a/profiles/default/desktop/make.defaults b/profiles/default/desktop/make.defaults index bff5e3c94..1d6852166 100644 --- a/profiles/default/desktop/make.defaults +++ b/profiles/default/desktop/make.defaults @@ -1,2 +1,5 @@ +# Python +USE="${USE} python_targets_python3_7 python_targets_python3_8 python_single_target_python3_8" + PORTAGE_NICENESS="19" PORTAGE_IONICE_COMMAND="ionice -c 3 -p \${PID}" diff --git a/profiles/default/make.defaults b/profiles/default/make.defaults index 0c037c53f..13cb6b5b8 100644 --- a/profiles/default/make.defaults +++ b/profiles/default/make.defaults @@ -51,9 +51,6 @@ USE="${USE} gphoto2" # Printing USE="${USE} cups foomaticdb" -# Python -USE="${USE} python_targets_python3_7 python_targets_python3_8 python_single_target_python3_8" - # System USE="${USE} caps cgroups elogind introspection logrotate lz4 lzo networkmanager nsplugin pgo policykit threads udisks zstd" diff --git a/profiles/default/package.use/abi_x86_32 b/profiles/default/package.use/abi_x86_32 index 43f4c0ec4..c39045cef 100644 --- a/profiles/default/package.use/abi_x86_32 +++ b/profiles/default/package.use/abi_x86_32 @@ -5,8 +5,6 @@ app-arch/lz4 abi_x86_32 app-arch/zstd abi_x86_32 app-crypt/p11-kit abi_x86_32 app-emulation/wine-gecko abi_x86_32 -dev-db/mariadb abi_x86_32 -dev-db/mysql abi_x86_32 dev-db/mysql-connector-c abi_x86_32 dev-db/sqlite abi_x86_32 dev-lang/orc abi_x86_32 @@ -39,17 +37,9 @@ dev-libs/ocl-icd abi_x86_32 dev-libs/openssl abi_x86_32 dev-libs/popt abi_x86_32 dev-libs/wayland abi_x86_32 -dev-qt/qtcore abi_x86_32 -dev-qt/qtdbus abi_x86_32 -dev-qt/qtgui abi_x86_32 -dev-qt/qtscript abi_x86_32 -dev-qt/qtsql abi_x86_32 -dev-qt/qtwebkit abi_x86_32 -dev-qt/qtxmlpatterns abi_x86_32 dev-util/glslang abi_x86_32 dev-util/pkgconfig abi_x86_32 dev-util/spirv-tools abi_x86_32 -ev-libs/libunistring abi_x86_32 games-emulation/gens abi_x86_32 gnome-base/librsvg abi_x86_32 media-gfx/graphite2 abi_x86_32 @@ -88,7 +78,6 @@ media-libs/libsdl2 abi_x86_32 media-libs/libsdl abi_x86_32 media-libs/libsndfile abi_x86_32 media-libs/libtheora abi_x86_32 -media-libs/libtxc_dxtn abi_x86_32 media-libs/libv4l abi_x86_32 media-libs/libvorbis abi_x86_32 media-libs/libvpx abi_x86_32 @@ -148,7 +137,6 @@ sys-libs/ncurses abi_x86_32 sys-libs/pam abi_x86_32 sys-libs/readline abi_x86_32 sys-libs/zlib abi_x86_32 -virtual/ffmpeg abi_x86_32 virtual/glu abi_x86_32 virtual/jpeg abi_x86_32 virtual/libcrypt abi_x86_32 @@ -156,14 +144,10 @@ virtual/libelf abi_x86_32 virtual/libffi abi_x86_32 virtual/libiconv abi_x86_32 virtual/libintl abi_x86_32 -virtual/libmysqlclient abi_x86_32 virtual/libudev abi_x86_32 virtual/libusb abi_x86_32 -virtual/mysql abi_x86_32 virtual/opencl abi_x86_32 virtual/opengl abi_x86_32 -virtual/pam abi_x86_32 -virtual/pkgconfig abi_x86_32 virtual/rust abi_x86_32 x11-base/xcb-proto abi_x86_32 x11-libs/cairo abi_x86_32 diff --git a/profiles/default/package.use/any-of b/profiles/default/package.use/any-of index 4490ea7f5..307eeac68 100644 --- a/profiles/default/package.use/any-of +++ b/profiles/default/package.use/any-of @@ -28,12 +28,6 @@ games-action/descent3-demo alsa -pulseaudio # any-of ( mysql postgres sqlite ) mail-client/roundcube postgres -sqlite -# any-of ( kvm xen lxc ) -app-emulation/ganeti lxc - -# any-of ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 ) -net-wireless/uhd b100 b200 e300 mpmd n230 usrp1 usrp2 x300 - # any-of ( mysql postgres sqlite ) sys-cluster/placement sqlite diff --git a/profiles/default/package.use/at-most-one-of b/profiles/default/package.use/at-most-one-of index 61a81a3b1..42d46d0c5 100644 --- a/profiles/default/package.use/at-most-one-of +++ b/profiles/default/package.use/at-most-one-of @@ -1,7 +1,3 @@ -# at-most-one-of ( gtk gtk3 qt5 ) -media-plugins/audacious-plugins qt5 -gtk -gtk3 -media-sound/audacious qt5 -gtk -gtk3 - # at-most-one-of ( gtk sdl ) app-emulation/vice -sdl diff --git a/profiles/default/package.use/circular-dependencies b/profiles/default/package.use/circular-dependencies deleted file mode 100644 index 392f03d7b..000000000 --- a/profiles/default/package.use/circular-dependencies +++ /dev/null @@ -1,2 +0,0 @@ -# circular dependencies -sci-biology/bioperl minimal diff --git a/profiles/default/package.use/default b/profiles/default/package.use/default index b93c4ab70..762951b5a 100644 --- a/profiles/default/package.use/default +++ b/profiles/default/package.use/default @@ -3,7 +3,7 @@ dev-vcs/git cgi curl perl webdav mail-mta/postfix ldap sasl dovecot-sasl net-dns/bind ldap sdb-ldap dlz net-im/ejabberd ldap sqlite -net-mail/dovecot pop3d ldap sieve managesieve +net-mail/dovecot ldap sieve managesieve net-nds/openldap syslog -sasl net-proxy/squid ldap net-ftp/proftpd -ipv6 -acl ldap openssl @@ -64,9 +64,6 @@ www-client/uget aria2 # install legacy rule generator rules and support scripts sys-fs/eudev rule-generator -# use x86emu for Video BIOS calls (32 bit) -sys-apps/v86d x86emu - # enable support for Media Transfer Protocol kde-apps/kio-extras mtp @@ -95,9 +92,6 @@ net-firewall/ipset -modules # support/bindings for the Python language sys-fs/cryptsetup python -# add support for the postgresql database -app-backup/holland postgres -mysql - # build for use with thread-capable perl www-apache/mod_perl ithreads @@ -149,12 +143,8 @@ kde-apps/dolphin thumbnail kde-apps/gwenview kipi semantic-desktop # enable support for mobile broadband devices -kde-misc/plasma-nm modemmanager kde-plasma/plasma-nm modemmanager openconnect -# enable support for mobile broadband devices -net-libs/libnm-qt modemmanager - # add support for access point mode net-wireless/wpa_supplicant ap @@ -218,9 +208,6 @@ media-gfx/ufraw gimp # install the sendto-plugin for xfce-base/thunar #net-wireless/blueman thunar -# fix crash -=media-sound/clementine-1.2.3 -udisks - # enable support for Media Transfer Protocol media-sound/clementine mtp dropbox googledrive @@ -232,10 +219,6 @@ media-gfx/inkscape cdr inkjar lcms visio wpg # mikmod? ( mod ) timidity? ( midi ) media-libs/sdl-mixer mod timidity midi -# the following REQUIRED_USE flag constraints are unsatisfied: -# theora? ( video ) X? ( video ) v4l? ( video ) -media-libs/mediastreamer video - # enables fuse mount points in $HOME/.gvfs for legacy application access # enable storage password gnome-base/gvfs archive fuse mtp gnome-keyring @@ -273,11 +256,6 @@ x11-wm/jwm xpm media-video/avidemux qt5 media-libs/avidemux-plugins qt5 -# wine 1.7.x -# The following REQUIRED_USE flag constraints are unsatisfied: -# vaapi? ( staging ), at-most-one-of ( gstreamer staging ) -app-emulation/wine -gstreamer staging - # extensions without dependencies mate-extra/caja-extensions -cdr image-converter share @@ -289,9 +267,6 @@ app-text/atril epub # xcb for video capture screen monitor media-video/ffmpeg openssl chromium xcb libaom -# enable sound support -games-strategy/0ad sound - # opengl? ( gui widgets ), webkit? ( network printsupport ) dev-python/PyQt5 gui printsupport network widgets dev-python/PyQt5-python2 gui printsupport network widgets @@ -321,9 +296,6 @@ media-libs/libsdl2 gles # support accountservice x11-misc/lightdm gnome -# enable support Jabber, vkontakte -net-im/qutim xmpp vkontakte - # at-most-one-of ( gstreamer ffmpeg ) app-misc/tracker ffmpeg -gstreamer -cue @@ -372,15 +344,9 @@ app-backup/backintime qt5 app-backup/bacula qt5 net-print/hplip qt5 -# support for some plasmoids -kde-base/plasma-workspace python - # mate-base/mate -> x11-misc/mozo-1.8.0 mate-base/mate-menus python -# adds support for suspend/resume using sys-power/pm-utils -sys-auth/consolekit pm-utils - # enable Glamor OpenGL 2D acceleration x11-drivers/xf86-video-amdgpu glamor @@ -390,10 +356,6 @@ app-i18n/fcitx gtk2 gtk3 # add man app-emulation/lxc doc -# add support for the postgresql database -www-apps/nextcloud postgres -sqlite -www-apps/owncloud postgres -sqlite - # add support for the postgresql database net-im/prosody libevent postgres dev-lua/luadbi postgres diff --git a/profiles/default/server/make.defaults b/profiles/default/server/make.defaults index 9137832bd..d7a328635 100644 --- a/profiles/default/server/make.defaults +++ b/profiles/default/server/make.defaults @@ -18,9 +18,6 @@ USE="${USE} -sdl -sdl2 -vaapi -xv" # Photo USE="${USE} -gimp" -# Python -USE="${USE} -python_targets_python3_7" - # System USE="${USE} -abi_x86_32 -elogind -gnome-keyring -introspection -policykit"