[gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/, kde-plasma/breeze-gtk/files/

[Andreas Sturmlechner]

commit:     c337a66c6d57d56e9c1b267a777963bbc7446ec5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 12:47:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 12:47:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c337a66c

kde-plasma/breeze-gtk: Drop obsolete pre-cmake-3.16 hack

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild             | 11 +----------
 .../files/breeze-gtk-5.16.5-cmake-pre-3.16.patch         | 16 ----------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index fc35e8de4e..f6ca2f7841 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -17,6 +17,7 @@ IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/sassc
+	>=dev-util/cmake-3.16
 	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
 	>=kde-plasma/breeze-${PVCUT}:5
 "
@@ -30,19 +31,9 @@ pkg_setup() {
 	ecm_pkg_setup
 }
 
-src_prepare() {
-	ecm_src_prepare
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	fi
 	ecm_src_configure
 }

diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
deleted file mode 100644
index cbf8693731..0000000000
--- a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com>
-
---- a/cmake/FindPythonCairo.cmake
-+++ b/cmake/FindPythonCairo.cmake
-@@ -1,10 +1,4 @@
--if(CMAKE_VERSION VERSION_LESS 3.12.0)
--    find_package(PythonInterp 3 REQUIRED)
--    # PythonInterp sets PYTHON_EXECUTABLE
--else()
--    find_package(Python3 COMPONENTS Interpreter REQUIRED)
--    set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
--endif()
-+find_package(PythonInterp 3 REQUIRED)
- 
- # Check for python cairo
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import cairo"