From 1835d1d091341b0ab1a18c77539505b28d1d883c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 28 Jun 2017 23:57:22 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- csh.env | 2 +- portage/package.accept_keywords/common | 3 ++ portage/package.use | 44 +++++++++++++------------- profile.env | 2 +- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/csh.env b/csh.env index ba4f0314..ae46e7b6 100644 --- a/csh.env +++ b/csh.env @@ -33,7 +33,7 @@ setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin' -setenv PRELINK_PATH_MASK '/usr/bin/evolution:/opt/bin/skype' +setenv PRELINK_PATH_MASK '/usr/bin/evolution' setenv PYTHONDOCS '/usr/share/doc/python-docs-2.7.10/html/library' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.10/html/library' setenv QT_GRAPHICSSYSTEM 'raster' diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common index 78a74c46..b042fb29 100644 --- a/portage/package.accept_keywords/common +++ b/portage/package.accept_keywords/common @@ -68,6 +68,8 @@ mail-client/thunderbird ~net-analyzer/tcptrace-6.6.7_p4_p1 +~net-firewall/iptables-1.6.1 + ~net-fs/nfs-utils-2.1.1 net-im/skype @@ -75,6 +77,7 @@ net-im/skype ~net-libs/accounts-qt-1.13 ~net-libs/czmq-3.0.2 ~net-libs/libaccounts-glib-1.21 +~net-libs/libnetfilter_conntrack-1.0.6 ~net-libs/libsignon-glib-1.13 ~net-libs/signond-8.58 ~net-libs/signon-oauth2-0.21 diff --git a/portage/package.use b/portage/package.use index fa55b055..1afeff4a 100644 --- a/portage/package.use +++ b/portage/package.use @@ -8,7 +8,7 @@ app-admin/syslog-ng spoof-source sql app-admin/ulogd -doc dbi nfacct pcap ulog app-arch/cabextract extra extra-tools -app-arch/engrampa -gtk3 +app-arch/engrampa gtk3 app-arch/unzip natspec app-arch/zip natspec @@ -27,7 +27,7 @@ app-crypt/seahorse-plugins applet app-doc/doxygen clang dot #app-editors/gedit -python_targets_python3_3 -app-editors/pluma -gtk3 +app-editors/pluma gtk3 -python #app-editors/vim vim-pager vim-with-x #app-editors/gvim netbeans @@ -95,7 +95,7 @@ dev-libs/geoip city perl-geoipupdate dev-libs/libburn track-src-odirect dev-libs/libgcrypt idea static-libs dev-libs/liblogging rfc3195 -dev-libs/libmateweather -gtk3 +dev-libs/libmateweather gtk3 -python dev-libs/libpcre pcre16 #dev-libs/libpeas -python_targets_python3_3 dev-libs/libusb -doc @@ -222,29 +222,29 @@ mail-client/nail net mail-mta/postfix memcached -vda mate-base/caja gtk3 -mate-base/libmatekbd -gtk3 -mate-base/mate -gtk3 help -mate-base/mate-applets -gtk3 -mate-base/mate-applets-meta appindicator -gtk3 -mate-base/mate-control-center appindicator -gtk3 +mate-base/libmatekbd gtk3 +mate-base/mate gtk3 help +mate-base/mate-applets gtk3 +mate-base/mate-applets-meta appindicator gtk3 +mate-base/mate-control-center appindicator gtk3 mate-base/mate-desktop gtk3 -mate-base/mate-panel -gtk3 -mate-base/mate-settings-daemon -gtk3 +mate-base/mate-panel gtk3 +mate-base/mate-settings-daemon gtk3 -mate-extra/caja-extensions gksu -gtk3 image-converter pidgin share -mate-extra/mate-indicator-applet -gtk3 -mate-extra/mate-media -gtk3 -mate-extra/mate-netbook -gtk3 -mate-extra/mate-power-manager -gtk3 -mate-extra/mate-screensaver -gtk3 -mate-extra/mate-sensors-applet -gtk3 +mate-extra/caja-extensions gksu gtk3 image-converter pidgin share +mate-extra/mate-indicator-applet gtk3 +mate-extra/mate-media gtk3 +mate-extra/mate-netbook gtk3 +mate-extra/mate-power-manager gtk3 +mate-extra/mate-screensaver gtk3 +mate-extra/mate-sensors-applet gtk3 media-fonts/corefonts tahoma media-fonts/terminus-font distinct-l media-fonts/unifont fontforge utils media-gfx/dcraw gimp -media-gfx/eom -gtk3 +media-gfx/eom gtk3 -python media-gfx/exiv2 contrib webready xmp media-gfx/gimp gimpprint smp media-gfx/graphicsmagick fpx @@ -314,7 +314,7 @@ media-video/totem iplayer -tracker upnp-av media-video/transcode extrafilters fame lzo mjpeg network nuv postproc media-video/vlc atmo cdda cddax cdio chromaprint corba daap dc1394 dirac egl faad fbosd fluidsynth gme growl httpd kate libass libcaca libtar libtiger libv4l libv4l2 linsys live matroska mod mpeg omxil opencv portaudio postproc -qt4 -rdp rtsp schroedinger sftp shine shout skins stream switcher taglib twolame vcdinfo vcdx vlm vpx zvbi -net-analyzer/mate-netspeed -gtk3 +net-analyzer/mate-netspeed gtk3 net-analyzer/nagios-nrpe command-args net-analyzer/nagios-plugins nagios-dns nagios-ntp nagios-ping nagios-ssh net-analyzer/net-snmp diskio elf extensible mfd-rewrites sendmail smux @@ -330,7 +330,7 @@ net-dns/bind-tools gssapi pkcs11 urandom net-dns/unbound dnstap # Enable support for 3rd patch-o-matic extensions -net-firewall/iptables extensions +net-firewall/iptables conntrack extensions nftables pcap # =net-fs/nfs-utils-1.0.10 -kerberos # =net-fs/nfs-utils-1.0.12 -kerberos @@ -464,7 +464,7 @@ x11-misc/xscreensaver insecure-savers offensive x11-plugins/enigmail system-sqlite -x11-terms/mate-terminal -gtk3 +x11-terms/mate-terminal gtk3 x11-terms/rxvt-unicode 256-color alt-font-width afterimage fading-colors iso14755 wcwidth unicode3 -vanilla xterm-color x11-terms/xterm paste64 @@ -472,7 +472,7 @@ x11-themes/windowmaker-themes offensive x11-wm/beryl emerald x11-wm/enlightenment xrandr -x11-wm/marco -gtk3 +x11-wm/marco gtk3 xfce-base/thunar plugins xfce-base/xfce4-session fortune diff --git a/profile.env b/profile.env index a6a3e878..c5125ffb 100644 --- a/profile.env +++ b/profile.env @@ -33,7 +33,7 @@ export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin' -export PRELINK_PATH_MASK='/usr/bin/evolution:/opt/bin/skype' +export PRELINK_PATH_MASK='/usr/bin/evolution' export PYTHONDOCS='/usr/share/doc/python-docs-2.7.10/html/library' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.10/html/library' export QT_GRAPHICSSYSTEM='raster' -- 2.39.5