gentoo auto-resync : 30:08:2024 - 12:00:55

4 files changed, 3 insertions, 52 deletions

diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 66fd5e88c900..00babc801851 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -2,8 +2,7 @@ AUX libksane-24.02.0-ksanecore-23.08.patch 400 BLAKE2B 6d5ab87fc34609a42c86bb5a3
 DIST libksane-24.02.2.tar.xz 153524 BLAKE2B 71559382fef484c3d08c7022eacd0a6d3f7be1c3cc9b85e50c1f8b627c5e497173263fd7de2429cbe99b6f4b5185be40d8be1d3bbf8c1c3e3391205d7974d6ea SHA512 e5ad9152760384be4f1aa2b7cf54161caceb3fa68e9745606398cadd6e2e44c9b4b0d7d4cbf51c44667697221d6c7ab8ee3dcb9e210bd341d33bd7cee006909a
 DIST libksane-24.05.2.tar.xz 153572 BLAKE2B fe15e8359b9975b68f98370e502b6115169a94f153ccea6927c1492a68028edc22e3f062b23ed1e063b3349deb08f045f44e4fce0ce945fc4dec60ce27bd341a SHA512 ba5537fdb690e33ffdf841981ddfd9767a588f40277c39aa4fa6e2ad56cf42afe4a231282bbf4c410df600750a95b459a11e36d03a671fbad5369d141febd691
 DIST libksane-24.08.0.tar.xz 153544 BLAKE2B e39196024dbdf8dc6dfcaa2a0290398b1a52b9072d7de5441137c14992d4c5c98f2a0cb9873310a90d79acdfe603a49675955274b8a8e611f7913f9a1d995fae SHA512 dca60aff56f06181cbac3041694149b1e347f28875b6f6bdd90dd98520fd0072f9b6356388bf21a788a30e33cc07829af3a5af11a80f192e9777636c4bb48d8c
-EBUILD libksane-24.02.2-r1.ebuild 1001 BLAKE2B 66eeae8c7fa3df4d9a470424ccca64f31c2ff08446d69694477425af500afc2a9a69f873faa518c2416023fca99d1a9f32d1eec15db75c0260c43498bd84e36d SHA512 e950fae8cfc06f286f1cb9e78aa8eea72efaec0c0104e4e1964a9a3430ceb67d047c88ad4ba3d9b0d286ea031cb363f53eadba4d83d1d69e0dd342378cb1559a
-EBUILD libksane-24.02.2-r2.ebuild 1028 BLAKE2B c02d0755ba665a3534440ddf93c4507440f2c4a5474b7b8a4a12b034aabebbeaeb7e6be48a1a9b3cd9a9dd2088265ad71df37b7144dee1a36f8b91847b81c4cc SHA512 b603e45429c3142fb94de73059ea2ce74f416edd4c0cce14d076c156539f95abeec6ae3284f44e69ad177eb447a6e71bd7ffc469c1a5c478da6973637adc75b5
+EBUILD libksane-24.02.2-r2.ebuild 1027 BLAKE2B af4682a19d65f435241279126a7667a0d9a145af4c79dbf5f1cc6bed6267a592ba95c37be1dc716511fb7c49edf273c3d937d495b3f6ebee68edf2f9af4e1d8a SHA512 c454d5d48fd0c5af06c6a5d6d4db8f374c0837380a36d78ee1892a381b736209d11b1b896f2aabffd97262dd5eff3aee29e8ded13ed538356340c586704aaf4e
 EBUILD libksane-24.05.2-r1.ebuild 968 BLAKE2B ff9604ae4d0bf3477bd62a54465b6fa2627e191794e25bc2567e29bcd2f3bcc6d40d6831e3608c323034b918c29773a2ea5f321144841cd1aa53f2f58dd34bd0 SHA512 8cf355f8c206a43fa641c35751582081702f5425f7b55adcf7d8a89d0d05a1c93088854cbd3e1831ec3f4d4f0a761eaf0d5f3054e05ae4e59016c4f1d7ba91c8
 EBUILD libksane-24.08.0.ebuild 968 BLAKE2B 1d027d59659c2fe9ec2ebc2e258c47d851d9bccc102d3a4bc276f5d530ac150c4991e1c227e2e9da41bb7e61d69b7048a7a7a2f2bbeee55107cc346bc63e81e3 SHA512 20cf2a502bfe6c17a64d51d3b98f61846241b0e1e7a15f414784770331ef9cc7b53cb40403c7494455edf2cea1740e13d6b90c27bd99e7e1fc95cdd862a5ef58
-MISC metadata.xml 635 BLAKE2B 8baefe8995a941d16f619d7e8efdef1d762f1d9adccfa75617c771f094ba2b155a0ec300a078296aac0bda7cf78f608d01938054daabb377f491eafcd5bb6b54 SHA512 b591e896e277d28cae4c1cb7304c06a3eb09114e9e98b6529a42eff1dcacacc75b1a0a11f47d944b2edf5bb4847350a254ac1decc5ba8a0e352ab57e209b45dc
+MISC metadata.xml 531 BLAKE2B 1de6f543194def5840e108a405fd4ca18617959799e64375ffcd0aa30854dffa4569dfcfbadc1faa027addfe83387cf05dda201b6f1e19a551ac1fb8c3737323 SHA512 e09b15e1bdded83384bf330d2055df974f338f5bbd60a6e19852a8fcd0a306da443253752b3ced14446b6a5409d9dbc9a450451ee2da750058c046dc89803db5
diff --git a/kde-apps/libksane/libksane-24.02.2-r1.ebuild b/kde-apps/libksane/libksane-24.02.2-r1.ebuild
deleted file mode 100644
index 0243c4f05cac..000000000000
--- a/kde-apps/libksane/libksane-24.02.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.02.2-r2.ebuild b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
index 4586d68f2e9b..29d61684095a 100644
--- a/kde-apps/libksane/libksane-24.02.2-r2.ebuild
+++ b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SANE Library interface based on KDE Frameworks"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksane/metadata.xml b/kde-apps/libksane/metadata.xml
index 86031412db63..1a76a67e1b59 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -11,6 +11,5 @@
 	</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>