saving uncommitted changes in /etc prior to emerge run

diff --git a/csh.env b/csh.env
index 2d3c506d6bd3f0bdb0e84402cff70718bf312fe9..f5f6d3c2333b038869d44d558f2882be94f1ba8c 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -7,13 +7,13 @@ setenv CONFIG_PROTECT_MASK '/etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/
 setenv EDITOR '/usr/bin/vi'
 setenv GCC_SPECS ''
 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.29.1/info:/usr/share/info'
 setenv LANG 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv MANPAGER 'manpager'
-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/php5.6/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/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.29.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man'
 setenv ORACLE_HOME '/usr/lib64/oracle/12.2/client'
-setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin'
-setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+setenv PATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 setenv TNS_ADMIN '/etc/oracle/'

diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu
index 2abe31be50e21a823c6871bb1df9b549962cd3e9..c694ab6dc937d209533bdf925297ef5339e9c9d2 100644 (file)
--- 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/05binutils b/env.d/05binutils
index a6ae0f08a78aa5a0f25638ba9080c89401c2e7e2..8c7ccaf3926c2564c95c559853f43a9208c689b5 100644 (file)
--- a/env.d/05binutils
+++ b/env.d/05binutils
@@ -1,2 +1,2 @@
-MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/man
-INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.28.1/info
+MANPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.29.1/man
+INFOPATH=/usr/share/binutils-data/x86_64-pc-linux-gnu/2.29.1/info

diff --git a/env.d/binutils/config-x86_64-pc-linux-gnu b/env.d/binutils/config-x86_64-pc-linux-gnu
index 2eed19336691d3c9dd939add7a3038043265b52b..02562cd59813b0b1f000d1dfa0db5c6c00f9ddd2 100644 (file)
--- a/env.d/binutils/config-x86_64-pc-linux-gnu
+++ b/env.d/binutils/config-x86_64-pc-linux-gnu
@@ -1 +1 @@
-CURRENT=2.28.1
+CURRENT=2.29.1

diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE
index b56082603186017940c3a07d966547e73f0af8a3..f4847c6ad7254650f0df8240a05ea70c91c75f7f 120000 (symlink)
--- 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 99c1ceacf45d3f499e24a576e2acbc49d0021d36..d42812aa45a21e1929e4f45864b77682f8937768 100644 (file)
--- 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 7e4c776895554317aee4dd2f27f68407abe5dd5c..921aaa8c51d407d6fb15bb17f588593be3e0b4f1 100644 (file)
--- 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/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
index dd16f64b7302b8c1561cccb5839bd33a6668d261..081833a009d17f2f08f7403430b6ca6dfef86d93 100644 (file)
--- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
+++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
@@ -1,2 +1,4 @@
+/usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/32
+/usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0
 /usr/lib/gcc/x86_64-pc-linux-gnu/5.4.0/32
 /usr/lib/gcc/x86_64-pc-linux-gnu/5.4.0

diff --git a/portage/make.conf b/portage/make.conf
index 07b040efcd13efd02389020a0304d9ff7b004104..e5b823f861f98756647612e8c34740e07b78fa03 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -41,6 +41,7 @@ QEMU_USER_TARGETS="i386 x86_64"
 RUBY_TARGETS="ruby22"
 
 #PHP_TARGETS="php5-5 php5-6"
+PHP_TARGETS="php7-1"
 
 USE_PYTHON='2.7 3.4 3.5'
 PYTHON_TARGETS="python2_7 python3_5"

diff --git a/portage/package.use b/portage/package.use
index 7560d77837be09afe2fee690aa6c8089f257c7b4..5ea02ce79ae07dfb16fbd3d76edc8598346499d9 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -12,7 +12,7 @@ app-arch/unzip                        natspec
 app-arch/zip                   natspec
 
 app-editors/nano               justify
-#app-editors/vim                 -python_targets_python3_3
+app-editors/vim                 terminal
 
 app-emulation/qemu              iscsi static-user
 
@@ -29,7 +29,7 @@ app-shells/bash                       plugins
 app-text/asciidoc              python_single_target_python2_7
 app-text/xmlto                 text
 
-dev-db/mariadb                  extraengine galera innodb-lz4 innodb-lzo innodb-snappy jemalloc mroonga oqgraph server sst-rsync sst-xtrabackup systemtap tokudb
+dev-db/mariadb                  extraengine galera innodb-lz4 innodb-lzo innodb-snappy jemalloc mroonga oqgraph server sst-rsync sst-mariabackup sst-xtrabackup systemtap tokudb
 dev-db/oracle-instantclient    tools
 dev-db/phpmyadmin              setup
 dev-db/postgresql               server threads uuid xml
@@ -75,7 +75,7 @@ net-dns/bind-tools            pkcs11
 net-dns/dnsmasq                 conntrack
 net-dns/unbound                 dnstap
 
-net-firewall/iptables          extensions
+net-firewall/iptables          extensions nftables pcap
 
 net-fs/cifs-utils              ads
 net-fs/samba                   client oav quotas syslog winbind

diff --git a/profile.env b/profile.env
index b5c63b68597cfc566a8f1c020adaf58154163e34..ff720550a0ffaf1618104830763524c320bc018d 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -7,13 +7,13 @@ export CONFIG_PROTECT_MASK='/etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/
 export EDITOR='/usr/bin/vi'
 export GCC_SPECS=''
 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.29.1/info:/usr/share/info'
 export LANG='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export MANPAGER='manpager'
-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/php5.6/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/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.29.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/local/share/man:/usr/share/man'
 export ORACLE_HOME='/usr/lib64/oracle/12.2/client'
-export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin'
-export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+export PATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/lib64/subversion/bin'
+export ROOTPATH='/usr/x86_64-pc-linux-gnu/gcc-bin/6.4.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib64/subversion/bin'
 export TNS_ADMIN='/etc/oracle/'