saving uncommitted changes in /etc prior to emerge run

diff --git a/portage/make.conf b/portage/make.conf
index 1ccb92db1b71804bb62d4aa5e453d4ef332ee077..81a55bec0dea57af57a8890416a83f85465c41f9 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -38,11 +38,27 @@ L10N="de en en-GB en-US"
 QEMU_SOFTMMU_TARGETS="i386 x86_64"
 QEMU_USER_TARGETS="i386 x86_64"
 
+#PHP_TARGETS="php5-5 php5-6"
+
 USE_PYTHON='2.7 3.4'
 PYTHON_TARGETS="python2_7 python3_4"
+PYTHON_SINGLE_TARGET="python3_4"
 
 CPU_FLAGS_X86="mmx sse sse2 sse3 ssse3"
 
+APACHE2_MPMS="prefork"
+APACHE2_MODULES="access_compat actions alias asis auth_basic authn_core auth_digest authn_alias
+                 authn_anon authn_dbd authn_dbm authn_default authn_file authz_core authz_dbd
+                 authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user
+                 autoindex cache cache_disk cern_meta cgi cgid charset_lite dav dav_fs dav_lock
+                 dbd deflate dir disk_cache dumpio env expires ext_filter file_cache filter flac
+                 headers http2 ident imagemap include info log_config log_forensic logio macro
+                 mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect
+                 proxy_fcgi proxy_ftp proxy_html proxy_http proxy_scgi proxy_wstunnel ratelimit
+                 remoteip reqtimeout rewrite setenvif slotmem_shm socache_shmcb so speling status
+                 substitute unique_id unixd userdir usertrack version vhost_alias
+"
+
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.
 #USE="bindist mmx sse sse2"
@@ -57,7 +73,7 @@ CPU_FLAGS_X86="mmx sse sse2 sse3 ssse3"
 #     vorbis webp wmf x264 xattr xml xmlrpc xpm xsl xslt xvid zlib
 #     -development -rdoc"
 
-USE="acl acpi audit bash-completion bazaar bzip2 git gpm idn ipv6 jpeg json lz4 lzma md5sum mmx \
+USE="acl acpi apache2 audit bash-completion bazaar bzip2 git gpm idn ipv6 jpeg json ldap lz4 lzma md5sum mmx \
        mercurial python python2 python3 smtp sse sse2 ssse3 subversion tiff vim-syntax -X xattr unicode"
 
 GENTOO_MIRRORS="http://mirror.netcologne.de/gentoo/"

diff --git a/portage/package.keywords b/portage/package.keywords
index bc3bd37d88aad937783a794a2702d16d24c261e8..a8808b20c64f2e9ea73e16e30ccacb1566e56119 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -1,3 +1,5 @@
 
 app-misc/ddate
 
+~net-nds/phpldapadmin-1.2.3
+

diff --git a/portage/package.use b/portage/package.use
index 7d8e96ca3608028216266c5319deb4aeca8e1004..ef58d0dce4947dc0e2fadc1df029e5ce6425f265 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -21,6 +21,8 @@ dev-libs/glib                   static-libs
 dev-libs/liblogging             rfc3195
 dev-libs/libpcre               static-libs
 
+app-text/asciidoc              python_single_target_python2_7
+
 dev-util/strace                 unwind
 
 dev-vcs/git                     highlight
@@ -67,6 +69,7 @@ virtual/postgresql              -server
 
 www-client/elinks               gc xml
 
+www-servers/apache              sni suexec -threads
 www-servers/uwsgi               yaml
 
 # vim: ts=8