From b2a7d175de057f82b591dc3fe57deea82f0724f7 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Thu, 26 Mar 2015 17:36:17 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 paludis/bashrc        | 1 +
 paludis/keywords.conf | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/paludis/bashrc b/paludis/bashrc
index d517a6f..86e0da8 100644
--- a/paludis/bashrc
+++ b/paludis/bashrc
@@ -196,6 +196,7 @@ if [[
 	"${CATEGORY}/${PN}" != "dev-libs/openssl" &&
 	"${CATEGORY}/${PN}" != "dev-games/goatee" &&
 	"${CATEGORY}/${PN}" != "games-board/goatee-gtk" &&
+	"${CATEGORY}/${PN}" != "www-client/torbrowser" &&
 	"${CATEGORY}" != "dev-haskell"
 	]]
 then
diff --git a/paludis/keywords.conf b/paludis/keywords.conf
index 69e3bb8..b001a3e 100644
--- a/paludis/keywords.conf
+++ b/paludis/keywords.conf
@@ -41,7 +41,7 @@ app-crypt/zuluCrypt ~amd64
 
 # blender
 media-gfx/blender *
-~media-video/ffmpeg-2.2.13 ~amd64
+~media-video/ffmpeg-2.2.14 ~amd64
 dev-cpp/gflags ~amd64
 dev-cpp/glog ~amd64