gentoo auto-resync : 21:05:2024 - 00:05:35

4 files changed, 87 insertions, 1 deletions

diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 0117f45bfba1..4217a9221107 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,4 +1,7 @@
 AUX libksane-24.02.0-ksanecore-23.08.patch 400 BLAKE2B 6d5ab87fc34609a42c86bb5a30c966ef39743fb10911dcbd09b9ab00fd4435da0bca895c86d6dd3c64b1a56bcd132bec0e994b823b76985f922ed1418b095120 SHA512 93231683766d8924764dbaef8e119648a5dae65f866dbfbef26b9c81c205815eef0a546403c0e67d6684eb7890b42305babb83bff5c684eff36063f73052f52e
 DIST libksane-24.02.2.tar.xz 153524 BLAKE2B 71559382fef484c3d08c7022eacd0a6d3f7be1c3cc9b85e50c1f8b627c5e497173263fd7de2429cbe99b6f4b5185be40d8be1d3bbf8c1c3e3391205d7974d6ea SHA512 e5ad9152760384be4f1aa2b7cf54161caceb3fa68e9745606398cadd6e2e44c9b4b0d7d4cbf51c44667697221d6c7ab8ee3dcb9e210bd341d33bd7cee006909a
+DIST libksane-24.04.90.tar.xz 153548 BLAKE2B e3df2dede5c1286e8b061c480c20324c3458491fd7f897ef27d429907629d3a075253e7f94fc35220879372081e699b28b58ec479b8a99adaa868e9be1ac6bee SHA512 d773d3c0624938351264708a5665318f9c5647926826fdb458e8a34d8cae1399ac8137aced503403cbcd02220d4bd2f85fdec55e9fcd42f421407f8a833020b5
+EBUILD libksane-24.02.2-r1.ebuild 1004 BLAKE2B c92086efb01faf023ae02b635aabf30a8fbd8db30c689a901ffa5502b50a76deccdf54bf92659784fe08a57c5129089c3360299ae3f3891df8d220d18610ab22 SHA512 685f32743f3e57d36830e5ee9c7c8ad3bdeed26d3bf9a96076c888cc83294de0183d98b3739033b50ded7ae19365b692130db27378bec3f8a49e190e46922dd1
 EBUILD libksane-24.02.2.ebuild 795 BLAKE2B f69967a5654d20d32916493b2704d124d164471bead3befb42b132f220065a1e1f5ce75f4a6b78c2c43ddf7d65cdcac325cff78e41b4b96211e389c45a862488 SHA512 d2ced40e0f7a48929d33b3a883f0c1ec122aa1d5b0040547deb2006658207925dcc094d398fe4e93111dcbdc657ea9b7a25a10a877766fcb63e6d665b6620f2e
-MISC metadata.xml 440 BLAKE2B 09802236acebec3b481f48351f5397ac95b2a0a13defe6860c118f7b55e5f36ed7976e67633a0d391b4e05bff712696b03d3d49c486f09c7ea01ca6422825216 SHA512 b8e84e2bdedc8bcdea58a05f2252f7f41e374d98c10420e912fb7334e480946ba14023cd278d18091cc7f3883626eda9caae221b6c2696fe154c016e82019cf2
+EBUILD libksane-24.04.90.ebuild 748 BLAKE2B a3b909591babf79b985a15c49e5a6e1b2b43a5590aafae4e47de69f9d7fc0997b0e3c882d2bfa591f12c1ddc7e1c9e152fe625e8dc4d1dc99b56bd1a4831d4e8 SHA512 1171c981eecc2cd1cbbe47729a8974f710d877a424b57c44139049e6d9eb46834c7e5baf02c09a73814871518e9d30a91878912250b57721b897a90e04d22702
+MISC metadata.xml 544 BLAKE2B 75cd6e94b03e08da9552e530904a9cf614dbfd56bcd77483dee97a57d8f9e291936624cc04405337d93c782a4616c7f5df46c3f64ff5f996c620b391d0052223 SHA512 1b96112dd47ec94130c237ecbff898b2416775e10e61133cfcf795f7a579e2fd7d8886ebb1e72416c404b1ae3b3e14f88ab635e2ec34cc2522dae4a6d360318d
diff --git a/kde-apps/libksane/libksane-24.02.2-r1.ebuild b/kde-apps/libksane/libksane-24.02.2-r1.ebuild
new file mode 100644
index 000000000000..66244af7b3bd
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.02.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kf6compat kwallet"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=media-libs/ksanecore-23.08.5:5
+	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-apps/libksane:6 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kwallet KF5Wallet)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	if use kf6compat; then
+		rm -r "${D}"/usr/share/icons/hicolor/16x16/actions \
+			"${D}"/usr/share/locale \
+			|| die
+	fi
+}
diff --git a/kde-apps/libksane/libksane-24.04.90.ebuild b/kde-apps/libksane/libksane-24.04.90.ebuild
new file mode 100644
index 000000000000..1c3308709e90
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.04.90.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.0.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="kwallet"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=media-libs/ksanecore-${PVCUT}:6
+	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kwallet KF6Wallet)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libksane/metadata.xml b/kde-apps/libksane/metadata.xml
index e6972bed36aa..b409ddecba2e 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -10,5 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
 	</use>
 </pkgmetadata>