summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/baloo')
-rw-r--r--kde-frameworks/baloo/Manifest4
-rw-r--r--kde-frameworks/baloo/baloo-5.115.0.ebuild (renamed from kde-frameworks/baloo/baloo-5.82.0.ebuild)28
-rw-r--r--kde-frameworks/baloo/baloo-5.83.0.ebuild35
-rw-r--r--kde-frameworks/baloo/baloo-6.0.0.ebuild35
-rw-r--r--kde-frameworks/baloo/metadata.xml13
5 files changed, 68 insertions, 47 deletions
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index aa50f78fe943..58601c6ac7e8 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,2 @@
-DIST baloo-5.82.0.tar.xz 291468 BLAKE2B abf25e14f5cca320c89a909bf4fe1d483b7e4ba1b77bce8ac12152b242af28a525179605078ed11f4c4f3e5abea338dfb510992d02748bf9a746eade1d1c7160 SHA512 aed73f3c67f3c7331706fa121c0fbc062b4619adf8ebe65fdb4edbd033f6c4bdaca17f8c00fc3eb3f4159af1cd5bf89c144bbf87d87e9ef60d5b682dabe059db
-DIST baloo-5.83.0.tar.xz 280700 BLAKE2B 71d4fa0e1260317cd382639c1b7d58a296867a2c9e7462ac339f808eff0ea544334120bc355d1146076e151bd4f1a472caf172e22ec2029606c8678433c50b47 SHA512 4cc7a46d0c298455cbae37189da2b107f8d6aba4e5790d3b217251d6873bc295481b6fa7890b38c118e40705abf0611f4ec9716cc2b81eb2d397ad850c156822
+DIST baloo-5.115.0.tar.xz 311360 BLAKE2B 6092b85cbde534f1cf3fc344fe913b945900c4bbd1db4516e690a4090e890b02e35cd56f9e235605494e0c007fd61c5bb3c2d8be5e8974aa354c69771ee7e8c8 SHA512 43130d873845a3d8f0a7a25b04a032e7cd834170b5f67b7b18396a800086801ce0910865dc7efc333dd0764121b65c8fddcec4e072af6503e0b1bc55c642f4d6
+DIST baloo-6.0.0.tar.xz 317636 BLAKE2B 48159f5c176a5aa5340cb74b6a20f70457a34b111cd20c60092a8cde58485b4ebd7f08a0cf9ef1a1c518d534914e87ceadb36eaffb647c6ddc706ee540075a55 SHA512 a97af1302f55abf835e8d02b06a18bb767a7bcdeebeb528ff9368beee19e0f97d1ae177b5997e79547e2f9a64998f105b32038fada0c96e5c5a48517ad3c9774
diff --git a/kde-frameworks/baloo/baloo-5.82.0.ebuild b/kde-frameworks/baloo/baloo-5.115.0.ebuild
index abf1a63e7684..d97623004882 100644
--- a/kde-frameworks/baloo/baloo-5.82.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.115.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for searching and managing metadata"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="kf6compat"
-RESTRICT+=" test" # bug 624250
+RESTRICT="test" # bug 624250
DEPEND="
>=dev-db/lmdb-0.9.17
@@ -32,4 +32,14 @@ DEPEND="
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ kf6compat? ( kde-frameworks/baloo:6 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_INDEXER_SERVICE=$(usex !kf6compat)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/baloo/baloo-5.83.0.ebuild b/kde-frameworks/baloo/baloo-5.83.0.ebuild
deleted file mode 100644
index 245f2f64562f..000000000000
--- a/kde-frameworks/baloo/baloo-5.83.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # bug 624250
-
-DEPEND="
- >=dev-db/lmdb-0.9.17
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kfilemetadata-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kidletime-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/solid-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/baloo/baloo-6.0.0.ebuild b/kde-frameworks/baloo/baloo-6.0.0.ebuild
new file mode 100644
index 000000000000..d98f5ec95bd3
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-6.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test" # bug 624250
+
+DEPEND="
+ >=dev-db/lmdb-0.9.17
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kcrash-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/kfilemetadata-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kidletime-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ =kde-frameworks/solid-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/kde-frameworks/baloo/metadata.xml b/kde-frameworks/baloo/metadata.xml
index 2fdbf33d963d..36ef35ac2598 100644
--- a/kde-frameworks/baloo/metadata.xml
+++ b/kde-frameworks/baloo/metadata.xml
@@ -1,8 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
+ <use>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+ </use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>