From 5a9a99962a25bcd99673a3ea94c4242ffbb7dda4 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 22 May 2017 00:48:04 +0200
Subject: [PATCH] Up

---
 options.conf.d/development.conf | 7 +++----
 options.conf.d/non-laptop.conf  | 2 --
 options.conf.d/system.conf      | 2 +-
 options.conf.d/test.conf        | 4 ++++
 package_unmask.conf             | 7 +++++++
 sets/laptop.conf                | 1 -
 6 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 options.conf.d/non-laptop.conf

diff --git a/options.conf.d/development.conf b/options.conf.d/development.conf
index dae51c5..d8a8666 100644
--- a/options.conf.d/development.conf
+++ b/options.conf.d/development.conf
@@ -8,10 +8,6 @@ sys-libs/ncurses compat-libs
 */* profile hscolour
 dev-haskell/* doc
 #dev-lang/ghc doc
-dev-haskell/haddock-api -doc -profile
-#dev-haskell/* build_options: optional_tests recommended_tests expensive_tests
-dev-haskell/hspec-discover -profile
-dev-haskell/hspec -profile
 
 
 dev-scm/git tk
@@ -35,3 +31,6 @@ dev-lang/rust internal-llvm force-bootstrap
 app-editors/emacs freetype xim
 app-editors/emacs providers: gtk3
 
+
+# monodevelop
+dev-dotnet/mono-addins gui
diff --git a/options.conf.d/non-laptop.conf b/options.conf.d/non-laptop.conf
deleted file mode 100644
index e5feb4a..0000000
--- a/options.conf.d/non-laptop.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-*/* x86_cpu_features: avx2 fma sse3
-
diff --git a/options.conf.d/system.conf b/options.conf.d/system.conf
index 3bf6b3d..051570d 100644
--- a/options.conf.d/system.conf
+++ b/options.conf.d/system.conf
@@ -1,4 +1,4 @@
-net-misc/curl providers: -* libressl
+net-misc/curl providers: -* mbedtls
 
 dev-libs/mbedtls build_options: recommended_tests
 
diff --git a/options.conf.d/test.conf b/options.conf.d/test.conf
index fecc248..f810060 100644
--- a/options.conf.d/test.conf
+++ b/options.conf.d/test.conf
@@ -33,4 +33,8 @@ media-libs/opencv -threads qt5
 
 #dev-python/Sphinx build_options: optional_tests recommended_tests expensive_tests
 
+net-mail/dovecot build_options: optional_tests recommended_tests expensive_tests
 
+dev-libs/libappindicator gtk2
+dev-libs/libdbusmenu gtk2
+dev-libs/libindicator gtk2
diff --git a/package_unmask.conf b/package_unmask.conf
index a5c302e..72cc4cf 100644
--- a/package_unmask.conf
+++ b/package_unmask.conf
@@ -23,6 +23,13 @@ sys-apps/multiload[~scm]
 sys-power/suspend-utils[~scm]
 x11-apps/terminator[~scm]
 x11-wm/i3[~scm]
+games-physics/OpenGOO[~scm]
+media-gfx/pinta[~scm]
+net-im/pidgin-skypeweb[~scm]
+media-video/guvcview[~scm]
+net-im/pidgin-opensteamworks[~scm]
+media/livestreamer[~scm]
+net-im/lurch[~scm]
 
 sci-apps/z3[~scm]
 dev-lang/fstar[~scm]
diff --git a/sets/laptop.conf b/sets/laptop.conf
index ef27c5f..697126f 100644
--- a/sets/laptop.conf
+++ b/sets/laptop.conf
@@ -7,6 +7,5 @@
 # networkmanager
 * net-apps/NetworkManager
 * net-apps/NetworkManager-openvpn
-* net-apps/NetworkManager-pptp
 * net-apps/NetworkManager-vpnc
 * net-misc/NetworkManager-openconnect