--- qupzilla-1.8.9.ebuild	2016-02-14 20:18:23.327079600 +0100
+++ qupzilla-1.8.9.ebuild	2016-04-26 12:58:01.550895404 +0200
@@ -2,12 +2,12 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 MY_PN="QupZilla"
 MY_P=${MY_PN}-${PV}
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
-PLUGINS_HASH="7c66cb2efbd18eacbd04ba211162b1a042e5b759"
-PLUGINS_VERSION="2015.06.05" # if there are no updates, we can use the older archive
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
+PLUGINS_HASH="7b037cc326921cefbfc6b5e54e2091eb4191e73f"
+PLUGINS_VERSION="2015.10.02" # if there are no updates, we can use the older archive
 
 inherit eutils l10n multilib qmake-utils vcs-snapshot
 
@@ -18,45 +18,34 @@ 
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc64 x86"
-IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )
-	kde? ( qt4 )"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs"
+REQUIRED_USE=""
 
 RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+
 	x11-libs/libX11
 	gnome-keyring? ( gnome-base/gnome-keyring )
 	kde? (
-		kde-base/kdelibs:4
-		kde-apps/kwalletd:4
+		kde-frameworks/kwallet:5
 	)
 	libressl? ( dev-libs/libressl )
 	!libressl? ( dev-libs/openssl:0 )
-	qt4? (
-		>=dev-qt/qtcore-4.8:4
-		>=dev-qt/qtgui-4.8:4
-		>=dev-qt/qtscript-4.8:4
-		>=dev-qt/qtsql-4.8:4[sqlite]
-		>=dev-qt/qtwebkit-4.8:4
-		dbus? ( >=dev-qt/qtdbus-4.8:4 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dbus? ( dev-qt/qtdbus:5 )
-	)
+	dbus? ( dev-qt/qtdbus:5 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )"
+	dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS CHANGELOG FAQ README.md )
 S=${WORKDIR}/${MY_P}
@@ -68,7 +57,7 @@ 
 		rm translations/${1}.ts || die
 	}
 
-	epatch_user
+	eapply_user
 
 	# remove outdated prebuilt localizations
 	rm -rf bin/locale || die
@@ -88,16 +77,11 @@ 
 	export \
 		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
 		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		USE_QTWEBKIT_2_2=true \
 		DISABLE_DBUS=$(usex dbus '' 'true') \
 		KDE_INTEGRATION=$(usex kde 'true' '') \
 		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
 
-	if use qt4 ; then
-		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	else
-		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
-	fi
+	eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
 }
 
 src_install() {