gentoo resync : 15.01.2020

3 files changed, 33 insertions, 31 deletions

diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 7bc4a8c84e33..c37758d109cb 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -3,6 +3,6 @@ AUX qtcurve-1.9.0-gcc9.patch 1057 BLAKE2B 4071dde6768793e0bfc443816508b445fd713a
 AUX qtcurve-1.9.0-libreoffice-crashfix.patch 2509 BLAKE2B f5aa8b5355da28eedde976460c9c29d5ed90a8858c1cabd061495ff1d91dff015473d7488997e8849a91dbfd0238c253bfe96805a925e1f1ae1015cb8752f2ec SHA512 f58f568df682a2a809123203f4cb88c95965810968dbd30fdaaa63918d9669641cfa1cb659a4a3cb30f3267d39b0c98d29e0c7e300fb7bcf34017617d65a8c8c
 AUX qtcurve-1.9.0-no-X-buildfix.patch 1736 BLAKE2B 09c900df5fd20bb7219605446e5c7ae69c61684c7eb06cfc3d7579ac4dd8d6d67db84a2af595d4da69834b31e1820694b1948445e99bff8eb7294093f8bc4923 SHA512 f2811aec6f039935a86d14af2e3fd69092e57662656dffac283800156af4037dee609b5d27310c9276b42d10a6e52728c1ce6e3cc1f2194e05e9bc2dc8cc51a7
 DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66
-EBUILD qtcurve-1.9.0-r1.ebuild 2034 BLAKE2B f49917ab9cde7eb01c60d1105a64b8d715bfeac9bfcdc716b95bb93f4e70ab1fb61b970d09de0454b3defa6eacaa0d29d9f9ceb13e98e09daaeae05e62e820d4 SHA512 25c3625505a32cc0bcfcb8c2623563b083646a7a34281885ac75986890fcc1533cd4bfd4affd6c629b93b0ec0a94f549e54ca3320d08de53d056c0d2d1a7ae98
-EBUILD qtcurve-9999.ebuild 1826 BLAKE2B 011238475d111dba4ffc599e6877b2397559d29f6ccfbcab02c6829ab74d0bd208a0dd6911296b6e5a0f634954a0383ff8474c3c17230c2abad638286ab20e46 SHA512 83db2f4fc364ccb2555e3bd6596bd1e90e844509802e8faa9c64b334f6222df9132b42dee4a7872f1c1a51e6b1bbc368e185d1d80c6dada2daf0ad426bd3ea3c
+EBUILD qtcurve-1.9.0-r1.ebuild 2248 BLAKE2B 6b64d60aded9b711cb4e4ace06965cd1ee32fd117b720eee68b8f1b84229ed3a913ecbcaf13124101509f0e048d5d1ce00f7ece8672973b6768042a2fabb142f SHA512 ef1304a0de8d7154d810d883b6f5e6133368abde2fa90cc331cdade36caf541a6fc6fc44e0342e83e4b637ccb0287b92f0242d6fc2a24715db887faa83e26b8c
+EBUILD qtcurve-9999.ebuild 1814 BLAKE2B affdb4acd8a5ca09be62a4c56f5daeb326ece3db3d1d8397484830b78ac43cbd7ce3114339cad87fc588d48a99b2942b0d5f4c7f8c52dffa36bb35d49c023143 SHA512 591035dd867a7f3a693c68c6bfd4c54b01fe855d592fb16a75d131835ddb88bd6c6a74d96a76be3a4e38da49332686084fcd146d60c1f4a1cd96c850557f3bb6
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
index f09ad982cf4e..61c47c601e9d 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit cmake kde.org
 
 DESCRIPTION="Widget styles for Qt and GTK2"
 HOMEPAGE="https://cgit.kde.org/qtcurve.git"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="+X gtk nls plasma +qt5 test"
+IUSE="gtk nls plasma +qt5 test +X"
 
-if [[ "${PV}" != 9999 ]] ; then
+if [[ ${KDE_BUILD_TYPE} = release ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
@@ -28,32 +28,33 @@ REQUIRED_USE="gtk? ( X )
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	plasma? ( >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 )
 "
 DEPEND="
 	gtk? ( x11-libs/gtk+:2 )
 	plasma? (
-		$(add_frameworks_dep frameworkintegration)
-		$(add_frameworks_dep karchive)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kdelibs4support)
-		$(add_frameworks_dep kguiaddons)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kwindowsystem)
-		$(add_frameworks_dep kxmlgui)
-		$(add_qt_dep qtprintsupport)
+		>=dev-qt/qtprintsupport-${QTMIN}:5
+		>=kde-frameworks/frameworkintegration-${KFMIN}:5
+		>=kde-frameworks/karchive-${KFMIN}:5
+		>=kde-frameworks/kcompletion-${KFMIN}:5
+		>=kde-frameworks/kconfig-${KFMIN}:5
+		>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+		>=kde-frameworks/kcoreaddons-${KFMIN}:5
+		>=kde-frameworks/kdelibs4support-${KFMIN}:5
+		>=kde-frameworks/kguiaddons-${KFMIN}:5
+		>=kde-frameworks/ki18n-${KFMIN}:5
+		>=kde-frameworks/kiconthemes-${KFMIN}:5
+		>=kde-frameworks/kio-${KFMIN}:5
+		>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+		>=kde-frameworks/kwindowsystem-${KFMIN}:5
+		>=kde-frameworks/kxmlgui-${KFMIN}:5
 	)
 	qt5? (
-		$(add_qt_dep qtdbus)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtsvg)
-		$(add_qt_dep qtwidgets)
-		X? ( $(add_qt_dep qtx11extras) )
+		>=dev-qt/qtdbus-${QTMIN}:5
+		>=dev-qt/qtgui-${QTMIN}:5
+		>=dev-qt/qtsvg-${QTMIN}:5
+		>=dev-qt/qtwidgets-${QTMIN}:5
+		X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 	)
 	X? (
 		x11-libs/libX11
@@ -81,10 +82,11 @@ src_configure() {
 		-DQTC_KDE4_DEFAULT_HOME=ON
 		-DENABLE_GTK2="$(usex gtk)"
 		-DENABLE_QT5="$(usex qt5)"
+		-DBUILD_TESTING="$(usex test)"
 		-DQTC_ENABLE_X11="$(usex X)"
 		-DQTC_INSTALL_PO="$(usex nls)"
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
 	)
 
-	kde5_src_configure
+	cmake_src_configure
 }
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 47898ba5cf1c..285a77b53487 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Widget styles for Qt and GTK2"
 HOMEPAGE="https://cgit.kde.org/qtcurve.git"
@@ -80,5 +80,5 @@ src_configure() {
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }