From 9ef4090196e05a4f85fe6b664090568571cd4742 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 22 Nov 2016 00:06:45 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- conf.d/modules | 4 +++- portage/make.conf | 1 + portage/package.keywords | 5 ++++- portage/package.use | 9 +++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/conf.d/modules b/conf.d/modules index 70b26efc..b42ede3a 100644 --- a/conf.d/modules +++ b/conf.d/modules @@ -22,4 +22,6 @@ # You should consult your kernel documentation and configuration # for a list of modules and their options. -modules="vboxdrv vboxnetadp vboxnetflt tun" +#modules="vboxdrv vboxnetadp vboxnetflt tun" +modules="tun" + diff --git a/portage/make.conf b/portage/make.conf index 9e600908..09be8308 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -136,6 +136,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ PHP_TARGETS="php5-5 php5-6" PYTHON_TARGETS="python2_7 python3_4" PYTHON_SINGLE_TARGET="python3_4" +CURL_SSL="nss" RUBY_TARGETS="ruby21" diff --git a/portage/package.keywords b/portage/package.keywords index 92555bf6..8fe1bf36 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -68,7 +68,7 @@ app-misc/ddate ~dev-java/sun-jdk-1.6.0.30 ~dev-java/sun-jre-bin-1.6.0.30 -~dev-lang/python-3.5.2 +# ~dev-lang/python-3.5.2 # ~dev-libs/folks-0.8.0 # ~dev-libs/gjs-1.34.0 @@ -104,6 +104,7 @@ app-misc/ddate ~dev-perl/Email-Sender-0.110.5 ~dev-python/astng-0.24.3 +~dev-python/astroid-1.4.8 ~dev-python/bcrypt-1.0.2 ~dev-python/bcrypt-3.1.0 ~dev-python/bcrypt-3.1.1 @@ -113,6 +114,7 @@ dev-python/fbrehm-libs ~dev-python/gdata-2.0.18 # ~dev-python/iniparse-0.4 # ~dev-python/isodate-0.4.9 +~dev-python/lazy-object-proxy-1.2.1 ~dev-python/logilab-common-0.59.1 ~dev-python/m2crypto-0.22.3 ~dev-python/markupsafe-0.23 @@ -131,6 +133,7 @@ dev-python/pb-logging ~dev-python/pygments-1.6 ~dev-python/pygobject-3.22.0 ~dev-python/pylint-0.28.0 +~dev-python/pylint-1.5.6 ~dev-python/PyQt4-4.11.3 ~dev-python/python-debian-0.1.21_p2 ~dev-python/python-debian-0.1.27 diff --git a/portage/package.use b/portage/package.use index e3fa774e..1fa5aeac 100644 --- a/portage/package.use +++ b/portage/package.use @@ -305,7 +305,7 @@ net-dns/unbound dnstap net-firewall/iptables extensions # =net-fs/nfs-utils-1.0.10 -kerberos -#=net-fs/nfs-utils-1.0.12 -kerberos +# =net-fs/nfs-utils-1.0.12 -kerberos net-fs/nfs-utils nfsdcld nfsidmap nfsv41 net-fs/samba async automount client gnutls quota -smbclient smbsharemodes smbtav2 swat syslog winbind net-fs/samba-libs smbsharemodes @@ -315,18 +315,19 @@ net-ftp/proftpd authfile ifsession opensslcrypt rewrite shaper sitemisc softq =net-im/gaim-2.0.0_beta6 bonjour console -gadu groupwise meanwhile qq -silc net-im/gaim bonjour console gadu groupwise meanwhile qq -silc -#net-im/pidgin gadu +# net-im/pidgin gadu net-im/pidgin groupwise meanwhile prediction silc zephyr -#net-im/psi audacious extras +# net-im/psi audacious extras net-im/psi extras jingle -#net-libs/libgadu ssl +# net-libs/libgadu ssl net-libs/libpcap canusb net-libs/libssh2 gcrypt net-libs/libvncserver gcrypt gnutls net-libs/telepathy-qt farstream net-libs/xulrunner system-sqlite wifi +# net-misc/curl curl_ssl_nss libssh2 net-misc/curl libssh2 net-misc/iputils arping caps clockdiff gnutls rarpd rdisc tftpd tracepath net-misc/networkmanager -dhclient dhcpcd nss -- 2.39.5