From d76bba7cc8e135148444960cbf25b9170892a586 Mon Sep 17 00:00:00 2001 From: root Samara Date: Tue, 3 May 2016 17:50:36 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- portage/make.conf | 6 +++--- portage/package.keywords/common | 2 ++ portage/package.use | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/portage/make.conf b/portage/make.conf index 666c1ea..6519706 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -15,14 +15,14 @@ USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \ css ctype curl curlwrappers cvs dane dbase dga djvu dv dvb dvdread \ examples expat fastcgi ffmpeg fftw fits flatfile flickr fltk fontconfig \ foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep gost \ - gphoto2 graphviz gsl gsm gtk3 gtkhtml handbook highlight hscolour html icu id3 \ + gphoto2 graphviz gsl gsm gtk3 gtkhtml highlight hscolour html icu id3 \ id3tag idea idn ieee1394 imagemagick imap imlib inifile jabber jack \ java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \ - kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex \ + kerberos keyring kig-scripting kpathsea lame latex \ libsamplerate libwww live lm_sensors log4j logrotate lua lz4 lzma lzo \ mate meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \ musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \ - nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \ + nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl \ plotutils posix postgres postscript projectm python quicktime rdesktop \ rle sasl sctp semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \ snmp soap sockets sox speex sqlite sqlite3 srtp \ diff --git a/portage/package.keywords/common b/portage/package.keywords/common index 2d69038..995f313 100644 --- a/portage/package.keywords/common +++ b/portage/package.keywords/common @@ -68,6 +68,7 @@ app-text/docbook2odf-xsl-stylesheets ~dev-libs/nss-3.17.4 ~dev-libs/nss-3.19.1 ~dev-libs/nss-3.22.2 +~dev-libs/nss-3.23 #~dev-perl/Email-Sender-0.110.5 ~dev-perl/Nagios-Plugin-0.360.0 @@ -199,4 +200,5 @@ www-client/firefox ~x11-plugins/pidgin-facebookchat-1.69 ~x11-plugins/purple-facebook-20150827 ~x11-plugins/wmcalendar-0.5.2 +~x11-plugins/wmnetload-1.3 diff --git a/portage/package.use b/portage/package.use index a00ed86..94be246 100644 --- a/portage/package.use +++ b/portage/package.use @@ -280,7 +280,7 @@ net-analyzer/nagios-plugins nagios-dns nagios-ntp nagios-ping nagios net-analyzer/net-snmp diskio elf extensible mfd-rewrites pci sendmail smux ucd-compat net-analyzer/nmap ncat ndiff nping net-analyzer/pb-nagios-plugins dcmclient nrpe perl -net-analyzer/wireshark adns doc-pdf gcrypt profile -qt4 smi +net-analyzer/wireshark adns doc-pdf gcrypt profile smi net-dns/avahi autoipd howl-compat mdnsresponder-compat net-dns/bind dlz geoip gssapi -odbc pkcs11 resolvconf urandom @@ -393,7 +393,6 @@ www-apps/syscp aps autoresponder billing bind domainkey www-client/chromium widevine www-client/elinks finger gc gopher -ruby www-client/firefox -egl mozdevelop system-sqlite wifi xforms -www-client/opera -qt3 www-servers/apache sni suexec -threads -- 2.39.5