diff --git a/net-im/spectrum/spectrum-9999.ebuild b/net-im/spectrum/spectrum-9999.ebuild
index 9ed8069..bbb7195 100644
--- a/net-im/spectrum/spectrum-9999.ebuild
+++ b/net-im/spectrum/spectrum-9999.ebuild
@@ -57,16 +57,16 @@ CMAKE_IN_SOURCE_BUILD=1
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package libev event)
-		-DENABLE_MYSQL="$(usex mysql)
-		-DENABLE_PQXX="$(usex postgres)
-		-DENABLE_SQLITE3="$(usex sqlite)
-		-DENABLE_DOCS="$(usex doc)
-		-DENABLE_FROTZ="$(usex frotz)
-		-DENABLE_IRC="$(usex irc)
-		-DENABLE_SWIFTEN="$(usex jabber)
-		-DENABLE_PURPLE="$(usex purple)
-		-DENABLE_SMSTOOLS3="$(usex sms)
-		-DENABLE_TWITTER="$(usex twitter)
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_SWIFTEN="$(usex jabber)"
+		-DENABLE_PURPLE="$(usex purple)"
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_TWITTER="$(usex twitter)"
 		-DLIB_INSTALL_DIR=$(get_libdir)
 	)
 
diff --git a/net-im/swift/swift-9999.ebuild b/net-im/swift/swift-9999.ebuild
index 38af46f..d89d77c 100644
--- a/net-im/swift/swift-9999.ebuild
+++ b/net-im/swift/swift-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
-inherit multilib toolchain-funcs linux-info scons-utils
+inherit toolchain-funcs linux-info scons-utils
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="git://swift.im/swift"
@@ -83,12 +83,11 @@ set_scons_vars() {
 		ccflags="${CXXFLAGS}"
 		linkflags="${LDFLAGS}"
 		qt="${S}/local-qt"
-		openssl="${EPREFIX}/usr"
+		openssl="$(usex ssl ${EPREFIX}/usr)"
 		docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets"
 		docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5"
-		$(use_scons debug)
-		$(use !static-libs && use_scons !static-libs swiften_dll)
-		$(use_scons ssl openssl)
+		debug="$(usex debug)"
+		swiften_dll="$(usex static-libs "no" "yes")"
 	)
 }
 
@@ -164,7 +163,6 @@ src_install() {
 
 		dobin Limber/limber
 		dobin Sluift/sluift
-		dobin Swiften/Config/swiften-config
 
 		for i in BenchTool ConnectivityTest LinkLocalTool ParserTester SendFile SendMessage ; do
 			newbin "Swiften/Examples/${i}/${i}" "${PN}-${i}"