From 8da960059e7f296f89df7bcc9e7d21293a77a6f2 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 11 Nov 2019 01:08:01 +0100 Subject: www-client/falkon: Port to ecm.eclass and kde.org.eclass Package-Manager: Portage-2.3.78, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner --- www-client/falkon/falkon-3.1.0-r1.ebuild | 53 +++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) (limited to 'www-client') diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild index 01a00bd0452a..c9d68b12622e 100644 --- a/www-client/falkon/falkon-3.1.0-r1.ebuild +++ b/www-client/falkon/falkon-3.1.0-r1.ebuild @@ -3,9 +3,11 @@ EAPI=7 -KDE_TEST="true" +ECM_TEST="true" +KFMIN=5.60.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde5 +inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/${P}.tar.xz" @@ -19,43 +21,42 @@ LICENSE="GPL-3" SLOT="0" IUSE="dbus kde libressl +X" -# drop qtwebengine subslot operator when QT_MINIMAL >= 5.12.0 COMMON_DEPEND=" - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork 'ssl') - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwebchannel) - $(add_qt_dep qtwebengine 'widgets' '' '5=') - $(add_qt_dep qtwidgets) + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl] + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5=[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 virtual/libintl - dbus? ( $(add_qt_dep qtdbus) ) + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) kde? ( - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kio) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep purpose) + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/purpose-${KFMIN}:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( - $(add_qt_dep qtx11extras) + >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libxcb:= x11-libs/xcb-util ) " DEPEND="${COMMON_DEPEND} - $(add_qt_dep linguist-tools) - $(add_qt_dep qtconcurrent) + >=dev-qt/linguist-tools-${QTMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 " if [[ ${KDE_BUILD_TYPE} != live ]]; then - DEPEND+=" $(add_frameworks_dep ki18n)" + DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:5" fi RDEPEND="${COMMON_DEPEND} !www-client/qupzilla - $(add_qt_dep qtsvg) + >=dev-qt/qtsvg-${QTMIN}:5 " PATCHES=( @@ -77,11 +78,5 @@ src_configure() { $(cmake_use_find_package kde KF5KIO) -DNO_X11=$(usex !X) ) - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - elog "If you were previously using QupZilla, you can manually migrate your profiles" - elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon" + ecm_src_configure } -- cgit v1.2.3-65-gdbad