From 7ece7f3d3bcd0184dd8dfd6653464da80184963c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Jan 2024 01:05:34 +0000 Subject: gentoo auto-resync : 11:01:2024 - 01:05:34 --- kde-apps/kio-extras/Manifest | 5 +- .../kio-extras-24.01.85-activities-optional.patch | 48 ---------- kde-apps/kio-extras/kio-extras-24.01.85.ebuild | 102 --------------------- kde-apps/kio-extras/kio-extras-24.01.90.ebuild | 98 ++++++++++++++++++++ 4 files changed, 100 insertions(+), 153 deletions(-) delete mode 100644 kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch delete mode 100644 kde-apps/kio-extras/kio-extras-24.01.85.ebuild create mode 100644 kde-apps/kio-extras/kio-extras-24.01.90.ebuild (limited to 'kde-apps/kio-extras') diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest index 81bb8e44ea03..55a3625a2484 100644 --- a/kde-apps/kio-extras/Manifest +++ b/kde-apps/kio-extras/Manifest @@ -1,7 +1,6 @@ -AUX kio-extras-24.01.85-activities-optional.patch 1571 BLAKE2B 4337722f2fe40fd62c891769a51cf9f876a6178b0f5e214c33a02ad996d781ed9c028cd8cf597d82b69c008a770be0954343165a6454827dd7da101bbf619b3e SHA512 d13e7eeae8fcd138f3e0445ba4a0f741f82362d45dd0e8334d8cc917f7ca3e327a6b81297984ef30f6c234c4d3d2a8620e582e77316bb8f190b7922d9d99d0a1 DIST kio-extras-23.08.4.tar.xz 1490584 BLAKE2B f38b87c9934a2d8f7862131d6ad8200035cdd55696918e1e8164e7811907a17ae583f392856fb4e709a2a09dcb560fb40c08d2485caed12331da9068bc3b3932 SHA512 ac2be6e745121962e13fe952d746281fa45778b6d491b001b9ea7a65caedfd5d6354ee75537fde0bf174638d248eb8796db6710830641149dcf35544048cfe27 -DIST kio-extras-24.01.85.tar.xz 3552164 BLAKE2B 23fcf051f47c3dc1a29923c535552201967cc213a137a70749d70bed5454e98526fcbfa1fabc89aab2f854ce84c5c18618dec8bfb0bd70187deaa53f2a5dcf39 SHA512 f0564fbd1be10f635f3e4374057f17a285fca2674592f338ed1af324710358501ef4949a79e0112e68d18636d99fccf59dfd4b7886e6827786080f9947283027 +DIST kio-extras-24.01.90.tar.xz 3552416 BLAKE2B be9ceb907df17d2494170d120b89744900b90fc079438350f631176de227ff654eda4a18a680e0e2426c32efcb2bd6f1373e70040cefd7dd00d99f8a901abea0 SHA512 cfd17fb1164c8f6a9e9ba67bb8dd90b6c744ce1ece115dcac83caed9854f26706a42d62fad4fcb9988f81cce8319b6fccda1c1052ab41376c88beb7df3929567 EBUILD kio-extras-23.08.4.ebuild 2798 BLAKE2B a6d9ea9dd6d0e86a7125dd816bfcfe46a95590d92654e688a9488fcd519c38e9ba689141b0e051fb52d67a6502b32cf78b2e5072bde32867eddbae1010ce0362 SHA512 9bde827586747fc448ccce00d7fc4b95fb14e3fe8108ddf175b6a5408856fd98d5df55a2e28e7f844d94b2517f8480a8d08fd03acd4b7f78faee538ae28bae4e EBUILD kio-extras-23.08.5-r100.ebuild 335 BLAKE2B 2a045ff2eea1f82f38b7f847dcd0abcaacd0efd8b552be4bcfcce79f82f6178391a0aa992c4518721d13561c3bd2681b2f482c7ad7236b70e01edb6be1badad2 SHA512 31fe0220f1775734db5eb9bd5de46d4e900290740b1c0ce8bfc83e790250338790ad1e565d7a8d9e625612fd87560785e20204c28fe5f26ef190d5bac5b1d4a9 -EBUILD kio-extras-24.01.85.ebuild 2930 BLAKE2B ca6d59ecbb915a3ade9c56701573f068a5853d3125b84d1ebb536143576061aca8d99eb6e7e2ed0b69284f58bc46bc06d6748eeae87d7fc714fccd21ef8b55fd SHA512 c9c450ea4a0f005ffa1f7a8330d164cb82bfea078e01eb26d7ed9e20f842d233d695b92e15e9bf92714e3ab3782172bbabbcf610b43163740e9113fe44d8e632 +EBUILD kio-extras-24.01.90.ebuild 2757 BLAKE2B befbeefb7cbfc59c12054ef8da7a7d281c4459ae81d430df6a38e88936bc6c8a1616c064f95741cd84ef8b6aa8c0fd134998c334432eaff6ce8cef39dd200e6a SHA512 dc1a0530adba3f7855419a3fe8c2faf2934e56c7880be7811105ecf09806ed62c723a120466cd0ce9cf2cc496f06008cbd25851c1abe477904f9b4a169c28f90 MISC metadata.xml 1126 BLAKE2B c0d81be1cdef0408907a5edd4475a80e1cdb5d34b64841f9f77dee91b1aac70cceab2e69a598761553bb4d39f8872bee51ccc6682d83148fc07f5ea354551f97 SHA512 a8819b4e309dbed0a35d0879de8e1b5342e8c6a1626bd9278f4ed274d714b491f3e1f6a58e291fed17e98cee3e4a6c12ddd429e4a9bd33ab9d125f7dfddde2a8 diff --git a/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch b/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch deleted file mode 100644 index 73ce35a37188..000000000000 --- a/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://invent.kde.org/network/kio-extras/-/commit/d74e09cace0cd533648b37e81c9d07f9a7c82043 - -From d74e09cace0cd533648b37e81c9d07f9a7c82043 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 16 Dec 2023 21:25:17 +0100 -Subject: [PATCH] Add BUILD_ACTIVITIES option (default=ON) - -Maybe we can keep this optional while the future of activities is still -not entirely clear. - -Follow-up to f220e0ebf670e64f3e7dc4d8a75c3b5dd00bfe2c - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0e085b18c..6c5c43da9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,9 +68,12 @@ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) - kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) - - if (NOT WIN32) -- find_package(PlasmaActivities REQUIRED) -- find_package(Qt6Sql REQUIRED) -- find_package(PlasmaActivitiesStats REQUIRED) -+ option(BUILD_ACTIVITIES "Build recentlyused:/, activities:/ KIO workers and fileitem plugin." ON) -+ if(BUILD_ACTIVITIES) -+ find_package(Qt6Sql REQUIRED) -+ find_package(PlasmaActivities REQUIRED) -+ find_package(PlasmaActivitiesStats REQUIRED) -+ endif() - endif() - - find_package(Phonon4Qt6 4.6.60 NO_MODULE) -@@ -164,7 +167,7 @@ ecm_set_disabled_deprecation_versions( - add_subdirectory(doc) - add_subdirectory(kcms) - --if(NOT WIN32) -+if(BUILD_ACTIVITIES) - add_subdirectory( activities ) - add_subdirectory( recentlyused ) - endif() --- -GitLab diff --git a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild b/kde-apps/kio-extras/kio-extras-24.01.85.ebuild deleted file mode 100644 index fe471ef1aa7c..000000000000 --- a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="optional" -KFMIN=5.247.0 -QTMIN=6.6.0 -inherit ecm gear.kde.org - -DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data" -HOMEPAGE="https://invent.kde.org/network/kio-extras" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64" -IUSE="activities ios +man mtp openexr phonon +sftp taglib X" -# TODO: activities: collides with Plasma-5, plus: -# https://invent.kde.org/network/kio-extras/-/merge_requests/320 -# TODO: samba (net-libs/kdsoap packaging issue w/ upstream) -# disabled upstream: nfs - -# requires running Plasma environment -RESTRICT="test" - -DEPEND=" - dev-libs/qcoro - >=dev-qt/qt5compat-${QTMIN}:6 - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] - >=dev-qt/qtsvg-${QTMIN}:6 - kde-apps/libkexiv2:6 - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcodecs-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kdnssd-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=kde-frameworks/syntax-highlighting-${KFMIN}:6 - activities? ( - >=dev-qt/qtbase-${QTMIN}:6[sql] - kde-plasma/plasma-activities:6 - kde-plasma/plasma-activities-stats:6 - ) - ios? ( - app-pda/libimobiledevice:= - app-pda/libplist:= - ) - mtp? ( >=media-libs/libmtp-1.1.16:= ) - openexr? ( media-libs/openexr:= ) - phonon? ( >=media-libs/phonon-4.12.0[qt6] ) - sftp? ( net-libs/libssh:=[sftp] ) - taglib? ( >=media-libs/taglib-1.11.1 ) - X? ( - x11-libs/libX11 - x11-libs/libXcursor - ) -" -# nfs? ( net-libs/libtirpc:= ) -# samba? ( -# net-fs/samba[client] -# >=net-libs/kdsoap-2.1.1-r1:= -# >=net-libs/kdsoap-ws-discovery-client-0.3.0 -# ) -RDEPEND="${DEPEND} - !=kde-frameworks/kded-${KFMIN}:6 -" -BDEPEND="man? ( dev-util/gperf )" - -PATCHES=( "${FILESDIR}/${P}-activities-optional.patch" ) - -src_configure() { - local mycmakeargs=( - -DBUILD_ACTIVITIES=$(usex activities) - $(cmake_use_find_package ios IMobileDevice) - $(cmake_use_find_package ios PList) - $(cmake_use_find_package man Gperf) - $(cmake_use_find_package mtp Libmtp) -# $(cmake_use_find_package nfs TIRPC) - $(cmake_use_find_package openexr OpenEXR) - $(cmake_use_find_package phonon Phonon4Qt6) - -DCMAKE_DISABLE_FIND_PACKAGE_Samba=ON - $(cmake_use_find_package sftp libssh) - $(cmake_use_find_package taglib Taglib) - -DWITHOUT_X11=$(usex !X) - ) - - ecm_src_configure -} diff --git a/kde-apps/kio-extras/kio-extras-24.01.90.ebuild b/kde-apps/kio-extras/kio-extras-24.01.90.ebuild new file mode 100644 index 000000000000..de423f025f84 --- /dev/null +++ b/kde-apps/kio-extras/kio-extras-24.01.90.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KFMIN=5.248.0 +QTMIN=6.6.0 +inherit ecm gear.kde.org + +DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data" +HOMEPAGE="https://invent.kde.org/network/kio-extras" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="activities ios +man mtp openexr phonon +sftp taglib X" +# TODO: samba (net-libs/kdsoap packaging issue w/ upstream) +# disabled upstream: nfs + +# requires running Plasma environment +RESTRICT="test" + +DEPEND=" + dev-libs/qcoro + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtsvg-${QTMIN}:6 + kde-apps/libkexiv2:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdnssd-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-frameworks/syntax-highlighting-${KFMIN}:6 + activities? ( + >=dev-qt/qtbase-${QTMIN}:6[sql] + kde-plasma/plasma-activities:6 + kde-plasma/plasma-activities-stats:6 + ) + ios? ( + app-pda/libimobiledevice:= + app-pda/libplist:= + ) + mtp? ( >=media-libs/libmtp-1.1.16:= ) + openexr? ( media-libs/openexr:= ) + phonon? ( >=media-libs/phonon-4.12.0[qt6] ) + sftp? ( net-libs/libssh:=[sftp] ) + taglib? ( >=media-libs/taglib-1.11.1 ) + X? ( + x11-libs/libX11 + x11-libs/libXcursor + ) +" +# nfs? ( net-libs/libtirpc:= ) +# samba? ( +# net-fs/samba[client] +# >=net-libs/kdsoap-2.1.1-r1:= +# >=net-libs/kdsoap-ws-discovery-client-0.3.0 +# ) +RDEPEND="${DEPEND} + !=kde-frameworks/kded-${KFMIN}:6 +" +BDEPEND="man? ( dev-util/gperf )" + +src_configure() { + local mycmakeargs=( + -DBUILD_ACTIVITIES=$(usex activities) + $(cmake_use_find_package ios IMobileDevice) + $(cmake_use_find_package ios PList) + $(cmake_use_find_package man Gperf) + $(cmake_use_find_package mtp Libmtp) +# $(cmake_use_find_package nfs TIRPC) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package phonon Phonon4Qt6) + -DCMAKE_DISABLE_FIND_PACKAGE_Samba=ON + $(cmake_use_find_package sftp libssh) + $(cmake_use_find_package taglib Taglib) + -DWITHOUT_X11=$(usex !X) + ) + + ecm_src_configure +} -- cgit v1.2.3