x11-themes/qtcurve: Drop 2/3 unused cmake variables

Already upstreamed patch enables kde5.eclass to handle the option.

Bug: https://bugs.gentoo.org/659190
Package-Manager: Portage-2.3.40, Repoman-2.3.9

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 (file)
index 0000000..16f7198
--- /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-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
index ae1d8dc5cf1baf63e9467cea0c3fe5c3c956b2d6..e795ba2ee0fe04a6a245e41d1bfa9dc3887ce373 100644 (file)
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild
@@ -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() {
@@ -77,7 +78,6 @@ src_configure() {
                -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 ca3205965a3b4d966cba14c6605991d991abf3cf..d5f28086e7cc0def24d69f37feb1e31482e6a399 100644 (file)
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -77,7 +77,6 @@ src_configure() {
                -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)"