summaryrefslogtreecommitdiff
path: root/kde-apps/libksane
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/libksane')
-rw-r--r--kde-apps/libksane/Manifest11
-rw-r--r--kde-apps/libksane/libksane-24.02.2-r1.ebuild47
-rw-r--r--kde-apps/libksane/libksane-24.02.2-r2.ebuild (renamed from kde-apps/libksane/libksane-24.02.2.ebuild)14
-rw-r--r--kde-apps/libksane/libksane-24.05.2-r1.ebuild (renamed from kde-apps/libksane/libksane-24.04.90.ebuild)16
-rw-r--r--kde-apps/libksane/libksane-24.08.0.ebuild45
-rw-r--r--kde-apps/libksane/metadata.xml4
6 files changed, 79 insertions, 58 deletions
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 4217a9221107..00babc801851 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,7 +1,8 @@
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
-EBUILD libksane-24.04.90.ebuild 748 BLAKE2B a3b909591babf79b985a15c49e5a6e1b2b43a5590aafae4e47de69f9d7fc0997b0e3c882d2bfa591f12c1ddc7e1c9e152fe625e8dc4d1dc99b56bd1a4831d4e8 SHA512 1171c981eecc2cd1cbbe47729a8974f710d877a424b57c44139049e6d9eb46834c7e5baf02c09a73814871518e9d30a91878912250b57721b897a90e04d22702
-MISC metadata.xml 544 BLAKE2B 75cd6e94b03e08da9552e530904a9cf614dbfd56bcd77483dee97a57d8f9e291936624cc04405337d93c782a4616c7f5df46c3f64ff5f996c620b391d0052223 SHA512 1b96112dd47ec94130c237ecbff898b2416775e10e61133cfcf795f7a579e2fd7d8886ebb1e72416c404b1ae3b3e14f88ab635e2ec34cc2522dae4a6d360318d
+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-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 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 66244af7b3bd..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.ebuild b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
index a1cda1be9af5..29d61684095a 100644
--- a/kde-apps/libksane/libksane-24.02.2.ebuild
+++ b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
@@ -23,10 +23,22 @@ DEPEND="
>=media-libs/ksanecore-23.08.5:5
kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ >=kde-apps/libksane-common-${PV}
+"
+
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/icons/hicolor/16x16/actions
+)
PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" )
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kwallet KF5Wallet)
diff --git a/kde-apps/libksane/libksane-24.04.90.ebuild b/kde-apps/libksane/libksane-24.05.2-r1.ebuild
index 1c3308709e90..3a4bb555ee11 100644
--- a/kde-apps/libksane/libksane-24.04.90.ebuild
+++ b/kde-apps/libksane/libksane-24.05.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KFMIN=6.0.0
+KFMIN=6.3.0
PVCUT=$(ver_cut 1-3)
QTMIN=6.6.2
inherit ecm gear.kde.org
@@ -12,7 +12,7 @@ DESCRIPTION="SANE Library interface based on KDE Frameworks"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="kwallet"
DEPEND="
@@ -24,9 +24,19 @@ DEPEND="
kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
"
RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ >=kde-apps/libksane-common-${PV}
"
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kwallet KF6Wallet)
diff --git a/kde-apps/libksane/libksane-24.08.0.ebuild b/kde-apps/libksane/libksane-24.08.0.ebuild
new file mode 100644
index 000000000000..c2f9fa8a3efe
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.08.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+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}
+ >=kde-apps/libksane-common-${PV}
+"
+
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
+
+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 b409ddecba2e..1a76a67e1b59 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -6,10 +6,10 @@
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libksane</bugs-to>
+ <remote-id type="kde-invent">graphics/libksane</remote-id>
</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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 23:13:38 +0000