From c748acf4192a1e08c9feb2d5f0004937a4869639 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 16 Sep 2023 04:59:22 +0100
Subject: gentoo auto-resync : 16:09:2023 - 04:59:22
---
kde-apps/ark/Manifest | 5 +-
kde-apps/ark/ark-23.08.0.ebuild | 81 -----------------------------
kde-apps/ark/ark-23.08.1.ebuild | 83 ++++++++++++++++++++++++++++++
kde-apps/ark/files/ark-23.08.1-cmake.patch | 40 ++++++++++++++
4 files changed, 126 insertions(+), 83 deletions(-)
delete mode 100644 kde-apps/ark/ark-23.08.0.ebuild
create mode 100644 kde-apps/ark/ark-23.08.1.ebuild
create mode 100644 kde-apps/ark/files/ark-23.08.1-cmake.patch
(limited to 'kde-apps/ark')
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index e275a5f9abe1..ca84c64ba7d5 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,6 @@
+AUX ark-23.08.1-cmake.patch 1637 BLAKE2B 6eca549311f313541ebb6e3904adbd301f8e4d222074d0b549337c9895dd586dc3173510a4d58bfea6566964994a6ea01bb7b226ee0cb7997418f9b0b588522c SHA512 5ecc2427f5a81666a5d09187687ce5f886f0b15455933d61c145530409e0bc81992468bdba5fb91e3691e25eb0ccac597ac7567350cb9096b72f4e1dfde3535e
DIST ark-23.04.3.tar.xz 3010636 BLAKE2B 93600fb21940839bafd25aabfb1ff346088b0bef7c49e1d73cc6b3e17d073dfca924caa747d2c0f3c70ccd63569aebc3d8a6d137c7503c9a17a1af1ab833b4b9 SHA512 6ca740fef459232cf7ff19d76b2ddcb080b8c9b34a0c718dae0875253417a6f3f8f9c4a7bd2bc5002ae06bb41eef7f958a40f0d54896680e82879ef0f1cbed10
-DIST ark-23.08.0.tar.xz 3016056 BLAKE2B d3ec1b07951f4aff70383d7d0748939e94bb4e26a09b16156613996c24f20a8d19623cd308b561c9f1bca71020e1435783fff8784b30d9ccfb55be3b5f67451b SHA512 84fc163e2f5c1b41d72978bb0f8a3e12aab68d681c7b2224dbf3b37bffd3c61814f54d1f647ec3aec34a2024275e7258f320fa2e692f2de08108999a2140d578
+DIST ark-23.08.1.tar.xz 3016220 BLAKE2B 7bc22a83b9f0bf3a426a3a9a0d6eea9f053c808e475cd5c777144b6229317ee7415f0469e758216b7f425588503e30426bd146f48656faccfc785ffdabb1c387 SHA512 fd2e99695e1dbcab2118ab0d38595852a2afd4490d07322fc5558eb3a4134d21206477675cbe8658009092faffc94e65953c138a929df1be682d80f8106c0b8a
EBUILD ark-23.04.3.ebuild 2223 BLAKE2B 3797f1f46413e76a87dec15865a9476695027ec7bdc92eb5f970e9bff868513e1a995604ec4548b481cf76ba27e158428786d9a6e566b688dc19cddcba164707 SHA512 ff19c86b0b7d26a0d4f6789ba8cb4b057b8fcc26b427f77f8046649a9b6483d3a6284c43eccc104e3497a63e1483c915721785151add91a5132b8c2aef165712
-EBUILD ark-23.08.0.ebuild 2226 BLAKE2B 90b9bf51d781f64c4ca63e8220d068df109168704cd1ff3b3ef830657498cd9d036227cb53b462d5a102ba6135bd4cc9b92e1c63a9ef88c5d9e77d81120d204f SHA512 89c73dfac21d14a19bc3b00d438c9e91e67465a7df6b213e5ad73797b07427b43ef4c0b45e41713712cb1fbb8982b75ae632961fcb56a5ba16cc308c888844ff
+EBUILD ark-23.08.1.ebuild 2272 BLAKE2B 692baef9802d6ce13b6efa112528a33d8892989733bc307d3fefe2db155abbf20c48150687caf31ba733309230827676f1c330962c5afa2daec4efa4107440da SHA512 1c64677951b76a75519898b98105d059886f9a4c970357512b30b04c682582b50db02bc1b8f1131cb20814840ee79921def459f465b391021a3f31b1bb8ff2e8
MISC metadata.xml 468 BLAKE2B f4b2d609976bfc8a7bb4004286273c2384c7a5f9c45d6de44936d9f21dd4428d968c54cfb4d8cfe81e56bb935ed36c481b4c79a0e0a0b946b7e8ce78f794a123 SHA512 415c92c65d6d56b801c71db9153684635c8eeb0d571f1782127d8e7ab06a2b360cc016bc8ac110b7b9fcb53c587a177a5a7f69198b65fd152767a107aac1cd89
diff --git a/kde-apps/ark/ark-23.08.0.ebuild b/kde-apps/ark/ark-23.08.0.ebuild
deleted file mode 100644
index 4211c086cbf3..000000000000
--- a/kde-apps/ark/ark-23.08.0.ebuild
+++ /dev/null
@@ -1,81 +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.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="File archiver by KDE"
-HOMEPAGE="https://apps.kde.org/ark/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="zip"
-
-RDEPEND="
- >=app-arch/libarchive-3.5.3:=[bzip2,lzma]
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kpty-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- sys-libs/zlib
- zip? ( >=dev-libs/libzip-1.6.0:= )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
- test? ( >=dev-libs/libzip-1.6.0:= )
-"
-# app-arch/rar is binary only
-BDEPEND="
- sys-devel/gettext
- elibc_glibc? ( test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) ) )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package zip LibZip)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # bug 822177: kerfuffle-addtoarchivetest: may segfault or hang indefinitely
- # bug 827840: plugins-clirartest: continuously broken with translations installed
- -E "(kerfuffle-addtoarchivetest|plugins-clirartest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "rar archive creation/extraction" "app-arch/rar"
- optfeature "rar archive extraction only" "app-arch/unar" "app-arch/unrar"
- optfeature "7-Zip archive support" "app-arch/p7zip"
- optfeature "lrz archive support" "app-arch/lrzip"
- optfeature "Markdown support in text previews" "kde-misc/markdownpart:${SLOT}"
- fi
- ecm_pkg_postinst
-}
diff --git a/kde-apps/ark/ark-23.08.1.ebuild b/kde-apps/ark/ark-23.08.1.ebuild
new file mode 100644
index 000000000000..890af802575e
--- /dev/null
+++ b/kde-apps/ark/ark-23.08.1.ebuild
@@ -0,0 +1,83 @@
+# 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.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="File archiver by KDE"
+HOMEPAGE="https://apps.kde.org/ark/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="zip"
+
+RDEPEND="
+ >=app-arch/libarchive-3.5.3:=[bzip2,lzma]
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ sys-libs/zlib
+ zip? ( >=dev-libs/libzip-1.6.0:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ test? ( >=dev-libs/libzip-1.6.0:= )
+"
+# app-arch/rar is binary only
+BDEPEND="
+ sys-devel/gettext
+ elibc_glibc? ( test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) ) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package zip LibZip)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # bug 822177: kerfuffle-addtoarchivetest: may segfault or hang indefinitely
+ # bug 827840: plugins-clirartest: continuously broken with translations installed
+ -E "(kerfuffle-addtoarchivetest|plugins-clirartest)"
+ )
+
+ ecm_src_test
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "rar archive creation/extraction" "app-arch/rar"
+ optfeature "rar archive extraction only" "app-arch/unar" "app-arch/unrar"
+ optfeature "7-Zip archive support" "app-arch/p7zip"
+ optfeature "lrz archive support" "app-arch/lrzip"
+ optfeature "Markdown support in text previews" "kde-misc/markdownpart:${SLOT}"
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-apps/ark/files/ark-23.08.1-cmake.patch b/kde-apps/ark/files/ark-23.08.1-cmake.patch
new file mode 100644
index 000000000000..5bdf0af81435
--- /dev/null
+++ b/kde-apps/ark/files/ark-23.08.1-cmake.patch
@@ -0,0 +1,40 @@
+From 149271d3e341eea531405191ff1002fda86fdf84 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Sep 2023 15:53:36 +0200
+Subject: [PATCH] Drop unused ItemModels dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 9343567be9f895cbe5e290f88c9a933db34cdd95)
+---
+ CMakeLists.txt | 1 -
+ part/CMakeLists.txt | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 510adbc5..764cce99 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,6 @@ find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Config
+ DBusAddons
+ DocTools
+ I18n
+- ItemModels
+ KIO
+ Service
+ Parts
+diff --git a/part/CMakeLists.txt b/part/CMakeLists.txt
+index c4c96972..d760f78a 100644
+--- a/part/CMakeLists.txt
++++ b/part/CMakeLists.txt
+@@ -26,7 +26,7 @@ ki18n_wrap_ui(arkpart
+ jobtracker.ui)
+
+
+-target_link_libraries(arkpart kerfuffle KF${QT_MAJOR_VERSION}::Parts KF${QT_MAJOR_VERSION}::KIOFileWidgets KF${QT_MAJOR_VERSION}::ItemModels)
++target_link_libraries(arkpart kerfuffle KF${QT_MAJOR_VERSION}::Parts KF${QT_MAJOR_VERSION}::KIOFileWidgets)
+
+ if(QT_MAJOR_VERSION STREQUAL "5")
+ configure_file(
+--
+2.42.0
+
--
cgit v1.2.3