gentoo resync : 17.01.2010

2 files changed, 25 insertions, 30 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 4d9491b1459d..f1b25a1d0d2b 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -2,5 +2,5 @@ AUX falkon-3.1.0-fix-warn-registering-schemes.patch 3768 BLAKE2B 29b1f58f9663440
 AUX falkon-3.1.0-qt-5.14.patch 691 BLAKE2B d8244527cfb5d5f732074e26a1363b5fa42b2a4ebccf35a2ed1c920d156d11b20db7ceef99ff8059bf27094788d001e5c542312f8eeb87ba57b921acf032aa81 SHA512 6294228a6880b6551c9ebe0b64b71f710a92ebd38cdfd140ff941ab9ec1fef04be279aedb50986d9b8b0128459d600fbc91d90616d81e0fafaec335d138fad69
 AUX falkon-3.1.0-use-cmake-find-intl.patch 2599 BLAKE2B 5c83209dd027ceb4973896f68a0b2fad4187dd8cb38eefe75f70a06bd96b905cc24c9af1cd395509ca7791d7eb4eae70a21db95dcd52ee7449414ae4d01d7bd1 SHA512 43ce52e1a280cbcd5d2ac6cac35e3b09c5c6efbd9dc1c6d343dfd85142e75a4534862fe9525a2b06466e191bb76ce1c7a7d60ccc759ad8736726f70ed0e13a68
 DIST falkon-3.1.0.tar.xz 2292692 BLAKE2B 1a5d8dd979afb3ef81ea5409314cc0971eaa0b5de54ed7e14668c6596d11cb86d9143acc5285d24d98a671c2486f83e626669d394670d72610b5ad8c68fada69 SHA512 c04f97869150b8ab81ae7b01c7137e35ca5c3103c057e01896454bbeda1075372a7831d2dfe7ab66794de0983593df6e46eff47c5cdc2bc959f81b022506f054
-EBUILD falkon-3.1.0-r1.ebuild 2102 BLAKE2B d3c8e45d2c5dda921916fff639cd557d140e5ad6f54e0728dceb253ea73e73f6547955390328e17f1e1a23c73bc75644ac8c201ad2f7f7e47802b2bc30b155ba SHA512 ba296bf6823455deab4bc713f6d4f79361eb50964e0c0e8239bd6b09a8bbb884c87db12d2695ae908aaed7b6a5d057f94f0e14283b86e14bbb076d6eb725af81
+EBUILD falkon-3.1.0-r1.ebuild 1967 BLAKE2B 9144696f1a2044c0a13aa724abea070dc3e5ead64646ac42bfe34238f53d20dd554b6b25bd2495fe2d32577100ce3e13e4455b55910ef3b40eb87f09cdfb54e9 SHA512 ad6788e871166bc1ae578c47a772a7110cbe844ba09ba1e01cf0db0eb3664b9ff10fde8c4d065257b826d2780b03d616b31e8ac68c1a16444c15c1d3cfe15341
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
 }