gentoo auto-resync : 03:12:2022 - 14:59:58

3 files changed, 0 insertions, 163 deletions

diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 563ae008b3fd..629bb32e9af1 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,7 +1,4 @@
-AUX ktouch-22.04.3-without_x11.patch 3375 BLAKE2B 01d94894fafed1f2a51be2130431cbc3164856d528143610085b04d8f91a4beab172e79ade29c37dc2897443e36b4fe33a30c8bb583af1f15505278501e74f7a SHA512 9ac5b3035c89b08e968d3c4851571cf437a8d641137308d1f8ac56f2cf66ad8e39caa60a9b3ffe44f73c02234d4ddf7ece14bbdf305117da73c155f6ab09ad35
 AUX ktouch-22.07.90-without_x11.patch 3493 BLAKE2B 69afe1bc7cf5762c8716cc6552e47da359a97f26c4b3d62028964d238155b7f080ec1b9fb9c8fad5c15ed22b8b9a2138de5dedb2aa6981b75558becc8b14d3c8 SHA512 f3af93f068bafde01d7fda016f7993802aeae9da91b4acb742c91212efb14fa4f642ac540bd036c3888377a7f6d4e753b995f662c939ad02d7b5f963ed483123
-DIST ktouch-22.04.3.tar.xz 4978228 BLAKE2B 05622b751970819b51de6118fcaf2040cacfed115b4958a8b3cee1f2842a32f415e6565701df56e7f1a296fd72f7fda6a960f9f4322175168487ebea3ace7c36 SHA512 a26955cb6235525961e59a1158067748a8ad3dfa51b1072604229e01dce2c92fbe9745b04efb955d000691998435130b27a867d1354aac06ed834c798f59ea13
 DIST ktouch-22.08.3.tar.xz 4989008 BLAKE2B 5ed61941cced05ec564bcbf0f20d4bc4cd16d5b5de938f88d9081c65eb9b535f3610bb992a6ec22be4b898e9ef3f80ab9e95d08aa97644c8b366144de7c76e15 SHA512 e2c6a4be8c51e41704d55c442b46de4495e68a05dc3322efdfd74e96fd683e157594b27dec665cd5bceeffa7cbc46dc9c7ca8cf7c1ad09ec3f71e487d79a6d1d
-EBUILD ktouch-22.04.3.ebuild 1601 BLAKE2B b58881bd083d9590f52480377ecd35ff5b9e7864cfdf732ede959bdbcf250b3ed3a302a0a0b233a0525d58845afc767e2f0333dfab2d1c44ee6f9bdcb2f888a6 SHA512 bfeaaaa9b64a1fd721e6617092a5dffab9d7c35cc8d18445279626e2ccb6df73b737c8e47d1b171b9281a23b51cde94e7db10fc03314eae41455dfc24eaf1e49
 EBUILD ktouch-22.08.3.ebuild 1606 BLAKE2B 1953ad7b1af00067c52648898559d0f7ebffad331554a1797d1d395792f3d4647266dac9a3c6aa058b580b04c7f493e1dac68bf22b775672911e4009cc9ec300 SHA512 c11064bc60b01424e9cac31eaffc28b8ce28167456e59c84a3a31a10a20c9843c4646e2b88e54500023dbd2bf11589e8283b7c16b6bc469f8c78d468f4b76c62
 MISC metadata.xml 406 BLAKE2B 515e93940c5d57cc66d5ab4c567b5f4a0ba0768561f3a83e5b99ac610c8a89d28282ec1812e8225fb8da2e0f51318956c386b4dbcf5346d94c76f42a655645cf SHA512 c8c3e7a26162e1e1b7211beeefd0949cdc3cb74e97aede8f0ac1f660d5b557e2514d52242a6ef1b6539c2e7ad3d7a463f5c24d1b47ecbb00722ff66e9109f07a
diff --git a/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch b/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch
deleted file mode 100644
index 2278011d6e20..000000000000
--- a/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f94d8b2bcdb738354f73efabbbe4fcf5bb623bf7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 31 Jul 2022 16:17:30 +0200
-Subject: [PATCH] Add CMake option to build WITHOUT_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-KTOUCH_BUILD_WITH_X11 already exists and is set automagically so far,
-but using -DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any
-dependencies list X11 as required in their cmake config.
-
-Introducing this option means there is no behavior change by default,
-cmake will just skip finding X11 or adding unwanted features if the
-option is enabled.
-
-- Move the checks to root CMakeLists.txt
-- Move finding Qt5X11Extras behind "NOT WITHOUT_X11" too
-- x11_helper is conditional on KTOUCH_BUILD_WITH_X11
-
-* backported to release/22.04
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt     | 14 +++++++++++++-
- src/CMakeLists.txt | 13 +------------
- 2 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae5dfb8..55753cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
-     XmlPatterns
- )
- 
--find_package(Qt5X11Extras)
- find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-@@ -61,6 +60,19 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- 
- 
- option(COMPILE_QML "Precompile QML code" OFF)
-+option(WITHOUT_X11 "Build without X11 Keyboard Layout Detection (skips finding X11)" OFF)
-+
-+if (NOT WITHOUT_X11)
-+    find_package(X11)
-+    find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
-+    find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG)
-+
-+    if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
-+        set(KTOUCH_BUILD_WITH_X11 TRUE)
-+    endif()
-+
-+    add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
-+endif()
- 
- # enable QML debugging for debug builds
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e158d7c..b352184 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,15 +4,6 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION}
-     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KTouchConfigVersion.cmake"
- )
- 
--find_package(X11)
--find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
--
--if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
--    set(KTOUCH_BUILD_WITH_X11 TRUE)
--endif()
--
--add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
--
- ecm_optional_add_subdirectory(schemata)
- 
- # set include directories
-@@ -142,9 +133,7 @@ set(ktouch_SRCS
-     undocommands/coursecommands.cpp
-     undocommands/coursecommands.h
-     undocommands/keyboardlayoutcommands.cpp
--    undocommands/keyboardlayoutcommands.h
--    x11_helper.cpp
--    x11_helper.h)
-+    undocommands/keyboardlayoutcommands.h)
- 
- qt_add_resources(ktouch_imgs_SRCS images/images.qrc)
- 
--- 
-2.35.1
-
diff --git a/kde-apps/ktouch/ktouch-22.04.3.ebuild b/kde-apps/ktouch/ktouch-22.04.3.ebuild
deleted file mode 100644
index 5e61ab78de92..000000000000
--- a/kde-apps/ktouch/ktouch-22.04.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
-inherit ecm gear.kde.org
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://apps.kde.org/ktouch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb[xkb]
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-apps/kqtquickcharts-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-		-DWITHOUT_X11=$(usex !X)
-	)
-	ecm_src_configure
-}