diff --git a/exlibs/desktop-utils.exlib b/exlibs/desktop-utils.exlib
index 35b4ef8..9bf0c47 100644
--- a/exlibs/desktop-utils.exlib
+++ b/exlibs/desktop-utils.exlib
@@ -30,7 +30,7 @@ here_desktop_entry() {
     doins "${TEMP}/${1}"
     )
 
-    if ! desktop-file-validate ${IMAGE}/usr/share/applications/${1} ; then
+    if ! desktop-file-validate "${IMAGE}/usr/share/applications/${1}" ; then
         eerror "${1} does not pass desktop file validation"
         die_unless_nonfatal "${1} does not pass desktop file validation"
     fi
diff --git a/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0 b/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
index afc910b..f480423 100644
--- a/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
+++ b/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
@@ -21,7 +21,7 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 MYOPTIONS="
-    gnome
+    gnome [[ description = [ Compile with gnome3 support ] ]]
     pulseaudio
     xfce4-panel [[ description = [ Add support for XFCE panel ] ]]
 "
diff --git a/packages/dev-lang/elixir/elixir-1.2.5.exheres-0 b/packages/dev-lang/elixir/elixir-1.2.5.exheres-0
index c26e2a3..ddcc798 100644
--- a/packages/dev-lang/elixir/elixir-1.2.5.exheres-0
+++ b/packages/dev-lang/elixir/elixir-1.2.5.exheres-0
@@ -31,8 +31,6 @@ DEFAULT_SRC_INSTALL_PARAMS=(
 )
 
 DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
-    README.md
-    CHANGELOG.md
     CONTRIBUTING.md
 )
 
diff --git a/packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0 b/packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0
index 1cf610a..6547c87 100644
--- a/packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0
+++ b/packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0
@@ -18,7 +18,6 @@ DEPENDENCIES="
 WORK=${WORKBASE}/sdk
 
 src_compile() {
-    export CXX=${CXX} AR=${AR} RANLIB=${RANLIB}
     emake -C ${PN}/projects/gnuc \
         LIBRARYDEST=
 }
diff --git a/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 b/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0
index 3b2f4b0..6b692ec 100644
--- a/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0
+++ b/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0
@@ -16,7 +16,9 @@ PLATFORMS="~amd64 ~x86"
 MYOPTIONS="
     havege [[ description = [ Enable the HAVEGE random generator,
                               not suitable for virtualized environments! ] ]]
-    threads
+    threads [[ description = [ Enables the threading abstraction layer
+                               via pthread. This is used if you do intend
+                               to use contexts between threads. ] ]]
     x86_cpu_features:
         sse2
 "
@@ -25,7 +27,7 @@ DEPENDENCIES="
     build+run:
         sys-libs/zlib
     test:
-        dev-lang/perl
+        dev-lang/perl:*
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/dev-python/python-msrplib/python-msrplib-0.19.0.exheres-0 b/packages/dev-python/python-msrplib/python-msrplib-0.19.0.exheres-0
index 079b467..d90a0fd 100644
--- a/packages/dev-python/python-msrplib/python-msrplib-0.19.0.exheres-0
+++ b/packages/dev-python/python-msrplib/python-msrplib-0.19.0.exheres-0
@@ -16,7 +16,7 @@ DEPENDENCIES="
     run:
         dev-python/python-application[python_abis:*(-)?]
         dev-python/python-eventlib[python_abis:*(-)?]
-        dev-python/python-gnutls[python_abis:*(-)?][>=3.0.0]
+        dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
         net-twisted/TwistedCore[python_abis:*(-)?]
         net-twisted/TwistedNames[python_abis:*(-)?]
 "
diff --git a/packages/dev-python/python-sipsimple/python-sipsimple-3.0.0.exheres-0 b/packages/dev-python/python-sipsimple/python-sipsimple-3.0.0.exheres-0
index edff9de..cb73d05 100644
--- a/packages/dev-python/python-sipsimple/python-sipsimple-3.0.0.exheres-0
+++ b/packages/dev-python/python-sipsimple/python-sipsimple-3.0.0.exheres-0
@@ -20,7 +20,7 @@ DEPENDENCIES="
         virtual/pkg-config
     build+run:
         dev-db/sqlite:3
-        dev-python/python-application[python_abis:*(-)?][>=2.0.0]
+        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
         media-libs/libvpx
         media-libs/v4l-utils
         media/ffmpeg[h264]
@@ -36,7 +36,7 @@ DEPENDENCIES="
         dev-python/python-dateutil[python_abis:*(-)?]
         dev-python/python-eventlib[python_abis:*(-)?]
         dev-python/python-gnutls[python_abis:*(-)?]
-        dev-python/python-msrplib[python_abis:*(-)?][>=0.19.0]
+        dev-python/python-msrplib[>=0.19.0][python_abis:*(-)?]
         dev-python/python-otr[python_abis:*(-)?]
         dev-python/python-xcaplib[python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
diff --git a/packages/games-emulation/gambatte/gambatte-scm.exheres-0 b/packages/games-emulation/gambatte/gambatte-scm.exheres-0
index cd93f98..0237d36 100644
--- a/packages/games-emulation/gambatte/gambatte-scm.exheres-0
+++ b/packages/games-emulation/gambatte/gambatte-scm.exheres-0
@@ -88,6 +88,6 @@ src_install() {
     dobin gambatte_sdl/gambatte_sdl
     option qt4 && dobin gambatte_qt/bin/gambatte_qt
 
-    nonfatal dodoc README changelog
+    nonfatal emagicdocs
 }
 
diff --git a/packages/games-engines/love/love.exlib b/packages/games-engines/love/love.exlib
index 2bd7550..4914af0 100644
--- a/packages/games-engines/love/love.exlib
+++ b/packages/games-engines/love/love.exlib
@@ -3,7 +3,7 @@
 
 # Purpose: an exlib dealing with installation of the love engine
 # Maintainer: Julian Ospald <hasufell@posteo.de>
-# Exports: src_prepare src_install pkg_postinst
+# Exports: src_prepare src_install
 # Side-effects: - adds build and runtime dependencies
 #               - sets $SUMMARY, $HOMEPAGE, $DOWNLOADS, $LICENCES,
 #                      $DEFAULT_SRC_CONFIGURE_PARAMS,
@@ -22,7 +22,7 @@ if [[ -n ${LOVE_AUTOCONF} ]]; then
     require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 fi
 
-export_exlib_phases src_prepare src_install pkg_postinst
+export_exlib_phases src_prepare src_install
 
 SUMMARY="A framework for 2D games in Lua"
 HOMEPAGE="http://love2d.org/"
@@ -82,8 +82,3 @@ love_src_install() {
     done
 }
 
-# Exported 'pkg_postinst'.
-love_pkg_postinst() {
-    alternatives_pkg_postinst
-}
-
diff --git a/packages/games-engines/renpy/renpy.exlib b/packages/games-engines/renpy/renpy.exlib
index dda574f..1e51a91 100644
--- a/packages/games-engines/renpy/renpy.exlib
+++ b/packages/games-engines/renpy/renpy.exlib
@@ -5,7 +5,7 @@ require alternatives
 require setup-py [ import=distutils multibuild=false blacklist=3 ]
 require gtk-icon-cache
 
-export_exlib_phases src_prepare src_install pkg_postinst
+export_exlib_phases src_prepare src_install
 
 SUMMARY="Visual novel engine written in python"
 DESCRIPTION="
@@ -104,7 +104,3 @@ EOF
     done
 }
 
-renpy_pkg_postinst() {
-    alternatives_pkg_postinst
-}
-
diff --git a/packages/games-fps/duke3d-data/duke3d-data-1.0.exheres-0 b/packages/games-fps/duke3d-data/duke3d-data-1.0.exheres-0
index a1671f2..b3e56ce 100644
--- a/packages/games-fps/duke3d-data/duke3d-data-1.0.exheres-0
+++ b/packages/games-fps/duke3d-data/duke3d-data-1.0.exheres-0
@@ -10,7 +10,7 @@ LICENCES="DUKE3D GOG-EULA"
 SLOT="0"
 PLATFORMS="amd64 hppa ppc x86"
 MYOPTIONS=""
-RESTRICT="mirror bindist fetch"
+RESTRICT="fetch"
 
 DEPENDENCIES="
     build:
diff --git a/packages/games-fps/eduke32/eduke32-scm.exheres-0 b/packages/games-fps/eduke32/eduke32-scm.exheres-0
index f11cca7..5cacd11 100644
--- a/packages/games-fps/eduke32/eduke32-scm.exheres-0
+++ b/packages/games-fps/eduke32/eduke32-scm.exheres-0
@@ -43,7 +43,12 @@ MYOPTIONS="
     tools [[ description = [ Build several tools for modding and
                              development ] ]]
     vpx [[ description = [ Enable support for WebM VP8 Codecs ] ]]
-    ( opl-musicpack sc55-musicpack ) [[ number-selected = at-most-one ]]
+    (
+      opl-musicpack [[ description = [ Include optional OPL (AdLib)
+                                       music pack ] ]]
+      sc55-musicpack [[ description = [ Include optional Roland SC-55
+                                        music pack ] ]]
+    ) [[ number-selected = at-most-one ]]
 "
 
 DEPENDENCIES="
diff --git a/packages/games-fps/openarena/openarena-0.8.8.exheres-0 b/packages/games-fps/openarena/openarena-0.8.8.exheres-0
index 2d24788..a3ea43b 100644
--- a/packages/games-fps/openarena/openarena-0.8.8.exheres-0
+++ b/packages/games-fps/openarena/openarena-0.8.8.exheres-0
@@ -46,8 +46,6 @@ src_prepare() {
 }
 
 src_compile() {
-    export CC=${CC} CXX=${CXX} LD=${LD} AR=${AR} RANLIB=${RANLIB}
-
     emake -C ${MY_S} \
         V=1 \
         DEFAULT_BASEDIR="${OA_SHARE_DIR}" \
diff --git a/packages/games-fps/urbanterror/urbanterror-4.2.023.exheres-0 b/packages/games-fps/urbanterror/urbanterror-4.2.023.exheres-0
index 3a592bf..c686915 100644
--- a/packages/games-fps/urbanterror/urbanterror-4.2.023.exheres-0
+++ b/packages/games-fps/urbanterror/urbanterror-4.2.023.exheres-0
@@ -65,7 +65,7 @@ src_unpack() {
 }
 
 src_compile() {
-    env -u TARGETS -u PLATFORM emake \
+    edo env -u TARGETS -u PLATFORM emake \
         ARCH=$(option platform:amd64 "x86_64" "i386") \
         PLATFORM=linux \
         DEFAULT_BASEDIR="/usr/share/${PN}" \
diff --git a/packages/games-fps/xonotic/xonotic-0.8.1.exheres-0 b/packages/games-fps/xonotic/xonotic-0.8.1.exheres-0
index 85e421f..5a1b906 100644
--- a/packages/games-fps/xonotic/xonotic-0.8.1.exheres-0
+++ b/packages/games-fps/xonotic/xonotic-0.8.1.exheres-0
@@ -68,8 +68,6 @@ src_prepare() {
 src_compile() {
     local i
 
-    export CC=${CC} CXX=${CXX} LD=${LD} AR=${AR} RANLIB=${RANLIB}
-
     # fixes parallel build issues
     for i in sv-release cl-release sdl-release ; do
         emake \
diff --git a/packages/games-roguelike/FTL/FTL-1.5.13.exheres-0 b/packages/games-roguelike/FTL/FTL-1.5.13.exheres-0
index 463a584..dd1521d 100644
--- a/packages/games-roguelike/FTL/FTL-1.5.13.exheres-0
+++ b/packages/games-roguelike/FTL/FTL-1.5.13.exheres-0
@@ -11,7 +11,7 @@ PLATFORMS="-* ~amd64 ~x86"
 MYOPTIONS="
     ( platform: amd64 x86 )
 "
-RESTRICT="fetch bindist"
+RESTRICT="fetch"
 
 DEPENDENCIES="
     run:
diff --git a/packages/games-rpg/baldurs-gate-2-ee/baldurs-gate-2-ee-1.3.2064.exheres-0 b/packages/games-rpg/baldurs-gate-2-ee/baldurs-gate-2-ee-1.3.2064.exheres-0
index f481bed..ecbfee7 100644
--- a/packages/games-rpg/baldurs-gate-2-ee/baldurs-gate-2-ee-1.3.2064.exheres-0
+++ b/packages/games-rpg/baldurs-gate-2-ee/baldurs-gate-2-ee-1.3.2064.exheres-0
@@ -11,7 +11,7 @@ LICENCES="all-rights-reserved"
 SLOT="0"
 PLATFORMS="-* ~x86"
 MYOPTIONS=""
-RESTRICT="fetch bindist"
+RESTRICT="fetch"
 
 DEPENDENCIES="
     build:
diff --git a/packages/games-rpg/baldurs-gate-ee/baldurs-gate-ee-1.3.2053-r1.exheres-0 b/packages/games-rpg/baldurs-gate-ee/baldurs-gate-ee-1.3.2053-r1.exheres-0
index dd83c4f..b6046b9 100644
--- a/packages/games-rpg/baldurs-gate-ee/baldurs-gate-ee-1.3.2053-r1.exheres-0
+++ b/packages/games-rpg/baldurs-gate-ee/baldurs-gate-ee-1.3.2053-r1.exheres-0
@@ -11,7 +11,7 @@ LICENCES="all-rights-reserved"
 SLOT="0"
 PLATFORMS="-* ~x86"
 MYOPTIONS=""
-RESTRICT="fetch bindist"
+RESTRICT="fetch"
 
 DEPENDENCIES="
     build:
diff --git a/packages/games-rpg/pillars-of-eternity/pillars-of-eternity-2.03.0788.exheres-0 b/packages/games-rpg/pillars-of-eternity/pillars-of-eternity-2.03.0788.exheres-0
index 3deeb46..eb89c45 100644
--- a/packages/games-rpg/pillars-of-eternity/pillars-of-eternity-2.03.0788.exheres-0
+++ b/packages/games-rpg/pillars-of-eternity/pillars-of-eternity-2.03.0788.exheres-0
@@ -26,7 +26,7 @@ MYOPTIONS="
     dlc2 [[ description = [ Install the Kickstarter Bonus Pet ] ]]
     dlc3 [[ description = [ Install the Pre-Order Bonus Item and Pet ] ]]
 "
-RESTRICT="fetch bindist"
+RESTRICT="fetch"
 
 DEPENDENCIES="
     build:
diff --git a/packages/games-rpg/punch-club/punch-club-1.1.exheres-0 b/packages/games-rpg/punch-club/punch-club-1.1.exheres-0
index c79a398..9b8936a 100644
--- a/packages/games-rpg/punch-club/punch-club-1.1.exheres-0
+++ b/packages/games-rpg/punch-club/punch-club-1.1.exheres-0
@@ -11,7 +11,7 @@ DOWNLOADS="manual: ${GOG_SH}"
 LICENCES="all-rights-reserved GOG-EULA"
 SLOT="0"
 PLATFORMS="-* ~amd64 ~x86"
-RESTRICT="fetch mirror"
+RESTRICT="fetch"
 
 MYOPTIONS="
     ( platform: amd64 x86 )
diff --git a/packages/games-rpg/valyriatear/valyriatear-scm.exheres-0 b/packages/games-rpg/valyriatear/valyriatear-scm.exheres-0
index 4aace0a..84e3ae3 100644
--- a/packages/games-rpg/valyriatear/valyriatear-scm.exheres-0
+++ b/packages/games-rpg/valyriatear/valyriatear-scm.exheres-0
@@ -21,9 +21,7 @@ DOWNLOADS=""
 LICENCES="GPL-2 GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-3.0 CC0 OFL-1.1"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    editor
-"
+MYOPTIONS=""
 
 DEPENDENCIES="
     build:
@@ -40,7 +38,6 @@ DEPENDENCIES="
         x11-dri/glu
         x11-dri/mesa
         x11-libs/libX11
-        editor? ( x11-libs/qt:4[opengl] )
 "
 
 CMAKE_SRC_CONFIGURE_PARAMS=(
@@ -49,10 +46,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
     -DUSE_PCH_COMPILATION=OFF
 )
 
-CMAKE_SRC_CONFIGURE_OPTIONS=(
-    'editor EDITOR_SUPPORT'
-)
-
 pkg_postinst() {
     gtk-icon-cache_pkg_postinst
     freedesktop-desktop_pkg_postinst
diff --git a/packages/games-rpg/wasteland2/wasteland2-2.9.0.14.exheres-0 b/packages/games-rpg/wasteland2/wasteland2-2.9.0.14.exheres-0
index bd06672..2f37db6 100644
--- a/packages/games-rpg/wasteland2/wasteland2-2.9.0.14.exheres-0
+++ b/packages/games-rpg/wasteland2/wasteland2-2.9.0.14.exheres-0
@@ -11,7 +11,7 @@ LICENCES="all-rights-reserved"
 SLOT="0"
 PLATFORMS="-* ~x86"
 MYOPTIONS=""
-RESTRICT="bindist fetch mirror"
+RESTRICT="fetch"
 
 DEPENDENCIES="
     build:
diff --git a/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0 b/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0
index ea7e5fa..321747e 100644
--- a/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0
+++ b/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0
@@ -59,7 +59,7 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
 )
 
 DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
-    "http zlib ${ROOT}/usr/$(exhost --target)"
+    "http zlib /usr/$(exhost --target)"
 )
 
 src_configure() {
diff --git a/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0 b/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
index 0b8f93f..243ce44 100644
--- a/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
+++ b/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
@@ -20,7 +20,7 @@ DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-makefile.patch )
 
 src_unpack() {
     default
-    edo mv gennady-ja2-stracciatella-* ${WORK}
+    edo mv gennady-ja2-stracciatella-* "${WORK}"
 }
 
 src_configure() {
diff --git a/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0 b/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0
index 7b9a247..e4801c2 100644
--- a/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0
+++ b/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0
@@ -3,6 +3,7 @@
 
 MY_PNV="pgl-${PV}"
 
+require systemd-service
 require gtk-icon-cache
 require sourceforge [ project=peerguardian suffix=tar.gz ]
 
@@ -38,7 +39,7 @@ DEPENDENCIES="
         app-arch/p7zip [[ description = [ needed for blocklists packed as .7z ] ]]
         net-apps/NetworkManager [[ description = [ pglinux provides a
                                                    networkmanager script ]  ]]
-        virtual/cron
+        virtual/cron [[ description = [ to send daily reports ] ]]
         virtual/mta [[ description = [ needed to send informational (blocklist
                                        updates) and warning mails (if pglcmd.wd
                                        detects a problem.) ] ]]
diff --git a/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0 b/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0
index b51405e..bcdc0bb 100644
--- a/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0
+++ b/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0
@@ -37,15 +37,9 @@ DEFAULT_SRC_PREPARE_PATCHES=(
     -p2 "${FILES}"/0002-Respect-system-LDFLAGS.patch
 )
 
-DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
-    README.md
-)
-
 src_compile() {
     local STEAM_CRYPT_BACKEND=
 
-    export CC=${CC} PKG_CONFIG=${PKG_CONFIG}
-
     if option providers:nss ; then
         STEAM_CRYPT_BACKEND=nss
     elif option providers:gcrypt ; then
diff --git a/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0 b/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0
index bc34d32..967ba0b 100644
--- a/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0
+++ b/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0
@@ -46,7 +46,8 @@ DEPENDENCIES="
             media/mpv
             media/smplayer
             media/vlc
-        ) [[ *description = [ video player backend ] ]]
+        ) [[ *description = [ video player backend, you probably want
+                              at least one ] ]]
 
 
 "
diff --git a/packages/net-www/exlibs/inox.exlib b/packages/net-www/exlibs/inox.exlib
index d0faf84..ccddb78 100644
--- a/packages/net-www/exlibs/inox.exlib
+++ b/packages/net-www/exlibs/inox.exlib
@@ -287,19 +287,19 @@ inox_src_configure() {
         enable_hidpi=0
 
         # inox specific
-		enable_webrtc=0
-		enable_google_now=0
-		enable_remoting=0
-		safe_browsing_mode=0
-		enable_rlz=0
-		enable_hangout_services_extension=0
-		branding=Chromium
-		google_chrome_build=0
-		enable_web_speech=1
-		enable_wifi_bootstrapping=0
-		enable_speech_input=0
-		enable_pre_sync_backup=0
-		enable_print_preview=0
+        enable_webrtc=0
+        enable_google_now=0
+        enable_remoting=0
+        safe_browsing_mode=0
+        enable_rlz=0
+        enable_hangout_services_extension=0
+        branding=Chromium
+        google_chrome_build=0
+        enable_web_speech=1
+        enable_wifi_bootstrapping=0
+        enable_speech_input=0
+        enable_pre_sync_backup=0
+        enable_print_preview=0
     )
 
     if [[ ${CHROMIUM_CHANNEL} == "stable" ]]; then
diff --git a/packages/sci-mathematics/flint/flint-2.5.2.exheres-0 b/packages/sci-mathematics/flint/flint-2.5.2.exheres-0
index f905260..cc16005 100644
--- a/packages/sci-mathematics/flint/flint-2.5.2.exheres-0
+++ b/packages/sci-mathematics/flint/flint-2.5.2.exheres-0
@@ -31,8 +31,8 @@ src_configure() {
         --with-gmp="/usr" \
         --with-mpfr="/usr" \
         --disable-static \
-        CC=${CC} \
-        CXX=${CXX} \
-        AR=${AR}
+        CC="${CC}" \
+        CXX="${CXX}" \
+        AR="${AR}"
 }
 
diff --git a/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0 b/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0
index 07625a8..15e56aa 100644
--- a/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0
+++ b/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0
@@ -22,7 +22,6 @@ DEFAULT_SRC_INSTALL_PARAMS=(
 )
 
 src_prepare() {
-    export CC=$(exhost --tool-prefix)cc
     append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 }
 
diff --git a/packages/sys-apps/openrc/openrc-0.20.5.exheres-0 b/packages/sys-apps/openrc/openrc-0.20.5.exheres-0
index 1d86190..85dd770 100644
--- a/packages/sys-apps/openrc/openrc-0.20.5.exheres-0
+++ b/packages/sys-apps/openrc/openrc-0.20.5.exheres-0
@@ -45,7 +45,7 @@ DEPENDENCIES="
 "
 
 DEFAULT_SRC_COMPILE_PARAMS=(
-    LIBNAME=${LIBDIR}
+    LIBNAME=lib
     LIBEXECDIR=/usr/$(exhost --target)/libexec/rc
     OS=Linux
 )
@@ -85,12 +85,12 @@ src_compile() {
 
     MAKE_ARGS="
         ${DEFAULT_SRC_COMPILE_PARAMS[@]}
-        MKNET=$(option newnet)
+        MKNET=$(option newnet yes no)
         MKSELINUX=no
         MKAUDIT=no
         MKPAM=$(optionv pam)
         MKSTATICLIBS=no
-        MKTOOLS=$(option tools)
+        MKTOOLS=$(option tools yes no)
     "
 
     emake ${MAKE_ARGS}
diff --git a/packages/voip/blink/blink-2.0.0.exheres-0 b/packages/voip/blink/blink-2.0.0.exheres-0
index 1fd6162..15fffce 100644
--- a/packages/voip/blink/blink-2.0.0.exheres-0
+++ b/packages/voip/blink/blink-2.0.0.exheres-0
@@ -25,7 +25,7 @@ DEPENDENCIES="
         dev-python/python-cjson[python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
         dev-python/python-eventlib[python_abis:*(-)?]
-        dev-python/python-sipsimple[python_abis:*(-)?][>=3.0.0]
+        dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-twisted/TwistedCore[python_abis:*(-)?]
 "