gentoo resync : 30.06.2018

5 files changed, 49 insertions, 102 deletions

diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 3af9179f1a54..07e60725a1f1 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,6 +1,6 @@
+AUX qtcurve-1.9.0-build_testing.patch 1241 BLAKE2B e4a9c8d947bcb129ad6f532962849535b2b99684317be8a0fcc925730a9635f9b6c38bc89eecca3a0dd30450f261e099ad87de0d873c42bbc30524877330efe3 SHA512 4d8046b111d7accaaab9710023e1d1d12080d71b96a3f0cf15a2a12a1637ce98ca2741d25bf9b861f0bdaa507ebb4a85b14c6e098bc82a687de2e926bb0883a9
 AUX qtcurve-1.9.0-rare_crash_hang_fix.patch 9205 BLAKE2B 30f40705b238d390f05a7c71ac44ae94fabccc66a56c97f280a28b44b4ee1e1f8dc3c1fe41aa0df2ba9690f725e1535557ede6c371f7af87eff17d3080f85d85 SHA512 dbffea87cd3e88e2c06bb7fb6a0e684e3e8bc3e58e841cba8838acf3ca9624364f40b74b05ea827706cb386d53b1fd298152a6f758c349a2fdac7efafda5d2f1
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 BLAKE2B a63049086d967bb755d4f071ac4a5058a679d4d2914855b98e82763cbd9a22cdc6d75afb6ddb15b7e24a55e8e248b8df0a5cb517fc9be7ef3b07881448c2b5be SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e
-EBUILD qtcurve-1.9.0_rc1-r1.ebuild 2065 BLAKE2B 4b45d665aeba947e5b51477e6f720fe0f756c9e16e0659cb0504fd03df123a2b81829e3a24ab699d60b12a1dcf96a688002df8eae6a06409ffcccf53e104a9d8 SHA512 84a6fa3e5d59a3fc10e632aa27a864c256fcd569ced6fb49f77802b2a8d30675da3768503f30426d5c284c221ee6f59f7507ac8a0fb1717d2d48137f4332e6a3
-EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1974 BLAKE2B 001e67d1a862f5040e7088ff3671738b5ddd0669ba7dcf56e8a7d8fae97990304542e37861930bd8aebde72e18250c1b35b8e7151cfa356618fed52c5ae88117 SHA512 cff3c3ee7ca5fdd3d13aa9c953bc1bede44ac1b16cc616538b542b0ba9380dda124b12e3989e3dbbe84bb81a445da6f328702fabcf13d7dd793f4de457291124
-EBUILD qtcurve-9999.ebuild 1971 BLAKE2B df4f9f6c79453d76dbe65bdeb2657d1d80763a35073898fa32b03b118ebba732561be8711ae43215b748dea9069defa12691d0bb3b59c8e8ee6b446c5c6000be SHA512 4ad09d774e114645fd74ef7d4f8841af3cc6229e7d49ebef4cc88638b89def50743e79e44568c95ccdbad79939f11c3684ebcade4323d5aaca1d0836050b89b1
+EBUILD qtcurve-1.9.0_rc1-r2.ebuild 1960 BLAKE2B 4587c07047c0f21fe3f63d95eee9cb771fe453e51aa4c7cc6a10ffd456b5fa1f11b9308e35410b9a3ca003066481cb107aed1652f6a6486411431075d83aa1f2 SHA512 e406769e290be4e2bc1a2589b164d0d72cb532cce33804a331b948e0c4d0b01c58a14fb83e6ca01b449ba30793a1c7ab504a1e41669b7d0db2731f4fe4cc71d3
+EBUILD qtcurve-9999.ebuild 1912 BLAKE2B 5995c2956da4675290c0b4d688dad677b58c9616d48b32413bbbb44c4f41ea3119d73685775309074f528b237f01b78bb9994587af11681cd09aa9095f332ddd SHA512 2b4a358871d1ed0daf8d8769301edc6c0735a3f6039a168a92db40fa8e357c20b3c8b7ffa6a247d41551062415c3955751bb75dd01b92bd051c80d05c8232fae
 MISC metadata.xml 571 BLAKE2B 39c415e51cd1ad85b251d9a3801b4d7883826f7d83a7e41778289a70285d58bd10663010d540b24a9d54010518ac7258fb9c845c41f7a2d54004a9ce527bb1fe SHA512 63d721869c8b2fcef4fb4f8a5bfcf3e728a7d3d369f4d71b95c2ce1edb1f5010b1369df5b8daaf46221d1f8085c17b790b611a350a599d0741112cebb0c37684
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch
new file mode 100644
index 000000000000..16f7198aba8f
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch
@@ -0,0 +1,44 @@
+From 237912b291dcc706fcc1d9b02a8398385d19f38f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 26 Jun 2018 18:03:06 +0200
+Subject: [PATCH] Switch from ENABLE_TEST to the ECM/CMake standard
+ BUILD_TESTING
+
+Summary:
+BUILD_TESTING is used throughout KDE projects as provided by
+CTest and/or KDECMakeSettings.
+
+Reviewers: yuyichao
+
+Reviewed By: yuyichao
+
+Differential Revision: https://phabricator.kde.org/D13741
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70e21b3a..15f6b177 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,7 +52,7 @@ qtc_option(ENABLE_QT4 "Building Qt4 theme." On)
+ qtc_option(ENABLE_QT5 "Building Qt5 theme." On)
+ qtc_option(ENABLE_GTK2 "Building Gtk2 theme." On)
+ # option(ENABLE_GTK3 "Building Gtk3 theme." On)
+-option(ENABLE_TEST "Enable testing." On)
++option(BUILD_TESTING "Enable testing." On)
+ option(QTC_ENABLE_X11 "Enable X11" On)
+ option(QTC_INSTALL_PO "Install translation files." On)
+ 
+@@ -247,7 +247,7 @@ if(ENABLE_GTK2)
+     add_subdirectory(gtk2)
+ endif()
+ add_subdirectory(tools)
+-if(ENABLE_TEST)
++if(BUILD_TESTING)
+   enable_testing()
+   add_subdirectory(test)
+ endif()
+-- 
+2.18.0
+
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
deleted file mode 100644
index 484ac77201a3..000000000000
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Widget styles for Qt and GTK2"
-HOMEPAGE="https://cgit.kde.org/qtcurve.git"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+X gtk nls plasma qt4 +qt5 test"
-
-if [[ "${PV}" != 9999 ]] ; 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/_/-}"
-fi
-
-REQUIRED_USE="gtk? ( X )
-	|| ( gtk qt4 qt5 )
-	plasma? ( qt5 )
-"
-
-COMMON_DEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		$(add_qt_dep qtdbus)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtsvg)
-		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
-	)
-	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)
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-themes/gtk-engines-qtcurve
-"
-
-DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
-
-#PATCHES=(
-#	"${FILESDIR}/${P}-add_utils_include.patch"
-#)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_QT4_ENABLE_KWIN=OFF
-		-DQTC_KDE4_DEFAULT_HOME=ON
-		-DENABLE_GTK2="$(usex gtk)"
-		-DENABLE_QT4="$(usex qt4)"
-		-DENABLE_QT5="$(usex qt5)"
-		-DENABLE_TEST="$(usex test)"
-		-DQTC_ENABLE_X11="$(usex X)"
-		-DQTC_INSTALL_PO="$(usex nls)"
-		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
-	)
-
-	kde5_src_configure
-}
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index 600372fcffb2..e795ba2ee0fe 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
@@ -15,7 +15,7 @@ IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
@@ -67,6 +67,7 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.0-rare_crash_hang_fix.patch"
+	"${FILESDIR}/${PN}-1.9.0-build_testing.patch"
 )
 
 src_configure() {
@@ -74,11 +75,9 @@ src_configure() {
 		-DENABLE_QT4=OFF
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_QT4_ENABLE_KWIN=OFF
 		-DQTC_KDE4_DEFAULT_HOME=ON
 		-DENABLE_GTK2="$(usex gtk)"
 		-DENABLE_QT5="$(usex qt5)"
-		-DENABLE_TEST="$(usex test)"
 		-DQTC_ENABLE_X11="$(usex X)"
 		-DQTC_INSTALL_PO="$(usex nls)"
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 0c90108fce51..d5f28086e7cc 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -74,11 +74,9 @@ src_configure() {
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-DENABLE_QT4=OFF
 		-DQTC_QT4_ENABLE_KDE=OFF
-		-DQTC_QT4_ENABLE_KWIN=OFF
 		-DQTC_KDE4_DEFAULT_HOME=ON
 		-DENABLE_GTK2="$(usex gtk)"
 		-DENABLE_QT5="$(usex qt5)"
-		-DENABLE_TEST="$(usex test)"
 		-DQTC_ENABLE_X11="$(usex X)"
 		-DQTC_INSTALL_PO="$(usex nls)"
 		-DQTC_QT5_ENABLE_KDE="$(usex plasma)"