From 9f654d352fe62571504c4cdd55059a9fe76981e2 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 10 Mar 2016 19:47:15 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- portage/make.conf | 16 ++++++++-------- portage/package.keywords/common | 3 +++ portage/package.use | 5 +++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/portage/make.conf b/portage/make.conf index 786aae2..666c1ea 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -93,15 +93,15 @@ INPUT_DEVICES="evdev keyboard mouse" VIDEO_CARDS="amdgpu dummy fbdev radeon radeonhd svga vesa vga v4l" APACHE2_MPMS="prefork" -APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon - authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default - authz_groupfile authz_host authz_owner authz_user autoindex cache +APACHE2_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon + authn_core authn_dbd authn_dbm authn_default authn_file iauthz_core authz_dbd authz_dbm authz_default + authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta cgi cgid charset_lite dav dav_fs dav_lock dbd deflate dir - disk_cache dumpio env expires ext_filter file_cache filter flac headers - ident imagemap include info log_config log_forensic logio mem_cache - mime mime_magic negotiation proxy proxy_ajp proxy_balancer - proxy_connect proxy_ftp proxy_http rewrite setenvif so speling - status substitute unique_id userdir usertrack version vhost_alias + disk_cache dumpio env expires ext_filter file_cache filter flac headers http2 + ident imagemap include info log_config log_forensic logio macro mem_cache + mime mime_magic negotiation proxy proxy_ajp proxy_balancer + proxy_connect proxy_fcgi proxy_ftp proxy_html proxy_http proxy_scgi proxy_wstunnel ratelimit remoteip reqtimeout rewrite setenvif slotmem_shm so socache_shmcb speling + status substitute unique_id unixd userdir usertrack version vhost_alias " CAMERAS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 \ diff --git a/portage/package.keywords/common b/portage/package.keywords/common index 35dbfaa..e44e1fc 100644 --- a/portage/package.keywords/common +++ b/portage/package.keywords/common @@ -60,12 +60,14 @@ app-text/docbook2odf-xsl-stylesheets #~dev-libs/nspr-4.9.6 #~dev-libs/nspr-4.10 ~dev-libs/nspr-4.11 +~dev-libs/nspr-4.12 #required by www-client/firefox-13.0, required by @selected, required by @world (argument) #~dev-libs/nss-3.13.5 #~dev-libs/nss-3.15 #~dev-libs/nss-3.17.2 ~dev-libs/nss-3.17.4 ~dev-libs/nss-3.19.1 +~dev-libs/nss-3.22.2 #~dev-perl/Email-Sender-0.110.5 ~dev-perl/Nagios-Plugin-0.360.0 @@ -128,6 +130,7 @@ dev-python/pb-logging ~dev-util/kbuild-0.1.9998_pre20131130 dev-util/pycharm-community dev-util/pycharm-professional +~dev-util/xxdiff-4.0_beta1_p20110426 #~dev-vcs/gitg-0.2.5 #~dev-vcs/gitg-0.2.7 diff --git a/portage/package.use b/portage/package.use index 09bfae6..95113d3 100644 --- a/portage/package.use +++ b/portage/package.use @@ -207,9 +207,10 @@ mate-extra/caja-extensions image-converter pidgin share upnp media-fonts/corefonts tahoma media-fonts/terminus-font distinct-l +media-fonts/unifont fontforge utils media-gfx/dcraw gimp -media-gfx/exiv2 contrib xmp +media-gfx/exiv2 contrib webready xmp media-gfx/gimp gimpprint smp media-gfx/graphicsmagick fpx media-gfx/graphviz devil gdk-pixbuf gts pango @@ -268,7 +269,7 @@ media-video/ffmpeg aac aacplus amr ass dirac faac faad gsm media-video/kino gpac media-video/libav bs2b vaapi webp x265 media-video/mjpegtools yv12 -media-video/mplayer 3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 nemesi nut opencore-amr pvr rar rtc srt teletext tga tivo xanim xvmc +media-video/mplayer 3dnowext amrnb amrwb bs2b bl cpudetection dvdnav enca gmplayer live lzo md5sum mmxext mp2 nemesi nut opencore-amr pvr rar rtc srt teletext tga tivo xanim xvmc yuv4mpeg 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 -rdp rtsp schroedinger sftp shine shout skins stream switcher taglib tremor twolame vcdinfo vcdx vlm vnc vpx zvbi -- 2.39.5