From: fbrehm <fbrehm@samara.profitbricks.localdomain>
Date: Tue, 27 Mar 2012 19:22:32 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1a27dccf318906037b040abb9e1a48b5d401ce43;p=config%2Fsamara%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/.etckeeper b/.etckeeper
index 6291680..0688e7d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1168,6 +1168,7 @@ maybe chmod 0644 './lynx.lss'
 maybe chmod 0644 './machine-id'
 maybe chmod 0755 './mail'
 maybe chmod 0644 './mail/aliases'
+maybe chmod 0644 './mail/aliases.db'
 maybe chmod 0644 './mailcap'
 maybe chmod 0644 './make.conf'
 maybe chmod 0644 './make.conf.catalyst'
diff --git a/mail/aliases b/mail/aliases
index ea83505..7e1e68c 100644
--- a/mail/aliases
+++ b/mail/aliases
@@ -31,3 +31,18 @@ www:                webmaster
 
 # trap decode to catch security attacks
 # decode:           /dev/null
+
+# Persönliche Aliase
+
+# Frank Brehm
+frank:			frank.brehm@profitbricks.com
+fbr:                    frank
+brehm:                  frank
+fbrehm:                 frank
+f.brehm:                frank
+f-brehm:                frank
+frank.brehm:            frank
+frank-brehm:            frank
+
+root:			frank
+
diff --git a/mail/aliases.db b/mail/aliases.db
new file mode 100644
index 0000000..61570b9
Binary files /dev/null and b/mail/aliases.db differ
diff --git a/portage/package.use b/portage/package.use
index 5c151d7..b39df2b 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -236,16 +236,18 @@ sys-apps/acl                            nfs
 sys-apps/busybox                        -pam savedconfig static
 # sys-apps/coreutils                    xattr
 sys-apps/paludis                        glsa inquisitio qa visibility
-sys-block/parted                        device-mapper
 sys-apps/pciutils                       network-cron -zlib
 sys-apps/portage                        epydoc python3
 sys-apps/ppd				development pb_pstorage
 sys-apps/usbutils                       network-cron
 sys-apps/util-linux                     ddate loop-aes
+sys-apps/vcb-python			development vcb
 
 sys-auth/consolekit                     policykit
 sys-auth/pambase                        mktemp pam_krb5 pam_ssh
 
+sys-block/parted                        device-mapper
+
 sys-devel/gcc                           libffi mudflap objc objc-gc objc++
 sys-devel/libperl                       ithreads
 
diff --git a/printcap b/printcap
index 4434173..d4972e5 100644
--- a/printcap
+++ b/printcap
@@ -1,11 +1,4 @@
 # This file was automatically generated by cupsd(8) from the
 # /etc/cups/printers.conf file.  All changes to this file
 # will be lost.
-default|Drucker im Büro:rm=samara:rp=default:
-Backoffice|R&I and SysOp:rm=samara:rp=Backoffice:
-Brother_MFC-7440N|Brother MFC-7440N:rm=samara:rp=Brother_MFC-7440N:
-Dell2330dn|Dell 2330dn Printer:rm=samara:rp=Dell2330dn:
 Dell_2330dn_Laser_Printer|Dell 2330dn Laser Printer:rm=samara:rp=Dell_2330dn_Laser_Printer:
-HP_LaserJet_CP1525nw|HP Color LaserJet CP1525nw:rm=samara:rp=HP_LaserJet_CP1525nw:
-HP_LaserJet_M1536dnf|HP LaserJet M1536dnf MFP:rm=samara:rp=HP_LaserJet_M1536dnf:
-Marketing|Marketing and Sales:rm=samara:rp=Marketing: