From: Frank Brehm Date: Mon, 8 Jan 2018 14:26:05 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1cd51e1728057513de3ff54b61a34d1d4356904a;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/csh.env b/csh.env index 2d3c506..f5f6d3c 100644 --- 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 2abe31b..c694ab6 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/05binutils b/env.d/05binutils index a6ae0f0..8c7ccaf 100644 --- 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 2eed193..02562cd 100644 --- 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 b560826..f4847c6 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 99c1cea..d42812a 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 7e4c776..921aaa8 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/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf index dd16f64..081833a 100644 --- 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 07b040e..e5b823f 100644 --- 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 7560d77..5ea02ce 100644 --- 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 b5c63b6..ff72055 100644 --- 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/'