gentoo resync : 18.11.2019

5 files changed, 30 insertions, 29 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index a328487e9e3c..4d9a0186e294 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 0cda2550e593..7bc4a8c84e33 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -4,5 +4,5 @@ AUX qtcurve-1.9.0-libreoffice-crashfix.patch 2509 BLAKE2B f5aa8b5355da28eedde976
 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 1839 BLAKE2B a82f14b59a6aa08250aad17cdfb146fce67feb134d98f1e77fccfa4654068eada366045f46de976c9de1f54efcd5b8622a1165b7c2bd3912f4f7d28a2cc7fda6 SHA512 9fc95e7187df48cf78c816e3823177006e452d0e23de9dbfff19d350bab0edb7d6212ba2eff184e9e73848beea108f57fd8861dff773fcda31496aee084a49e4
+EBUILD qtcurve-9999.ebuild 1826 BLAKE2B 011238475d111dba4ffc599e6877b2397559d29f6ccfbcab02c6829ab74d0bd208a0dd6911296b6e5a0f634954a0383ff8474c3c17230c2abad638286ab20e46 SHA512 83db2f4fc364ccb2555e3bd6596bd1e90e844509802e8faa9c64b334f6222df9132b42dee4a7872f1c1a51e6b1bbc368e185d1d80c6dada2daf0ad426bd3ea3c
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 98dfb742e0d0..47898ba5cf1c 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=7
 
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-inherit kde5
+inherit cmake-utils 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 +26,34 @@ REQUIRED_USE="gtk? ( X )
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	plasma? ( kde-frameworks/extra-cmake-modules: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:5
+		kde-frameworks/frameworkintegration:5
+		kde-frameworks/karchive:5
+		kde-frameworks/kcompletion:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kdelibs4support:5
+		kde-frameworks/kguiaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kiconthemes:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui: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/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? ( dev-qt/qtx11extras:5 )
 	)
 	X? (
 		x11-libs/libX11
@@ -74,10 +74,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-utils_src_configure
 }
diff --git a/x11-themes/windowmaker-themes/Manifest b/x11-themes/windowmaker-themes/Manifest
index 0b4e686ab4b0..32cd47caffab 100644
--- a/x11-themes/windowmaker-themes/Manifest
+++ b/x11-themes/windowmaker-themes/Manifest
@@ -72,6 +72,6 @@ DIST where-default-0.2.tar.gz 61648 BLAKE2B db8e4dc4b74c96aff7492ea8ec000bcda4d4
 DIST windowmaker-themes-0.1.tar.gz 16413142 BLAKE2B db65c3a15731a4526d8ce45c56ee7987a3f4c2e32a1020c35ccaae6c722aebda758d83fedbac375f7d42e989544295c57dc2ee8143dd0682ab3fe4d82992621c SHA512 2ecdd6155d9f62ed8e815c8c91e6f46114c1ff79bc4c1c79f383c2dfa55caa576f2c0c0010b469db7d851f4afa6fa196302b4ff5a7acb9d708f81f6708052b47
 DIST wmfrost.tar.gz 345302 BLAKE2B 3bd5fecbf815d9ba78d3e605522e65431ba8a89b7cf5573b3d540a7733d57d3f8bd29dfd8cf0fcd6f0ffbcbabf02e8a58af97ebc17da3b505b5532162f4d2692 SHA512 129d452b3fe907f914e61202e472a63a7d61de7eac54a5d7b9c826f4ba7fb93d6dd0a2c6910e765129c815235e04889d408e3ce3e5ef2970a7590dbf8f1c6b29
 DIST yondo.tar.gz 257438 BLAKE2B 746ae152b9812aa3fbff7fd81d58478415fef0a100f8d51df2a7215cf3290b086e3ee661674dffa37e40ccb3ac05acdf8976378457660896099bdf74344d8f90 SHA512 be93dfdf19ab9d24df747c7acae40996c88dd11df6c8d5f5dd8ebfe2ab1ba114eb531ee1668592501e37e4773abbc5a9b20d6b1adb58169293c945d76017bdbe
-EBUILD windowmaker-themes-0.1-r1.ebuild 1062 BLAKE2B 766f01ac53e7fa98d6f8974fec187f13fe616ed430dc85879e71f6caef795ddd86f227d8bf5020fdea82902aac7c72d8ecad43a358b636c01ae9dbd49fb07768 SHA512 e84e1a3cffb4e0720b7bf346d3c312d136570a62c4424d0edd98600ccaa521eaf278f2c5e7485b2b97f60af027b8bf67c7b677adbf0c6e82ffe5e567584e13e9
+EBUILD windowmaker-themes-0.1-r1.ebuild 1059 BLAKE2B 2764891335c059688db1d990fc8295818ada026ae1a5269aa756bafacb9eb3ff59b0ccfc30c81b52e214997b66ffd47b163bba98a90304bc7ccf05468599af98 SHA512 c380b962e8dcd6a094b327b237b6b885a205fdacbbde0d34a20ceafabb48c9fca69f3207c075ce720962dee20fe7a9672d965781e111301957eaf9ea59706035
 EBUILD windowmaker-themes-0.1.ebuild 4029 BLAKE2B a973cc79ea3797f7aba7f5e16223d1d090053ae9dc5fde5ab90046167ff615efe3dc43a64c3f16d1980a1104835c46f21d0f9bc48961e3a16e50e33247e65360 SHA512 c3e16526f0b4b424f99f59e34743b354eec51e2a628cbd8b7a200ed2f3fca48f6a7eba39b69af9bc74b76203fb80d6fa7305a40d295c42cd9e7ed62dc2d3f312
 MISC metadata.xml 253 BLAKE2B 3b0c2aef2a8a4a9d91417347a62b76bee2b27a774bee648874d8a4d20800ed78d3452f3c5289b6d47c6bd2188752b41ef94f0919cff5de8cc7d4aafa5bbcffe4 SHA512 2adb9b9e4859c6d1063e67c509015594eec484e91882e3a71b70ac031e02b6f01ab5a2ad4e1a12329c284b34f7d69b19e08b593a0dc3901e2470eabb3e8d3fb5
diff --git a/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild b/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
index 056b3d12c9f8..6e58272b37c2 100644
--- a/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
+++ b/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 IUSE="offensive"
 
 DEPEND=""