diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 05bdde0f5272cee8df486953a49f8d902ead1b95..df8710eb648e214f1917344c6814abda1e0bfe0a 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,9 +1,2 @@
-DIST swift-1.0.tar.gz 7892404 SHA256 798237f3f9c58a8659eb78cb118c647aa9bcfff53989af12dadd9ed97dce5a88 SHA512 b50326e642b8728b2ef31447e5f032ef42f7a7dd8998d87fba71e780a104b09983da83eab54788daf5a80de3913239721841ccfa7afcf17e28cab50522b82be0 WHIRLPOOL ede830d94fe91ee28a48c9d47de36ab5c17dad99b01b457d9d77d780169b81e8ebe5722bba1491e3e4a9373344277623044a7c1edaed0377ad151854762eac41
-DIST swift-2.0beta1.tar.gz 8108364 SHA256 dc0830a7d6313fe0999daf20a9bc9e25e0d3cc98a889cbd031178b6202cc7532 SHA512 fe80f0ee00616de21f60a8cedc2dd393a39dd7db00d2a999b5454066ef60ac9042e3c63ac2e15aaac30766786488fee74af24856d83c7e014bf458007c0ccfc2 WHIRLPOOL f9a708d710b8baeb1aaac84cc6e4767320c272c5067d2ae75773d430489ad643feb9a08d5993608ef5c63e94816e0228f45913186f8aa28bb35caa35ee1a07e1
-DIST swift-2.0beta2.tar.gz 8802868 SHA256 efba5dc873a418b652d14a31053ad222adfd20a482c4fb10cd0b181133469e74 SHA512 73744ab4533fac7a24c38ef48ea3ffaf0f39a3ab945026b44bff464c45f1526071bc4d5de45769bef97344c725f28940da28299d0beea0a2ab4758e254ab8ada WHIRLPOOL 115e26090473ec2aa0fb1bb9b412ca1a580d4f7b149edf36f21bc004752af02092bb4190f7ae62a10b9cb0acc563742d9a2791c4a65ca2e766a01f077e96c41f
-DIST swift-2.0rc1.tar.gz 8810733 SHA256 e7c046d2be03c6decbb0cea2887a1d79675b1dd7a9331acfc7838251cff004c6 SHA512 efe1d4e25afd2eeed873690acc7f6ba1d893b924cfa045b3cdaabbc103fe75e411ad693124f41fcd2c603e013ad3c1e73e0040e3383d62ddb115be8c485ddf51 WHIRLPOOL 10e204813e6ce2061e1c286e290d23088b969f2ae721d90cd0f28b9734b389435b5b09a6e93b745b9a755bf08df45b912be52c4fad6c0c0494b3e3c2714fa6cb
-EBUILD swift-1.0.ebuild 4155 SHA256 d6e25da7cc5791c30f2cc508cabad676d7408222e2742559d934122467ee42d3 SHA512 6ffdd60b0c471f2f860a9d18e4ff4119ab1e93b8d279af39f91b0c7aaad326edf77d51734dc03e74e391d6625a96ea7b1f59c082f8b60db5e9de04afa1e4eb43 WHIRLPOOL 36f516792baf838304c864e4b9494614d5249c54e30c1d82aea056acffaffd886e681b611d8faeecbe9482a94dece3cf2be144e8a02fc2e7c05d652d280c85c6
-EBUILD swift-2.0_beta1.ebuild 4284 SHA256 73f46b612286a133a512223ce8fac22c1558b2063869676c55be777fc6995f48 SHA512 ff01e3f2e6b3721275cfee6fee9bb33f0e782267a4cb25412b538fcdb30aa6f5ee54f4dd8d9c7c0d82c62bf4a183209d0b10479ae97543f7e85c52cfe21cfa6c WHIRLPOOL 2915c5be2a9d69baf0e8e7650672717f77ea92c0fd9aba64073dcca7a945c96f6fcb7c43c7439ced6aaee05dd60341c87b2108887b26ee01e9a12d58addce7b7
-EBUILD swift-2.0_beta2.ebuild 4284 SHA256 73f46b612286a133a512223ce8fac22c1558b2063869676c55be777fc6995f48 SHA512 ff01e3f2e6b3721275cfee6fee9bb33f0e782267a4cb25412b538fcdb30aa6f5ee54f4dd8d9c7c0d82c62bf4a183209d0b10479ae97543f7e85c52cfe21cfa6c WHIRLPOOL 2915c5be2a9d69baf0e8e7650672717f77ea92c0fd9aba64073dcca7a945c96f6fcb7c43c7439ced6aaee05dd60341c87b2108887b26ee01e9a12d58addce7b7
-EBUILD swift-2.0_rc1.ebuild 4284 SHA256 73f46b612286a133a512223ce8fac22c1558b2063869676c55be777fc6995f48 SHA512 ff01e3f2e6b3721275cfee6fee9bb33f0e782267a4cb25412b538fcdb30aa6f5ee54f4dd8d9c7c0d82c62bf4a183209d0b10479ae97543f7e85c52cfe21cfa6c WHIRLPOOL 2915c5be2a9d69baf0e8e7650672717f77ea92c0fd9aba64073dcca7a945c96f6fcb7c43c7439ced6aaee05dd60341c87b2108887b26ee01e9a12d58addce7b7
-EBUILD swift-9999.ebuild 4155 SHA256 d6e25da7cc5791c30f2cc508cabad676d7408222e2742559d934122467ee42d3 SHA512 6ffdd60b0c471f2f860a9d18e4ff4119ab1e93b8d279af39f91b0c7aaad326edf77d51734dc03e74e391d6625a96ea7b1f59c082f8b60db5e9de04afa1e4eb43 WHIRLPOOL 36f516792baf838304c864e4b9494614d5249c54e30c1d82aea056acffaffd886e681b611d8faeecbe9482a94dece3cf2be144e8a02fc2e7c05d652d280c85c6
+DIST swift-3.0.tar.bz2 8260588 SHA256 2e48f081d337f471b4eba7c0c807a7b640216a76ed3568ced55abb5b927c7fd2 SHA512 8ba734af34333fa836480ee647949e2f5e89d053bc41c0f96af85779a89930355ca88b690bbee62f215fae723a2473ecf5e278435754b3cde475b81f5f4f18e5 WHIRLPOOL 9f529b3f43362ca84bed52caa739201d683a47ad2ce5fa31329975e421693eec8de1ad7a7ab60f4d36bae4377a03eb3330e40c349ee0f6c6b02beb10e3a6d640
+EBUILD swift-3.0.ebuild 4710 SHA256 33cd745dd8c40032faff2b81a939636dcabd9c75fd1a5a264002eaad4bc9b504 SHA512 8df4fa3a82fe19564abf06c9c25649b1adaf8745b512c061b51bb4e1cb21cc1042e4c40dfae9dd76c8f04950f27c9978d00a7c8722c846f9331b825cb7fe8130 WHIRLPOOL 21d46f4bfe3cc5741f516c1fe71ed68a6ebf1988ea158daa6215fb1a0762095ed1d64942f1585821ee27bac8b39696d2003004f2834b6bcf5b1ea4086f78cdae
diff --git a/net-im/swift/swift-1.0.ebuild b/net-im/swift/swift-1.0.ebuild
deleted file mode 100644
index 12ef0d220f05255b4a3a3c84764f646fb0832e68..0000000000000000000000000000000000000000
--- a/net-im/swift/swift-1.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-LANGS=" ca de es fr hu nl pl ru se sk"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit multilib toolchain-funcs linux-info qt4-r2 scons-utils ${VCS_ECLASS}
-
-DESCRIPTION="Your friendly chat client"
-HOMEPAGE="http://swift.im/"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://swift.im/swift"
-else
-	SRC_URI="http://swift.im/downloads/releases/${P}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="avahi debug doc examples +expat qt4 ssl static-libs zeroconf"
-
-RDEPEND="
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		avahi? ( net-dns/avahi )
-		!avahi? ( net-misc/mDNSResponder )
-	)
-	net-dns/libidn
-	sys-libs/zlib
-	qt4? (
-		x11-libs/libXScrnSaver
-		x11-libs/qt-gui
-		x11-libs/qt-webkit
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.75
-		>=app-text/docbook-xml-dtd-4.5
-		dev-libs/libxslt
-	)
-"
-scons_targets=()
-set_scons_targets() {
-	scons_targets=( Swiften )
-	use qt4 && scons_targets+=( Swift )
-	use avahi && scons_targets+=( Slimber )
-	use examples && scons_targets+=(
-		Documentation/SwiftenDevelopersGuide/Examples
-		Limber
-		Sluift
-		Swiften/Config
-		Swiften/Examples
-		Swiften/QA
-		SwifTools
-	)
-}
-
-scons_vars=()
-set_scons_vars() {
-	scons_vars=(
-		V=1
-		allow_warnings=1
-		cc="$(tc-getCC)"
-		cxx="$(tc-getCXX)"
-		ccflags="${CXXFLAGS}"
-		linkflags="${LDFLAGS}"
-		qt="${S}/local-qt"
-		openssl="${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)
-		$(use zeroconf && use_scons !avahi bonjour)
-	)
-}
-
-src_prepare() {
-	mkdir local-qt
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt4 local-qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt4 local-qt/include || die
-
-	cd 3rdParty || die
-	# TODO CppUnit, Lua
-	rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die
-	cd .. || die
-
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
-		fi
-	done
-
-	# Richard H. <chain@rpgfiction.net> (2012-03-29): SCons ignores us,
-	# just delete unneeded stuff!
-	if use !avahi; then
-		rm -rf Slumber || die
-	fi
-
-	if use !examples; then
-		rm -rf Documentation/SwiftenDevelopersGuide/Examples \
-                Limber \
-                Slimber \
-                Sluift \
-                Swiften/Examples \
-                Swiften/QA \
-                Swiftob || die
-	fi
-
-	if use !qt4; then
-		rm -rf Swift || die
-	fi
-
-	sed -i BuildTools/SCons/Tools/qt4.py \
-		-e "s/linux2/linux${KV_MAJOR}/" \
-		|| die
-}
-
-src_compile() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" "${scons_targets[@]}"
-}
-
-src_test() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" test=unit QA
-}
-
-src_install() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" SWIFT_INSTALLDIR="${D}/usr" SWIFTEN_INSTALLDIR="${D}/usr" "${D}" "${scons_targets[@]}"
-
-	if use avahi ; then
-		newbin Slimber/Qt/slimber slimber-qt
-		newbin Slimber/CLI/slimber slimber-cli
-	fi
-
-	if use examples ; then
-		for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do
-			newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}"
-		done
-
-		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}"
-		done
-		newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile"
-		use avahi && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool
-
-		for i in ClientTest NetworkTest StorageTest TLSTest ; do
-			newbin "Swiften/QA/${i}/${i}" "${PN}-${i}"
-		done
-
-		newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest
-	fi
-
-	use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"
-}
diff --git a/net-im/swift/swift-2.0_beta1.ebuild b/net-im/swift/swift-2.0_beta1.ebuild
deleted file mode 100644
index 2585b7cbe9448084c8e6aa985134cd236e0e2cd7..0000000000000000000000000000000000000000
--- a/net-im/swift/swift-2.0_beta1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-LANGS=" ca de es fr hu nl pl ru se sk"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit multilib toolchain-funcs linux-info qt4-r2 scons-utils ${VCS_ECLASS}
-
-inherit versionator
-MY_PN="swift"
-MY_PV=$(replace_version_separator 2 '')
-MY_P="${MY_PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Your friendly chat client"
-HOMEPAGE="http://swift.im/"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://swift.im/swift"
-else
-	SRC_URI="http://swift.im/downloads/releases/${MY_P}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="avahi debug doc examples +expat qt4 ssl static-libs zeroconf"
-
-RDEPEND="
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		avahi? ( net-dns/avahi )
-		!avahi? ( net-misc/mDNSResponder )
-	)
-	net-dns/libidn
-	sys-libs/zlib
-	qt4? (
-		x11-libs/libXScrnSaver
-		x11-libs/qt-gui
-		x11-libs/qt-webkit
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.75
-		>=app-text/docbook-xml-dtd-4.5
-		dev-libs/libxslt
-	)
-"
-scons_targets=()
-set_scons_targets() {
-	scons_targets=( Swiften )
-	use qt4 && scons_targets+=( Swift )
-	use avahi && scons_targets+=( Slimber )
-	use examples && scons_targets+=(
-		Documentation/SwiftenDevelopersGuide/Examples
-		Limber
-		Sluift
-		Swiften/Config
-		Swiften/Examples
-		Swiften/QA
-		SwifTools
-	)
-}
-
-scons_vars=()
-set_scons_vars() {
-	scons_vars=(
-		V=1
-		allow_warnings=1
-		cc="$(tc-getCC)"
-		cxx="$(tc-getCXX)"
-		ccflags="${CXXFLAGS}"
-		linkflags="${LDFLAGS}"
-		qt="${S}/local-qt"
-		openssl="${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)
-		$(use zeroconf && use_scons !avahi bonjour)
-	)
-}
-
-src_prepare() {
-	mkdir local-qt
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt4 local-qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt4 local-qt/include || die
-
-	cd 3rdParty || die
-	# TODO CppUnit, Lua
-	rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die
-	cd .. || die
-
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
-		fi
-	done
-
-	# Richard H. <chain@rpgfiction.net> (2012-03-29): SCons ignores us,
-	# just delete unneeded stuff!
-	if use !avahi; then
-		rm -rf Slumber || die
-	fi
-
-	if use !examples; then
-		rm -rf Documentation/SwiftenDevelopersGuide/Examples \
-                Limber \
-                Slimber \
-                Sluift \
-                Swiften/Examples \
-                Swiften/QA \
-                Swiftob || die
-	fi
-
-	if use !qt4; then
-		rm -rf Swift || die
-	fi
-
-	sed -i BuildTools/SCons/Tools/qt4.py \
-		-e "s/linux2/linux${KV_MAJOR}/" \
-		|| die
-}
-
-src_compile() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" "${scons_targets[@]}"
-}
-
-src_test() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" test=unit QA
-}
-
-src_install() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" SWIFT_INSTALLDIR="${D}/usr" SWIFTEN_INSTALLDIR="${D}/usr" "${D}" "${scons_targets[@]}"
-
-	if use avahi ; then
-		newbin Slimber/Qt/slimber slimber-qt
-		newbin Slimber/CLI/slimber slimber-cli
-	fi
-
-	if use examples ; then
-		for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do
-			newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}"
-		done
-
-		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}"
-		done
-		newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile"
-		use avahi && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool
-
-		for i in ClientTest NetworkTest StorageTest TLSTest ; do
-			newbin "Swiften/QA/${i}/${i}" "${PN}-${i}"
-		done
-
-		newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest
-	fi
-
-	use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"
-}
diff --git a/net-im/swift/swift-2.0_beta2.ebuild b/net-im/swift/swift-2.0_beta2.ebuild
deleted file mode 100644
index 2585b7cbe9448084c8e6aa985134cd236e0e2cd7..0000000000000000000000000000000000000000
--- a/net-im/swift/swift-2.0_beta2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-LANGS=" ca de es fr hu nl pl ru se sk"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit multilib toolchain-funcs linux-info qt4-r2 scons-utils ${VCS_ECLASS}
-
-inherit versionator
-MY_PN="swift"
-MY_PV=$(replace_version_separator 2 '')
-MY_P="${MY_PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Your friendly chat client"
-HOMEPAGE="http://swift.im/"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://swift.im/swift"
-else
-	SRC_URI="http://swift.im/downloads/releases/${MY_P}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="avahi debug doc examples +expat qt4 ssl static-libs zeroconf"
-
-RDEPEND="
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		avahi? ( net-dns/avahi )
-		!avahi? ( net-misc/mDNSResponder )
-	)
-	net-dns/libidn
-	sys-libs/zlib
-	qt4? (
-		x11-libs/libXScrnSaver
-		x11-libs/qt-gui
-		x11-libs/qt-webkit
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.75
-		>=app-text/docbook-xml-dtd-4.5
-		dev-libs/libxslt
-	)
-"
-scons_targets=()
-set_scons_targets() {
-	scons_targets=( Swiften )
-	use qt4 && scons_targets+=( Swift )
-	use avahi && scons_targets+=( Slimber )
-	use examples && scons_targets+=(
-		Documentation/SwiftenDevelopersGuide/Examples
-		Limber
-		Sluift
-		Swiften/Config
-		Swiften/Examples
-		Swiften/QA
-		SwifTools
-	)
-}
-
-scons_vars=()
-set_scons_vars() {
-	scons_vars=(
-		V=1
-		allow_warnings=1
-		cc="$(tc-getCC)"
-		cxx="$(tc-getCXX)"
-		ccflags="${CXXFLAGS}"
-		linkflags="${LDFLAGS}"
-		qt="${S}/local-qt"
-		openssl="${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)
-		$(use zeroconf && use_scons !avahi bonjour)
-	)
-}
-
-src_prepare() {
-	mkdir local-qt
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt4 local-qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt4 local-qt/include || die
-
-	cd 3rdParty || die
-	# TODO CppUnit, Lua
-	rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die
-	cd .. || die
-
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
-		fi
-	done
-
-	# Richard H. <chain@rpgfiction.net> (2012-03-29): SCons ignores us,
-	# just delete unneeded stuff!
-	if use !avahi; then
-		rm -rf Slumber || die
-	fi
-
-	if use !examples; then
-		rm -rf Documentation/SwiftenDevelopersGuide/Examples \
-                Limber \
-                Slimber \
-                Sluift \
-                Swiften/Examples \
-                Swiften/QA \
-                Swiftob || die
-	fi
-
-	if use !qt4; then
-		rm -rf Swift || die
-	fi
-
-	sed -i BuildTools/SCons/Tools/qt4.py \
-		-e "s/linux2/linux${KV_MAJOR}/" \
-		|| die
-}
-
-src_compile() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" "${scons_targets[@]}"
-}
-
-src_test() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" test=unit QA
-}
-
-src_install() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" SWIFT_INSTALLDIR="${D}/usr" SWIFTEN_INSTALLDIR="${D}/usr" "${D}" "${scons_targets[@]}"
-
-	if use avahi ; then
-		newbin Slimber/Qt/slimber slimber-qt
-		newbin Slimber/CLI/slimber slimber-cli
-	fi
-
-	if use examples ; then
-		for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do
-			newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}"
-		done
-
-		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}"
-		done
-		newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile"
-		use avahi && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool
-
-		for i in ClientTest NetworkTest StorageTest TLSTest ; do
-			newbin "Swiften/QA/${i}/${i}" "${PN}-${i}"
-		done
-
-		newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest
-	fi
-
-	use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"
-}
diff --git a/net-im/swift/swift-2.0_rc1.ebuild b/net-im/swift/swift-2.0_rc1.ebuild
deleted file mode 100644
index 2585b7cbe9448084c8e6aa985134cd236e0e2cd7..0000000000000000000000000000000000000000
--- a/net-im/swift/swift-2.0_rc1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-LANGS=" ca de es fr hu nl pl ru se sk"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit multilib toolchain-funcs linux-info qt4-r2 scons-utils ${VCS_ECLASS}
-
-inherit versionator
-MY_PN="swift"
-MY_PV=$(replace_version_separator 2 '')
-MY_P="${MY_PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Your friendly chat client"
-HOMEPAGE="http://swift.im/"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://swift.im/swift"
-else
-	SRC_URI="http://swift.im/downloads/releases/${MY_P}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="avahi debug doc examples +expat qt4 ssl static-libs zeroconf"
-
-RDEPEND="
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		avahi? ( net-dns/avahi )
-		!avahi? ( net-misc/mDNSResponder )
-	)
-	net-dns/libidn
-	sys-libs/zlib
-	qt4? (
-		x11-libs/libXScrnSaver
-		x11-libs/qt-gui
-		x11-libs/qt-webkit
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.75
-		>=app-text/docbook-xml-dtd-4.5
-		dev-libs/libxslt
-	)
-"
-scons_targets=()
-set_scons_targets() {
-	scons_targets=( Swiften )
-	use qt4 && scons_targets+=( Swift )
-	use avahi && scons_targets+=( Slimber )
-	use examples && scons_targets+=(
-		Documentation/SwiftenDevelopersGuide/Examples
-		Limber
-		Sluift
-		Swiften/Config
-		Swiften/Examples
-		Swiften/QA
-		SwifTools
-	)
-}
-
-scons_vars=()
-set_scons_vars() {
-	scons_vars=(
-		V=1
-		allow_warnings=1
-		cc="$(tc-getCC)"
-		cxx="$(tc-getCXX)"
-		ccflags="${CXXFLAGS}"
-		linkflags="${LDFLAGS}"
-		qt="${S}/local-qt"
-		openssl="${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)
-		$(use zeroconf && use_scons !avahi bonjour)
-	)
-}
-
-src_prepare() {
-	mkdir local-qt
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt4 local-qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt4 local-qt/include || die
-
-	cd 3rdParty || die
-	# TODO CppUnit, Lua
-	rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die
-	cd .. || die
-
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
-		fi
-	done
-
-	# Richard H. <chain@rpgfiction.net> (2012-03-29): SCons ignores us,
-	# just delete unneeded stuff!
-	if use !avahi; then
-		rm -rf Slumber || die
-	fi
-
-	if use !examples; then
-		rm -rf Documentation/SwiftenDevelopersGuide/Examples \
-                Limber \
-                Slimber \
-                Sluift \
-                Swiften/Examples \
-                Swiften/QA \
-                Swiftob || die
-	fi
-
-	if use !qt4; then
-		rm -rf Swift || die
-	fi
-
-	sed -i BuildTools/SCons/Tools/qt4.py \
-		-e "s/linux2/linux${KV_MAJOR}/" \
-		|| die
-}
-
-src_compile() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" "${scons_targets[@]}"
-}
-
-src_test() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" test=unit QA
-}
-
-src_install() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" SWIFT_INSTALLDIR="${D}/usr" SWIFTEN_INSTALLDIR="${D}/usr" "${D}" "${scons_targets[@]}"
-
-	if use avahi ; then
-		newbin Slimber/Qt/slimber slimber-qt
-		newbin Slimber/CLI/slimber slimber-cli
-	fi
-
-	if use examples ; then
-		for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do
-			newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}"
-		done
-
-		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}"
-		done
-		newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile"
-		use avahi && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool
-
-		for i in ClientTest NetworkTest StorageTest TLSTest ; do
-			newbin "Swiften/QA/${i}/${i}" "${PN}-${i}"
-		done
-
-		newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest
-	fi
-
-	use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"
-}
diff --git a/net-im/swift/swift-3.0.ebuild b/net-im/swift/swift-3.0.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..dc01504b581d0339312013c63cc8a0004b30517a
--- /dev/null
+++ b/net-im/swift/swift-3.0.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+LANGS="ca cs de en es fr gl he hu nl pl ru sk sv"
+PYTHON_COMPAT=( python2_7 )
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
+inherit multilib toolchain-funcs linux-info python-any-r1 scons-utils ${VCS_ECLASS} versionator
+
+MY_PN="swift"
+MY_PV=$(replace_version_separator 2 '')
+MY_P="${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Your friendly chat client"
+HOMEPAGE="http://swift.im/"
+if [[ ${PV} == *9999* ]] ; then
+	#EGIT_REPO_URI="git://swift.im/swift"
+	EGIT_REPO_URI="https://github.com/swift/swift.git"
+else
+	SRC_URI="https://swift.im/git/swift/snapshot/${MY_P}.tar.bz2"
+	#SRC_URI="https://github.com/swift/swift/archive/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="debug doc examples expat gconf hunspell icu idn qt4 scripting ssl static-libs tests zeroconf"
+
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+RDEPEND="
+	>=dev-libs/boost-1.56.0
+	sys-libs/zlib
+	expat? ( >=dev-libs/expat-2.0.1 )
+		|| ( dev-libs/libxml2 )
+	gconf? ( gnome-base/gconf )
+	hunspell? ( app-text/hunspell )
+	icu? ( dev-libs/icu )
+	idn? ( >=net-dns/libidn-1.10 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtwebkit:4
+		>=x11-libs/libXScrnSaver-1.2
+	)
+	ssl? ( >=dev-libs/openssl-0.9.8g )
+	scripting? ( dev-lang/lua )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-text/docbook-xsl-stylesheets-1.75
+		>=app-text/docbook-xml-dtd-4.5
+		dev-libs/libxslt
+	)
+"
+
+scons_targets=()
+set_scons_targets() {
+	scons_targets=( Swiften )
+	use doc && scons_targets+=( Documentation )
+	use examples && scons_targets+=(
+		Documentation/SwiftenDevelopersGuide/Examples
+		Swiften/Config
+		Swiften/Examples
+		SwifTools
+	)
+	use qt4 && scons_targets+=( Swift )
+	use scripting && scons_targets+=( Sluift )
+	use tests && scons_targets+=( Swiften/QA )
+	use zeroconf && scons_targets+=( Limber Slimber )
+}
+
+scons_vars=()
+set_scons_vars() {
+	scons_vars=(
+		V=1
+		allow_warnings=1
+		cc="$(tc-getCC)"
+		cxx="$(tc-getCXX)"
+		ccflags="${CXXFLAGS}"
+		linkflags="${LDFLAGS}"
+
+		debug=$(usex debug)
+		doc=$(usex doc)
+		docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets"
+		docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5"
+		hunspell_enable=$(usex hunspell)
+		icu=$(usex icu)
+		need_idn=$(usex idn)
+		openssl=$(usex ssl ${EPREFIX}/usr)
+		swiften_dll=$(usex !static-libs)
+		test=$(usex tests all none)
+		try_avahi=$(usex zeroconf)
+		try_expat=$(usex expat)
+		try_gconf=$(usex gconf)
+		try_libxml=$(usex !expat)
+	)
+}
+
+scons_install_vars=()
+set_scons_install_vars() {
+	scons_install_vars=(
+		force-configure=0
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+	)
+	use qt4 && scons_install_vars+=( SWIFT_INSTALLDIR="${ED}/usr" )
+	use scripting && scons_install_vars+=( SLUIFT_INSTALLDIR="${ED}/usr" )
+}
+
+src_prepare() {
+	# TODO drop this patch for >net-im/swift-4.0_beta2
+#	if [[ ${PV} != *9999* ]] ; then
+#		epatch "${FILESDIR}/scons-qtchooser-env.patch"
+#	fi
+
+	rm -fr 3rdParty || die
+
+	for x in ${LANGS}; do
+		if use !linguas_${x}; then
+			rm -f Swift/Translations/swift_${x}.ts || die
+		fi
+	done
+
+	if use !qt4; then
+		rm -rf Swift || die
+	fi
+
+	if use !scripting; then
+		rm -rf Sluift || die
+	fi
+
+	if use !zeroconf; then
+		rm -rf Limber Slimber || die
+	fi
+
+	eapply_user
+}
+
+src_compile() {
+	set_scons_targets
+	set_scons_vars
+
+	escons "${scons_vars[@]}" "${scons_targets[@]}"
+}
+
+src_test() {
+	set_scons_targets
+	set_scons_vars
+
+	escons "${scons_vars[@]}" test=unit QA
+}
+
+src_install() {
+	set_scons_targets
+	set_scons_vars
+	set_scons_install_vars
+
+	escons "${scons_vars[@]}" \
+		"${scons_install_vars[@]}" \
+		"${ED}" "${scons_targets[@]}"
+
+	if use zeroconf; then
+		dobin Limber/limber
+		newbin Slimber/CLI/slimber slimber-cli
+		use qt4 && newbin Slimber/Qt/slimber slimber-qt
+	fi
+
+	if use tests; then
+		for i in ClientTest NetworkTest StorageTest TLSTest ; do
+			newbin "Swiften/QA/${i}/${i}" "${PN}-${i}"
+		done
+
+		newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest
+	fi
+
+	if use examples; then
+		for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do
+			newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}"
+		done
+
+		for i in BenchTool ConnectivityTest LinkLocalTool ParserTester SendFile SendMessage ; do
+			newbin "Swiften/Examples/${i}/${i}" "${PN}-${i}"
+		done
+		newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile"
+		use zeroconf && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool
+	fi
+
+	if use doc; then
+		dodoc "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"
+		dodoc "Documentation/SwiftUserGuide/Swift Users Guide.html"
+	fi
+}
diff --git a/net-im/swift/swift-9999.ebuild b/net-im/swift/swift-9999.ebuild
deleted file mode 100644
index 12ef0d220f05255b4a3a3c84764f646fb0832e68..0000000000000000000000000000000000000000
--- a/net-im/swift/swift-9999.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-LANGS=" ca de es fr hu nl pl ru se sk"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-
-inherit multilib toolchain-funcs linux-info qt4-r2 scons-utils ${VCS_ECLASS}
-
-DESCRIPTION="Your friendly chat client"
-HOMEPAGE="http://swift.im/"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://swift.im/swift"
-else
-	SRC_URI="http://swift.im/downloads/releases/${P}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="avahi debug doc examples +expat qt4 ssl static-libs zeroconf"
-
-RDEPEND="
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		avahi? ( net-dns/avahi )
-		!avahi? ( net-misc/mDNSResponder )
-	)
-	net-dns/libidn
-	sys-libs/zlib
-	qt4? (
-		x11-libs/libXScrnSaver
-		x11-libs/qt-gui
-		x11-libs/qt-webkit
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.75
-		>=app-text/docbook-xml-dtd-4.5
-		dev-libs/libxslt
-	)
-"
-scons_targets=()
-set_scons_targets() {
-	scons_targets=( Swiften )
-	use qt4 && scons_targets+=( Swift )
-	use avahi && scons_targets+=( Slimber )
-	use examples && scons_targets+=(
-		Documentation/SwiftenDevelopersGuide/Examples
-		Limber
-		Sluift
-		Swiften/Config
-		Swiften/Examples
-		Swiften/QA
-		SwifTools
-	)
-}
-
-scons_vars=()
-set_scons_vars() {
-	scons_vars=(
-		V=1
-		allow_warnings=1
-		cc="$(tc-getCC)"
-		cxx="$(tc-getCXX)"
-		ccflags="${CXXFLAGS}"
-		linkflags="${LDFLAGS}"
-		qt="${S}/local-qt"
-		openssl="${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)
-		$(use zeroconf && use_scons !avahi bonjour)
-	)
-}
-
-src_prepare() {
-	mkdir local-qt
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt4 local-qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt4 local-qt/include || die
-
-	cd 3rdParty || die
-	# TODO CppUnit, Lua
-	rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die
-	cd .. || die
-
-	for x in ${LANGS}; do
-		if use !linguas_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
-		fi
-	done
-
-	# Richard H. <chain@rpgfiction.net> (2012-03-29): SCons ignores us,
-	# just delete unneeded stuff!
-	if use !avahi; then
-		rm -rf Slumber || die
-	fi
-
-	if use !examples; then
-		rm -rf Documentation/SwiftenDevelopersGuide/Examples \
-                Limber \
-                Slimber \
-                Sluift \
-                Swiften/Examples \
-                Swiften/QA \
-                Swiftob || die
-	fi
-
-	if use !qt4; then
-		rm -rf Swift || die
-	fi
-
-	sed -i BuildTools/SCons/Tools/qt4.py \
-		-e "s/linux2/linux${KV_MAJOR}/" \
-		|| die
-}
-
-src_compile() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" "${scons_targets[@]}"
-}
-
-src_test() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" test=unit QA
-}
-
-src_install() {
-	set_scons_targets
-	set_scons_vars
-
-	escons "${scons_vars[@]}" SWIFT_INSTALLDIR="${D}/usr" SWIFTEN_INSTALLDIR="${D}/usr" "${D}" "${scons_targets[@]}"
-
-	if use avahi ; then
-		newbin Slimber/Qt/slimber slimber-qt
-		newbin Slimber/CLI/slimber slimber-cli
-	fi
-
-	if use examples ; then
-		for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do
-			newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}"
-		done
-
-		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}"
-		done
-		newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile"
-		use avahi && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool
-
-		for i in ClientTest NetworkTest StorageTest TLSTest ; do
-			newbin "Swiften/QA/${i}/${i}" "${PN}-${i}"
-		done
-
-		newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest
-	fi
-
-	use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"
-}