saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 9edadcd26e5ecdf985747436556fa8e8df7b8e20..69e461e04ebf9c2a47056dbc908359eb3465011b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1295,7 +1295,6 @@ maybe chmod 0644 'env.d/50rust-1.19.0'
 maybe chmod 0644 'env.d/51dconf'
 maybe chmod 0644 'env.d/60ladspa'
 maybe chmod 0644 'env.d/60python-docs-2.7'
-maybe chmod 0644 'env.d/65python-docs'
 maybe chmod 0644 'env.d/65resid'
 maybe chmod 0644 'env.d/66plex'
 maybe chmod 0644 'env.d/70less'

diff --git a/env.d/65python-docs b/env.d/65python-docs
deleted file mode 100644 (file)
index 6dd8002..0000000
--- a/env.d/65python-docs
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONDOCS="/usr/share/doc/python-docs-2.7.10/html/library"

diff --git a/portage/make.conf b/portage/make.conf
index 08a6526a73072677a849ae2e5ee126d25b74ff62..6e2e42f998dc0624f4a85c0a2aee49d40303143d 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -8,8 +8,8 @@ CXXFLAGS="${CFLAGS}"
 # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
 CHOST="x86_64-pc-linux-gnu"
 
-#MAKEOPTS="-j3"
-MAKEOPTS="-j1"
+MAKEOPTS="-j3"
+#MAKEOPTS="-j1"
 
 #GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
 #GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
@@ -68,7 +68,7 @@ FEATURES="parallel-fetch userpriv usersandbox"
 
 #LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW"
 LINGUAS="de de_DE en en_GB en_US ru vi"
-L10N="de en en-GB en-US ru vi"
+L10N="de de-1901 en en-GB en-US ru vi"
 
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.

diff --git a/portage/package.accept_keywords/common b/portage/package.accept_keywords/common
index 29ace0c71d9711fca9decb5492a3eb39b2fdc549..ab9e730454df868e48e0ba344da16da11b0beaf9 100644 (file)
--- a/portage/package.accept_keywords/common
+++ b/portage/package.accept_keywords/common
@@ -106,6 +106,8 @@ net-im/skype
 
 sys-fs/ecryptfs-utils
 
+~sys-kernel/gentoo-sources-4.14.8
+
 ~virtual/ffmpeg-9
 ~virtual/python-pathlib-1.0
 

diff --git a/portage/package.accept_keywords/python b/portage/package.accept_keywords/python
index 3e9b3f933009098ce5dde9db09c178f6811bf382..ab8016a97667dd437539deb21fc97d7ebe4b1d0b 100644 (file)
--- a/portage/package.accept_keywords/python
+++ b/portage/package.accept_keywords/python
@@ -1,9 +1,12 @@
 
-~dev-lang/python-3.5.3
-~dev-lang/python-3.5.4
-~dev-lang/python-3.6.3
+#~dev-lang/python-3.5.3
+#~dev-lang/python-3.5.4
+#~dev-lang/python-3.6.3
 
 ~dev-python/certifi-2017.7.27.1
+~dev-python/flake8-3.5.0
+~dev-python/pyflakes-1.6.0
+~dev-python/pynacl-1.2.0
 ~dev-python/setuptools-36.0.1
 ~dev-python/setuptools-36.5.0
 ~dev-python/sphinx-1.6.3

diff --git a/portage/package.unmask b/portage/package.unmask
index 5b5dff178406ac0f8b2b7174fec93d0379dc250b..a0b6615c1899afcea5add3fd3d83737d25f36a72 100644 (file)
--- a/portage/package.unmask
+++ b/portage/package.unmask
@@ -61,6 +61,8 @@ mate-extra/caja-dropbox::mate-overlay
 
 <net-wireless/mate-bluetooth-1.7::mate-overlay
 
+~sys-kernel/gentoo-sources-4.14.8
+
 virtual/notification-daemon::mate-overlay
 
 www-plugins/adobe-flash

diff --git a/python-exec/python-exec.conf b/python-exec/python-exec.conf
index bab4d0438cd863c7bb8c9b803562a909230ab03b..cb365224ecad94d0735d5840361e76c448987a09 100644 (file)
--- a/python-exec/python-exec.conf
+++ b/python-exec/python-exec.conf
@@ -25,6 +25,6 @@
 # to start.
 #
 # Note: this file can be modified by calls to 'eselect python'.
-python2.7
 python3.5
+python2.7
 python3.4