From 7324786b5099d5568172b1d6ba3d95ccd6961c26 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Wed, 26 Aug 2015 23:55:22 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 conf.d/docker         | 2 +-
 paludis/keywords.conf | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/conf.d/docker b/conf.d/docker
index c9bc6ef..ae247c0 100644
--- a/conf.d/docker
+++ b/conf.d/docker
@@ -10,4 +10,4 @@
 #DOCKER_BINARY="/usr/bin/docker"
 
 # any other random options you want to pass to docker
-DOCKER_OPTS="--ipv6"
+DOCKER_OPTS=""
diff --git a/paludis/keywords.conf b/paludis/keywords.conf
index 967fe28..baa2c1a 100644
--- a/paludis/keywords.conf
+++ b/paludis/keywords.conf
@@ -875,13 +875,6 @@ app-text/teckit ~amd64
 app-text/ttf2pk2 ~amd64
 app-text/xdvik ~amd64
 
-# mpv for firefox
-www-plugins/mozplugger ~amd64
-
-
-# vuln
-~www-client/firefox-39.0.3 ~amd64
-
 
 # tahoe-lafs
 dev-python/pyasn1 ~amd64