gentoo auto-resync : 18:06:2024 - 00:10:02

7 files changed, 52 insertions, 41 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 4b6874d5b45e..9a81b23852a8 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 9a99bfa589b6..1e3b980c9222 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,5 +1,6 @@
 DIST kdiff3-1.10.7.tar.xz 1131116 BLAKE2B 5aff7d24d3440b367e0d124e7db444fb1164e1e23a39cc808b83d9f872e11c78442f73e5b95199ed00ace30cf5e4d15adbba0c9d46fe79bc2f5eae693e0aa93d SHA512 ab7ce8312014de200bcc613be1a28b384289f96be08d7f2e1e640b202cede3bbfeffa7b3e53b605f8edf9be2368d2aa6c6b5ee4501577ed8560ca1c4704802db
 DIST kdiff3-1.11.1.tar.xz 1140680 BLAKE2B 4a3e2f3300a4d8ebe390e3e7ad6392b26cdac919bfa80d2b24e145536a763cca924c8a811826972a92215da7c297662b805c60ce0ee5a57816a3549c059a8353 SHA512 5f481a3cd67e80db939eb795618a635bda2c08875eb826c3a1b6487b631374c48ab9b8a546d9b9504c1bcbc0ed9072f16452d6ef9fe181ce6850f741ced710ce
 EBUILD kdiff3-1.10.7.ebuild 1106 BLAKE2B d7174e72ffc71a628238483fad4b96ebb37aa7766fe314fd6e8627c81acaa2ffc1202f3863f8de6be7c46b5ddc4ed1f740c2dedca9ceae8137e2d7a125bd8468 SHA512 35837378b2a97f4e75480b0886f7d75a8565d4e2b9e61d5a721a852066b9636cc90931580a7a68139161561140f2005b99219d3015094d5243b444ede05cfe33
-EBUILD kdiff3-1.11.1.ebuild 1102 BLAKE2B c48344f10037f72f66c4b6ea55426ef15ce90739f7b20760aee043a91be50e4d498deef8236a59a8c62c901c12a068156c58fd7623466b043c0a31003db9313e SHA512 3a7fe2b752aacadd6e3e7f77a6f85726e196b52dc7ad724a5236cf4529bf43b4869d8937ca5127476b126f37306cdb4ae06e1657db4887c41ccfd8157b371ef3
+EBUILD kdiff3-1.11.1-r10.ebuild 1085 BLAKE2B c7a962a1aaed3976264c0a71aa006d10f4ee051a6833df0e0725768efc80981c2286e9ec635e543e3181f7767c9ba6e92db9d5bd64d72c50816f629f71a5fcaf SHA512 bddc76ae5cbe915deeb0bce35222f836d5bd27ae7212cc24aa8fe3e20df33d601e719433442e2f9245241d230d39d185ed6db6c2923255c8cc4c1adcbffba735
+EBUILD kdiff3-1.11.1.ebuild 1100 BLAKE2B f44c591b2a725f1ef0e8bd8d453e4dfa6972d82791176983675598ddf5e6aea99848891f988d083a9e8d332b5dbdbc8114eacfe19f8fff6c9be79e61dfcd89e7 SHA512 d36b2688a5cbfbedca20d95f65f88c7f5f5688de382f27bb5677568caa28f4c205d1d60ac92739346594df6f3f4c47062260bfd7e67ed8cbd0d7158e87d702d2
 MISC metadata.xml 485 BLAKE2B fe3046c156af8000d379a96799587d89307e2664be0698ba9b847483f42031994707d16187740d9528a1d5ab26276802ae44218b820f949a35f3caef58223210 SHA512 f8c55957fdd76bf1019a3f543705bb4118deea1673d2fd1dab94528869f4ae65d34f81493f59bd4de40b02a64f9cacd054d7e576167fd8d18346b06e4bda5065
diff --git a/kde-misc/kdiff3/kdiff3-1.11.1-r10.ebuild b/kde-misc/kdiff3/kdiff3-1.11.1-r10.ebuild
new file mode 100644
index 000000000000..d5bea9a0808f
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.11.1-r10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.82
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	sys-apps/diffutils
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		# TODO: -DENABLE_GDBINDEX?
+	)
+	ecm_src_configure
+}
diff --git a/kde-misc/kdiff3/kdiff3-1.11.1.ebuild b/kde-misc/kdiff3/kdiff3-1.11.1.ebuild
index bd4a4224533a..8f110067802a 100644
--- a/kde-misc/kdiff3/kdiff3-1.11.1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 009472d9b121..ddbc11a47277 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,6 +1,4 @@
 AUX skanlite-24.04.90-libksane-24.02.patch 413 BLAKE2B e0f6d06375db05774f58d27c0c8fa4a331738082d32b8bb33249be2a4fd03cf64c10c610a0ffc34617658904888475349123a52434ab499c9135a81b15409595 SHA512 9572121bababee216fa39419709018dc26cfa95fab9e0093bb0665a87eb88714d1047f88206a03fd3671b5d9a102796dea5a4028f66bc0c64a0922abee892a14
-DIST skanlite-24.02.2.tar.xz 2451520 BLAKE2B e5af2deb7f8f2ecc9fa0e92e27b2e65d1a1c2fd08b6cc76269bc7154fa7ca9d593445614f6ad64fb6c2c1e93447c778bc5f40934905d7c341912389a7c56f75a SHA512 53e395d8f7199840393b6c5e427fa8989eebd9a6c9474e88c0e2c1428e7c858acf19ee32d6865f154ecba259f8a0b03da5e38f75122f36ea47efcbc92fd8bceb
 DIST skanlite-24.05.1.tar.xz 2383520 BLAKE2B 58f16f1f066aee6d173e1aaa6f1d28ec6709426a0eeeb9470572dcee9d46ecba0cca7095d92d309e0e4569664c9990243628cea5342ff92e878ab2709aacdae8 SHA512 62580efcedab57fe84997cd3fc7c04c0bb3eb9d7bce0a22c0830ab8a0c04a21e541f860a2957733c89106ba89743eaa3f9394747f9dfd4c353be9faab648511a
-EBUILD skanlite-24.02.2.ebuild 928 BLAKE2B 086267f95be85d446fb5af0383a2b059fbbfc5bae3159bea503eb86b7fe29cb84768cb8a393095465681b031d07a877c0e9703cdc630af7820729ca122fc0353 SHA512 befb5e77ae8089651f66d09b9e9b0f5df6b8d485883bc3c5fbe091d7129cf09c4fbc0aa1d37b83a0ead384d441bc7dfce0daf30a44a4a23a7031d78920491c8b
-EBUILD skanlite-24.05.1.ebuild 975 BLAKE2B 14388745ec4225677f3d1415adbb4f0febe3fd6fab5e3eab6e6e7f4b13aa6644c62884e9cca117d6eae42b17d706ee31a7756d8cbdffb9762912a46bdcc50d11 SHA512 02cef12f00dc7b525e1e75b49fa2478be8e8f4efd3f7e64cb006ab943dd3c321fefc8e45e70ceac61e188e8d534daf1b8a321802ef2b41e13468d1a07ce58d8a
+EBUILD skanlite-24.05.1.ebuild 972 BLAKE2B 246c0e3206b37e2ec3305c70729371dfb021e2b2fae57252b29896cc96e23aff4d647f829cdb1b5afbb8122881eebc8c06255590108fb7f90d47961e99f08737 SHA512 6292f44a1b6b71b375be12ccb2843d0eee37259d64c12a4c761b18b09306b2176a2e26ed31d3ea670ae0f265ddde7a6d009a83808ac1ac224b82f3bc4e485f04
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/skanlite/skanlite-24.02.2.ebuild b/kde-misc/skanlite/skanlite-24.02.2.ebuild
deleted file mode 100644
index 80bfb71fffae..000000000000
--- a/kde-misc/skanlite/skanlite-24.02.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="graphics"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/skanlite/"
-
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libksane-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-misc/skanlite/skanlite-24.05.1.ebuild b/kde-misc/skanlite/skanlite-24.05.1.ebuild
index 9c576e6bf2f5..e8db18425cff 100644
--- a/kde-misc/skanlite/skanlite-24.05.1.ebuild
+++ b/kde-misc/skanlite/skanlite-24.05.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/skanlite/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="