From 79298ca6a58e5e1f1fb58c8316c29ab1299eba28 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 27 Dec 2017 23:38:28 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- csh.env | 8 ++++---- env.d/04gcc-x86_64-pc-linux-gnu | 8 ++++---- env.d/gcc/.NATIVE | 2 +- env.d/gcc/config-x86_64-pc-linux-gnu | 2 +- env.d/gcc/x86_64-pc-linux-gnu-6.4.0 | 4 +--- portage/package.accept_keywords/common | 2 ++ profile.env | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/csh.env b/csh.env index 9e5a84ec..afe48088 100644 --- a/csh.env +++ b/csh.env @@ -10,7 +10,7 @@ setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.3-r3/html' setenv GCC_SPECS '' setenv GSETTINGS_BACKEND 'dconf' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' -setenv INFOPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/info:/usr/share/info' +setenv INFOPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/info:/usr/share/info' setenv LADSPA_PATH '/usr/lib64/ladspa' setenv LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -27,16 +27,16 @@ setenv LC_TELEPHONE 'de_DE.utf8' setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' -setenv MANPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man' +setenv MANPATH '/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man' setenv MOZ_GMP_PATH '/usr/lib64/nsbrowser/plugins/gmp-gmpopenh264/system-installed' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' -setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin' +setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin' 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' setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins' -setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' +setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' setenv XDG_CONFIG_DIRS '/etc/xdg' setenv XDG_DATA_DIRS '/usr/local/share:/usr/share:/usr/share/gdm' diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index 2abe31be..c694ab6d 100644 --- a/env.d/04gcc-x86_64-pc-linux-gnu +++ b/env.d/04gcc-x86_64-pc-linux-gnu @@ -1,5 +1,5 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0" +PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" +ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" GCC_SPECS="" -MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man" -INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info" diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE index b5608260..f4847c6a 120000 --- a/env.d/gcc/.NATIVE +++ b/env.d/gcc/.NATIVE @@ -1 +1 @@ -x86_64-pc-linux-gnu-5.4.0 \ No newline at end of file +x86_64-pc-linux-gnu-6.4.0 \ No newline at end of file diff --git a/env.d/gcc/config-x86_64-pc-linux-gnu b/env.d/gcc/config-x86_64-pc-linux-gnu index 99c1ceac..d42812aa 100644 --- a/env.d/gcc/config-x86_64-pc-linux-gnu +++ b/env.d/gcc/config-x86_64-pc-linux-gnu @@ -1 +1 @@ -CURRENT=x86_64-pc-linux-gnu-5.4.0 +CURRENT=x86_64-pc-linux-gnu-6.4.0 diff --git a/env.d/gcc/x86_64-pc-linux-gnu-6.4.0 b/env.d/gcc/x86_64-pc-linux-gnu-6.4.0 index 7e4c7768..921aaa8c 100644 --- a/env.d/gcc/x86_64-pc-linux-gnu-6.4.0 +++ b/env.d/gcc/x86_64-pc-linux-gnu-6.4.0 @@ -1,6 +1,3 @@ -PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" -ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" -GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0:/usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/32" MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man" INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info" @@ -8,3 +5,4 @@ STDCXX_INCDIR="g++-v6" CTARGET="x86_64-pc-linux-gnu" GCC_SPECS="" MULTIOSDIRS="../lib64:../lib32" +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0" diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common index 05d157a1..29ace0c7 100644 --- a/portage/package.accept_keywords/common +++ b/portage/package.accept_keywords/common @@ -69,6 +69,8 @@ mail-client/thunderbird ~media-sound/audacious-3.9 +media-tv/plex-media-server + ~media-video/avidemux-2.6.8 ~media-video/avidemux-2.6.20 ~media-video/lxdvdrip-1.77 diff --git a/profile.env b/profile.env index 3538857f..5452875a 100644 --- a/profile.env +++ b/profile.env @@ -10,7 +10,7 @@ export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.3-r3/html' export GCC_SPECS='' export GSETTINGS_BACKEND='dconf' export GUILE_LOAD_PATH='/usr/share/guile/1.8' -export INFOPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/info:/usr/share/info' +export INFOPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/info:/usr/share/info' export LADSPA_PATH='/usr/lib64/ladspa' export LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' @@ -27,16 +27,16 @@ export LC_TELEPHONE='de_DE.utf8' export LC_TIME='de_DE.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' -export MANPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man' +export MANPATH='/usr/share/gcc-data/x86_64-pc-linux-gnu/6.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man:/usr/share/rust-1.19.0/man' export MOZ_GMP_PATH='/usr/lib64/nsbrowser/plugins/gmp-gmpopenh264/system-installed' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' -export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin' +export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/opt/stuffit/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin:/usr/games/bin' 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' export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins' -export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' +export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/opt/stuffit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin' export XDG_CONFIG_DIRS='/etc/xdg' export XDG_DATA_DIRS='/usr/local/share:/usr/share:/usr/share/gdm' -- 2.39.5