From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17E9A138359 for ; Sun, 12 Jul 2020 22:56:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77C96E085A; Sun, 12 Jul 2020 22:56:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FA49E085A for ; Sun, 12 Jul 2020 22:56:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C32A634F51D for ; Sun, 12 Jul 2020 22:55:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 517312DB for ; Sun, 12 Jul 2020 22:55:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1594594407.568d5a1aea5a1931403de7653376fcd227694d6a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/krita/files/krita-4.3.0-tests-optional.patch media-gfx/krita/krita-4.3.0.ebuild X-VCS-Directories: media-gfx/krita/ media-gfx/krita/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 568d5a1aea5a1931403de7653376fcd227694d6a X-VCS-Branch: master Date: Sun, 12 Jul 2020 22:55:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f17ac4c-dece-4a66-a026-04626dec7908 X-Archives-Hash: a7b26d71baf00a487f569b9f5606f93b commit: 568d5a1aea5a1931403de7653376fcd227694d6a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 11 21:58:50 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 12 22:53:27 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=568d5a1a media-gfx/krita: Drop 4.3.0 Moved to Gentoo ebuild repository. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../krita/files/krita-4.3.0-tests-optional.patch | 536 --------------------- media-gfx/krita/krita-4.3.0.ebuild | 122 ----- 2 files changed, 658 deletions(-) diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch deleted file mode 100644 index b58dcf1f4a..0000000000 --- a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch +++ /dev/null @@ -1,536 +0,0 @@ -From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 17 Jun 2020 20:18:28 +0200 -Subject: [PATCH] Don't build tests when testing not requested - -Signed-off-by: Andreas Sturmlechner - -diff --git a/libs/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt -index 536b1a4ac5..7d8435eec4 100644 ---- a/libs/brush/CMakeLists.txt -+++ b/libs/brush/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${EIGEN3_INCLUDE_DIR} -diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt -index cbdac265d2..1a50c1620a 100644 ---- a/libs/flake/CMakeLists.txt -+++ b/libs/flake/CMakeLists.txt -@@ -9,8 +9,10 @@ include_directories( - ) - - add_subdirectory(styles) --add_subdirectory(tests) --add_subdirectory(resources/tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+ add_subdirectory(resources/tests) -+endif() - - set(kritaflake_SRCS - KoGradientHelper.cpp -diff --git a/libs/global/CMakeLists.txt b/libs/global/CMakeLists.txt -index e8162c5e46..f6ea6bc840 100644 ---- a/libs/global/CMakeLists.txt -+++ b/libs/global/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include(CheckFunctionExists) - check_function_exists(backtrace HAVE_BACKTRACE) -diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt -index 810dee2f16..44c72ba2d5 100644 ---- a/libs/image/CMakeLists.txt -+++ b/libs/image/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - add_subdirectory( tiles3 ) - -diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt -index 88c0516360..01f2383ddb 100644 ---- a/libs/image/tiles3/CMakeLists.txt -+++ b/libs/image/tiles3/CMakeLists.txt -@@ -1 +1,3 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() -diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt -index 958104aaaf..3b8a33eadc 100644 ---- a/libs/libkis/CMakeLists.txt -+++ b/libs/libkis/CMakeLists.txt -@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES - install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) - - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() -diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt -index d33aff38fc..abdc2f7a36 100644 ---- a/libs/metadata/CMakeLists.txt -+++ b/libs/metadata/CMakeLists.txt -@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES - - install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() -diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt -index 6acbf4d1a5..50e60b55d8 100644 ---- a/libs/odf/CMakeLists.txt -+++ b/libs/odf/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritaodf_LIB_SRCS - KoOdf.cpp -diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt -index 7e38c6cb00..60879fcea2 100644 ---- a/libs/pigment/CMakeLists.txt -+++ b/libs/pigment/CMakeLists.txt -@@ -33,8 +33,10 @@ else() - set(__per_arch_alpha_applicator_factory_objs KoAlphaMaskApplicatorFactoryImpl.cpp) - endif() - --add_subdirectory(tests) --add_subdirectory(benchmarks) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+ add_subdirectory(benchmarks) -+endif() - - set(kritapigment_SRCS - DebugPigment.cpp -diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt -index b7c42996bd..30f9d5c5c6 100644 ---- a/libs/store/CMakeLists.txt -+++ b/libs/store/CMakeLists.txt -@@ -1,6 +1,8 @@ - include_directories(${QUAZIP_INCLUDE_DIRS}) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritastore_LIB_SRCS - KoDirectoryStore.cpp -diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt -index d273bf548a..d180fd8970 100644 ---- a/libs/ui/CMakeLists.txt -+++ b/libs/ui/CMakeLists.txt -@@ -13,7 +13,9 @@ if (ANDROID) - include_directories (${Qt5AndroidExtras_INCLUDE_DIRS}) - endif() - --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - if (APPLE) - find_library(FOUNDATION_LIBRARY Foundation) -diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt -index 75eded9db1..c0093cfd3a 100644 ---- a/libs/widgets/CMakeLists.txt -+++ b/libs/widgets/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt -index c62eeafb79..c33b16dd91 100644 ---- a/libs/widgetutils/CMakeLists.txt -+++ b/libs/widgetutils/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) - -diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt -index e14de2ba7c..8c56372cb3 100644 ---- a/plugins/color/lcms2engine/CMakeLists.txt -+++ b/plugins/color/lcms2engine/CMakeLists.txt -@@ -1,6 +1,8 @@ - project( lcmsengine ) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${LCMS2_INCLUDE_DIR} -diff --git a/plugins/dockers/animation/CMakeLists.txt b/plugins/dockers/animation/CMakeLists.txt -index a0b4b4beb4..b3de3f2749 100644 ---- a/plugins/dockers/animation/CMakeLists.txt -+++ b/plugins/dockers/animation/CMakeLists.txt -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE) - add_subdirectory(tests) - endif() - -diff --git a/plugins/dockers/lut/CMakeLists.txt b/plugins/dockers/lut/CMakeLists.txt -index 01844be146..6745db73e6 100644 ---- a/plugins/dockers/lut/CMakeLists.txt -+++ b/plugins/dockers/lut/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${OCIO_INCLUDE_DIR} -diff --git a/plugins/extensions/qmic/CMakeLists.txt b/plugins/extensions/qmic/CMakeLists.txt -index afd390b726..f5766c1b50 100644 ---- a/plugins/extensions/qmic/CMakeLists.txt -+++ b/plugins/extensions/qmic/CMakeLists.txt -@@ -20,4 +20,6 @@ add_library(kritaqmic MODULE ${kritaqmic_SOURCES}) - target_link_libraries(kritaqmic kritaui) - install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() -diff --git a/plugins/filters/CMakeLists.txt b/plugins/filters/CMakeLists.txt -index 63a5de64e9..f8b4467926 100644 ---- a/plugins/filters/CMakeLists.txt -+++ b/plugins/filters/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - add_subdirectory( blur ) - add_subdirectory( colors ) - add_subdirectory( colorsfilters ) -diff --git a/plugins/filters/unsharp/CMakeLists.txt b/plugins/filters/unsharp/CMakeLists.txt -index e63725abb1..5a61b5f89c 100644 ---- a/plugins/filters/unsharp/CMakeLists.txt -+++ b/plugins/filters/unsharp/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory( tests ) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritaunsharpfilter_SOURCES - unsharp.cpp -diff --git a/plugins/impex/brush/CMakeLists.txt b/plugins/impex/brush/CMakeLists.txt -index b0343eddd4..ef7c617a40 100644 ---- a/plugins/impex/brush/CMakeLists.txt -+++ b/plugins/impex/brush/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritabrushexport_PART_SRCS - kis_brush_export.cpp -diff --git a/plugins/impex/csv/CMakeLists.txt b/plugins/impex/csv/CMakeLists.txt -index 60eba64463..cf6e6ac9bd 100644 ---- a/plugins/impex/csv/CMakeLists.txt -+++ b/plugins/impex/csv/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - # import - -diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt -index aa39a91879..c80833941f 100644 ---- a/plugins/impex/exr/CMakeLists.txt -+++ b/plugins/impex/exr/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} ) - -diff --git a/plugins/impex/gif/CMakeLists.txt b/plugins/impex/gif/CMakeLists.txt -index bb7f582b6c..b95c9d3d07 100644 ---- a/plugins/impex/gif/CMakeLists.txt -+++ b/plugins/impex/gif/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritagifexport_SOURCES - kis_gif_export.cpp -diff --git a/plugins/impex/heif/CMakeLists.txt b/plugins/impex/heif/CMakeLists.txt -index d25f3e1704..a7f663b13f 100644 ---- a/plugins/impex/heif/CMakeLists.txt -+++ b/plugins/impex/heif/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}") -diff --git a/plugins/impex/heightmap/CMakeLists.txt b/plugins/impex/heightmap/CMakeLists.txt -index a8b03308d9..04e0f1000a 100644 ---- a/plugins/impex/heightmap/CMakeLists.txt -+++ b/plugins/impex/heightmap/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) - -diff --git a/plugins/impex/jp2/CMakeLists.txt b/plugins/impex/jp2/CMakeLists.txt -index c9393f6cfa..b4333025aa 100644 ---- a/plugins/impex/jp2/CMakeLists.txt -+++ b/plugins/impex/jp2/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenJPEG_CFLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenJPEG_CFLAGS}") -diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt -index 50edb05c96..eaa90964a7 100644 ---- a/plugins/impex/jpeg/CMakeLists.txt -+++ b/plugins/impex/jpeg/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") - -diff --git a/plugins/impex/libkra/CMakeLists.txt b/plugins/impex/libkra/CMakeLists.txt -index 2b840c1e8a..88d849172f 100644 ---- a/plugins/impex/libkra/CMakeLists.txt -+++ b/plugins/impex/libkra/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritalibkra_LIB_SRCS - kis_colorize_dom_utils.cpp -diff --git a/plugins/impex/ora/CMakeLists.txt b/plugins/impex/ora/CMakeLists.txt -index a476f422b4..0f4e563505 100644 ---- a/plugins/impex/ora/CMakeLists.txt -+++ b/plugins/impex/ora/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(libkritaconverter_LIB_SRCS - ora_converter.cpp -diff --git a/plugins/impex/pdf/CMakeLists.txt b/plugins/impex/pdf/CMakeLists.txt -index 320da291a4..c423ff4214 100644 ---- a/plugins/impex/pdf/CMakeLists.txt -+++ b/plugins/impex/pdf/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp ) - -diff --git a/plugins/impex/png/CMakeLists.txt b/plugins/impex/png/CMakeLists.txt -index d567e8059e..6d3815f06f 100644 ---- a/plugins/impex/png/CMakeLists.txt -+++ b/plugins/impex/png/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritapngimport_SOURCES - kis_png_import.cc -diff --git a/plugins/impex/psd/CMakeLists.txt b/plugins/impex/psd/CMakeLists.txt -index 4112536da2..f81598d01d 100644 ---- a/plugins/impex/psd/CMakeLists.txt -+++ b/plugins/impex/psd/CMakeLists.txt -@@ -1,4 +1,4 @@ --if (NOT MSVC AND NOT APPLE) -+if(BUILD_TESTING AND NOT MSVC AND NOT APPLE) - add_subdirectory(tests) - endif() - -diff --git a/plugins/impex/qimageio/CMakeLists.txt b/plugins/impex/qimageio/CMakeLists.txt -index c916af4870..f1a068e9c2 100644 ---- a/plugins/impex/qimageio/CMakeLists.txt -+++ b/plugins/impex/qimageio/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritaqimageioexport_SOURCES - kis_qimageio_export.cpp -diff --git a/plugins/impex/qml/CMakeLists.txt b/plugins/impex/qml/CMakeLists.txt -index e53156905a..1dff196ac5 100644 ---- a/plugins/impex/qml/CMakeLists.txt -+++ b/plugins/impex/qml/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritaqmlexport_SOURCES - qml_converter.cc -diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt -index 71cb5b355c..70241a8903 100644 ---- a/plugins/impex/raw/CMakeLists.txt -+++ b/plugins/impex/raw/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - if(OPENEXR_FOUND) - include_directories(${OPENEXR_INCLUDE_DIRS}) -diff --git a/plugins/impex/svg/CMakeLists.txt b/plugins/impex/svg/CMakeLists.txt -index 8f803a2783..6642112c11 100644 ---- a/plugins/impex/svg/CMakeLists.txt -+++ b/plugins/impex/svg/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritasvgimport_SOURCES - kis_svg_import.cc -diff --git a/plugins/impex/tga/CMakeLists.txt b/plugins/impex/tga/CMakeLists.txt -index b7fe804897..79c2aff4d4 100644 ---- a/plugins/impex/tga/CMakeLists.txt -+++ b/plugins/impex/tga/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(kritatgaexport_SOURCES - kis_tga_export.cpp -diff --git a/plugins/impex/tiff/CMakeLists.txt b/plugins/impex/tiff/CMakeLists.txt -index 8e57566510..0ee181c9bc 100644 ---- a/plugins/impex/tiff/CMakeLists.txt -+++ b/plugins/impex/tiff/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(libkritatiffconverter_LIB_SRCS - kis_tiff_converter.cc -diff --git a/plugins/impex/xcf/CMakeLists.txt b/plugins/impex/xcf/CMakeLists.txt -index d76985be87..a754b686ba 100644 ---- a/plugins/impex/xcf/CMakeLists.txt -+++ b/plugins/impex/xcf/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") - -diff --git a/plugins/paintops/defaultpaintops/CMakeLists.txt b/plugins/paintops/defaultpaintops/CMakeLists.txt -index 68ac300940..35cd140838 100644 ---- a/plugins/paintops/defaultpaintops/CMakeLists.txt -+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(brush/tests) -+if(BUILD_TESTING) -+ add_subdirectory(brush/tests) -+endif() - - include_directories(brush - duplicate -diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt -index 4d6d831760..59ca6657ca 100644 ---- a/plugins/paintops/libpaintop/CMakeLists.txt -+++ b/plugins/paintops/libpaintop/CMakeLists.txt -@@ -103,5 +103,6 @@ set_target_properties(kritalibpaintop PROPERTIES - - install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) - -- --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() -diff --git a/plugins/tools/basictools/CMakeLists.txt b/plugins/tools/basictools/CMakeLists.txt -index 9d725a7c7a..0221e604be 100644 ---- a/plugins/tools/basictools/CMakeLists.txt -+++ b/plugins/tools/basictools/CMakeLists.txt -@@ -1,6 +1,6 @@ --if (NOT APPLE) -+if(BUILD_TESTING AND NOT APPLE) - add_subdirectory(tests) --endif () -+endif() - - set(kritadefaulttools_SOURCES - default_tools.cc -diff --git a/plugins/tools/tool_transform2/CMakeLists.txt b/plugins/tools/tool_transform2/CMakeLists.txt -index e90230c48e..2cf727a991 100644 ---- a/plugins/tools/tool_transform2/CMakeLists.txt -+++ b/plugins/tools/tool_transform2/CMakeLists.txt -@@ -1,4 +1,4 @@ --if (NOT WIN32 AND NOT APPLE) -+if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE) - add_subdirectory(tests) - endif() - --- -2.27.0 - diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild deleted file mode 100644 index 405d176882..0000000000 --- a/media-gfx/krita/krita-4.3.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8,9} ) -KFMIN=5.60.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" - KEYWORDS="" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/" - -LICENSE="GPL-3" -SLOT="5" -IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext -" -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/quazip - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ') - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - heif? ( media-libs/libheif:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${RDEPEND} - vc? ( >=dev-libs/vc-1.1.0 ) -" - -# bug 630508 -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}"/${P}-tests-optional.patch - "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch -) - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - $(cmake_use_find_package color-management OCIO) - $(cmake_use_find_package fftw FFTW3) - $(cmake_use_find_package gif GIF) - $(cmake_use_find_package gsl GSL) - $(cmake_use_find_package heif HEIF) - $(cmake_use_find_package jpeg JPEG) - $(cmake_use_find_package openexr OpenEXR) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package qtmedia Qt5Multimedia) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package tiff TIFF) - $(cmake_use_find_package vc Vc) - ) - - ecm_src_configure -}