Current state

diff --git a/chef/.keep_app-admin_chef-0 b/chef/.keep_app-admin_chef-0
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/chef/client.rb b/chef/client.rb
deleted file mode 100644 (file)
index a32a9c9..0000000
--- a/chef/client.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# Configuration File For Chef (chef-client)
-#
-# The chef-client program will connect the local system to the specified
-# server URLs through a RESTful API to retrieve its configuration.
-#
-# By default, the client is configured to connect to a Chef Server
-# running on the local system. Change this to reflect your environment.
-#
-# Chef uses a Ruby DSL for configuration, and this file contains a few
-# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
-# :value. Second, in Ruby, everything but false and nil (no quotes or other
-# designations) is true, including true, the integer 0 and the string "false".
-# So to set the value of a setting to false, write:
-#
-# some_setting false
-#
-# Third, Ruby class methods can be used, for example we tell the log to show
-# the current time stamp with Chef::Log::Formatter.show_time, below.
-#
-# log_level specifies the level of verbosity for output.
-# valid values are: :debug, :info, :warn, :error, :fatal
-
-log_level          :info
-
-# log_location specifies where the client should log to.
-# valid values are: a quoted string specifying a file, or STDOUT with
-# no quotes. When run as a daemon (default), STDOUT will produce no output.
-
-log_location       "/var/log/chef/client.log"
-
-# ssl_verify_mode specifies if the REST client should verify SSL certificates.
-# valid values are :verify_none, :verify_peer. The default Chef Server
-# installation will use a self-generated SSL certificate so this should be
-# :verify_none unless you replace the certificate.
-
-ssl_verify_mode    :verify_none
-
-# Server URLs.
-#
-# chef_server_url specifies the Chef Server to connect to.
-# valid values are any HTTP URL (e.g. https://chef.example.com:4443).
-
-chef_server_url    "http://localhost:4000"
-
-# file_cache_path specifies where the client should cache cookbooks, server
-# cookie ID, and openid registration data.
-# valid value is any filesystem directory location.
-
-file_cache_path    "/var/lib/chef/cache"
-
-file_backup_path   "/var/lib/chef/backup"
-
-# pid_file specifies the location of where chef-client daemon should keep the pid
-# file.
-# valid value is any filesystem file location.
-
-pid_file           "/var/run/chef/client.pid"
-
-# Mixlib::Log::Formatter.show_time specifies whether the chef-client
-# log should contain timestamps.  valid values are true or false (no
-# quotes, see above about Ruby idioms). The printed timestamp is
-# rfc2822, for example:
-# Fri, 31 Jul 2009 19:19:46 -0600
-
-Mixlib::Log::Formatter.show_time = true

diff --git a/chef/solo.rb b/chef/solo.rb
deleted file mode 100644 (file)
index 250dd39..0000000
--- a/chef/solo.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# Configuration File For Chef Solo (chef-solo)
-#
-# The program chef-solo allows you to run Chef as a standalone program
-# without connecting to a remote Chef Server.
-#
-# Chef uses a Ruby DSL for configuration, and this file may contain some
-# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
-# :value. Second, in Ruby, everything but false and nil (no quotes or other
-# designations) is true, including true, the integer 0 and the string "false".
-# So to set the value of a setting to false, write:
-#
-# some_setting false
-#
-# Third, Ruby class methods can be used, for example we tell the log to show
-# the current time stamp with Mixlib::Log::Formatter.show_time, below.
-#
-# log_level specifies the level of verbosity for output.
-# valid values are: :debug, :info, :warn, :error, :fatal
-
-log_level          :info
-
-# log_location specifies where the client should log to.
-# valid values are: a quoted string specifying a file, or STDOUT with
-# no quotes.
-
-log_location       "/var/log/chef/solo.log"
-
-# file_cache_path specifies where solo should look for the cookbooks to use
-# valid value is any filesystem directory location. This is slightly
-# different from 'normal' client mode as solo is actually downloading (or
-# using) the specified cookbooks in this location.
-
-file_cache_path    "/var/lib/chef"
-
-# cookbook_path specifies where solo should look for cookbooks it will use.
-# valid value is a string, or array of strings of filesystem directory locations.
-# This setting is similar to the server setting of the same name. Solo will use
-# this as a search location, in Array order. It should be a subdirectory of
-# file_cache_path, above.
-
-cookbook_path      [ "/var/lib/chef/cookbooks" ]
-
-# Mixlib::Log::Formatter.show_time specifies whether the chef-client log should
-# contain timestamps.
-# valid values are true or false (no quotes, see above about Ruby idioms). The
-# printed timestamp is rfc2822, for example:
-# Fri, 31 Jul 2009 19:19:46 -0600
-
-Mixlib::Log::Formatter.show_time = true

diff --git a/conf.d/chef-client b/conf.d/chef-client
deleted file mode 100644 (file)
index b32d70f..0000000
--- a/conf.d/chef-client
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/conf.d/chef-client: config file for /etc/init.d/chef-client
-
-# The configuration file to use.
-#CONFIGFILE="/etc/chef/client.rb"
-
-# Run chef-client periodically, in seconds.
-#INTERVAL=1800
-
-# The splay time for running at intervals, in seconds.
-#SPLAY=20
-
-# Any radom options you want to pass to chef.
-#CHEF_CLIENT_OPTS=""
-
-# Path to the chef client binary.
-#CHEF_CLIENT_BINARY="/usr/bin/chef-client"
-
-# PID file location.
-#CHEF_CLIENT_PIDFILE="/var/run/chef/client.pid"

diff --git a/init.d/chef-client b/init.d/chef-client
deleted file mode 100755 (executable)
index 35652fa..0000000
--- a/init.d/chef-client
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONFIGFILE=${CONFIGFILE:-/etc/chef/client.rb}
-INTERVAL=${INTERVAL:-1800}
-SPLAY=${SPLAY:-20}
-ENCODING=${ENCODING:-UTF-8}
-
-pidfile=${CHEF_CLIENT_PIDFILE:-/var/run/chef/client.pid}
-command=${CHEF_CLIENT_BINARY:-/usr/bin/ruby19}
-command_args="-E ${ENCODING} /usr/bin/chef-client -d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} -P ${pidfile} ${CHEF_CLIENT_OPTS}"
-
-depend() {
-       need net
-}
-
-start_pre() {
-       checkpath -q -d /var/run/chef
-}

diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index af98ebd8a654d07e54375c8a0df6a4ed8a8a093d..0e02e4cb68a2ef8119110d25674e4f0fe5c2958d 100644 (file)
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -82,6 +82,8 @@ mail-client/thunderbird
 
 ~net-libs/libvncserver-0.9.9
 
+~net-print/hplip-3.13.8
+
 ~sys-apps/etckeeper-0.58
 ~sys-apps/ppd-9999
 

diff --git a/portage/package.use b/portage/package.use
index 2a10f9cd722e44bb5a8b41435a244591d6f1f12d..3b171afc7707ca8a2474b5a0876d00fa6ab2702a 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -278,7 +278,7 @@ net-misc/ntp                            parse-clocks -zeroconf
 net-misc/openssh                        X509 sftplogging
 net-misc/openvpn                        down-root eurephia iproute2 passwordsave
 net-misc/rdesktop                       rdpusb
-net-misc/spice-gtk                      -gtk3 -pulseaudio
+net-misc/spice-gtk                     gtk3 -pulseaudio
 # net-misc/vnc                          server
 net-misc/vpnc                           hybrid-auth