--- owncloud-client-2.2.4.ebuild	2016-09-30 10:24:05.000000000 +0200
+++ owncloud-client-2.2.4-r1.ebuild	2016-10-26 13:43:09.942585217 +0200
@@ -13,55 +13,45 @@
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp test qt4 +qt5"
+IUSE="doc dolphin nautilus samba +sftp test"
 
-REQUIRED_USE="^^ ( qt4 qt5 )
-	dolphin? ( qt5 )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5[printsupport]
 	sys-fs/inotify-tools
 	virtual/libiconv
 	dolphin? (
-		>=kde-frameworks/kcoreaddons-5.16:5
-		>=kde-frameworks/kio-5.16:5 )
-	nautilus? ( dev-python/nautilus-python )
-	qt4? (
-		dev-libs/qtkeychain[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtwebkit:4
-		net-libs/neon[ssl]
-	)
-	qt5? (
-		dev-libs/qtkeychain[qt5]
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		>=dev-qt/qtnetwork-5.4:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5[printsupport]
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
 	)
+	nautilus? ( dev-python/nautilus-python )
 	samba? ( >=net-fs/samba-3.5 )
 	sftp? ( >=net-libs/libssh-0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
 	!net-misc/ocsync
-	!net-misc/nextcloud-client"
-DEPEND="${RDEPEND}
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
 	doc? (
 		dev-python/sphinx
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	dolphin? ( >=kde-frameworks/extra-cmake-modules-5.22.0 )
-	qt5? ( dev-qt/linguist-tools:5 )
+	dolphin? ( kde-frameworks/extra-cmake-modules )
 	test? (
 		dev-util/cmocka
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)"
+		dev-qt/qttest:5
+	)
+"
 
 S=${WORKDIR}/${P/-}
 
@@ -84,7 +74,7 @@
 		-DWITH_ICONV=ON
 		-DWITH_DOC=$(usex doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=$(usex qt4)
+		-DBUILD_WITH_QT4=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
 		-DUNIT_TESTING=$(usex test)