From: fbrehm <fbrehm@samara.profitbricks.localdomain>
Date: Tue, 12 Jun 2012 05:15:35 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=42b0a880a6e85c02777953d2bcf15fd795dff45f;p=config%2Fsamara%2Fetc.git

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

diff --git a/portage/package.keywords b/portage/package.keywords
index 14cba7f..0b725d8 100644
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -27,6 +27,11 @@ app-emulation/virtualbox-modules
 ~dev-java/oracle-jdk-bin-1.7.0.2
 ~dev-java/oracle-jre-bin-1.7.0.2
 
+#required by www-client/firefox-13.0, required by @selected, required by @world (argument)
+~dev-libs/nspr-4.9.1
+#required by www-client/firefox-13.0, required by @selected, required by @world (argument)
+~dev-libs/nss-3.13.5
+
 ~dev-perl/Email-Sender-0.110.5
 
 ~dev-python/crcmod-1.7
@@ -37,6 +42,8 @@ dev-python/fbrehm-libs
 ~dev-ruby/dnsruby-1.53
 ~dev-ruby/zonecheck-3.0.4
 
+mail-client/thunderbird
+
 ~media-video/lxdvdrip-1.76
 
 ~media-video/streamdvd-0.4
@@ -52,6 +59,8 @@ dev-python/fbrehm-libs
 
 #~www-plugins/adobe-flash-11.1.102.63
 
+www-client/firefox
+
 ~x11-apps/desktopnova-0.7.4
 ~x11-apps/desktopnova-0.8.1
 
diff --git a/shadow b/shadow
index 483b0b8..7e643bf 100644
--- a/shadow
+++ b/shadow
@@ -37,5 +37,5 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15498::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15502::::::
 colord:!:15426::::::