--- /usr/portage/www-client/qupzilla/qupzilla-1.4.4.ebuild 2013-09-09 11:38:07.000000000 +0000 +++ qupzilla-1.4.4.ebuild 2013-09-22 16:56:31.000000000 +0000 @@ -6,7 +6,7 @@ PLOCALES="ca_ES cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA zh_CN zh_TW" -inherit l10n multilib qt4-r2 vcs-snapshot +inherit l10n multilib qmake-utils qt4-r2 vcs-snapshot MY_P="QupZilla-${PV}" @@ -17,15 +17,30 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="dbus debug kde nonblockdialogs" +IUSE="dbus debug kde nonblockdialogs qt4 qt5" +REQUIRED_USE="|| ( qt4 qt5 )" DEPEND=" - >=dev-qt/qtcore-4.7:4 - >=dev-qt/qtgui-4.7:4 - >=dev-qt/qtscript-4.7:4 - >=dev-qt/qtsql-4.7:4 - >=dev-qt/qtwebkit-4.7:4 - dbus? ( >=dev-qt/qtdbus-4.7:4 )" + qt4? ( + >=dev-qt/qtcore-4.7:4 + >=dev-qt/qtgui-4.7:4 + >=dev-qt/qtscript-4.7:4 + >=dev-qt/qtsql-4.7:4 + >=dev-qt/qtwebkit-4.7:4 + dbus? ( >=dev-qt/qtdbus-4.7:4 ) + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/linguist:5 + dev-qt/qtconcurrent:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5 + dev-qt/qtwebkit:5 + dbus? ( dev-qt/qtdbus:5 ) + ) +" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} @@ -45,9 +60,13 @@ export DISABLE_DBUS=$(use dbus && echo false || echo true) export KDE=$(use kde && echo true || echo false) # in future this will enable nepomuk integration export NONBLOCK_JS_DIALOGS=$(use nonblockdialogs && echo true || echo false) - has_version '>=dev-qt/qtwebkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true - - eqmake4 + if use qt5; then + export USE_QTWEBKIT_2_2=true + eqmake5 + else + has_version '>=dev-qt/qtwebkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true + eqmake4 + fi } src_install() {