diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-17 15:54:09 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-17 16:10:21 +0200 |
| commit | ccc90424261511ed046ca5756b3300db6f5714ee (patch) | |
| tree | 018787ec4c8f64bc0ae06c40245f1695afa4ea88 | |
| parent | d2e68ebc1fbbbdea4e5a53bd5529660fdc47a17f (diff) | |
| download | kde-ccc90424261511ed046ca5756b3300db6f5714ee.tar.gz kde-ccc90424261511ed046ca5756b3300db6f5714ee.tar.bz2 kde-ccc90424261511ed046ca5756b3300db6f5714ee.zip | |
kde-apps/kdeedu-data: Port to KF6, slotmove * to 0
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/gear.kde.org.eclass | 1 | ||||
| -rw-r--r-- | kde-apps/kdeedu-data/kdeedu-data-24.04.90.ebuild | 16 | ||||
| -rw-r--r-- | kde-apps/kdeedu-data/kdeedu-data-24.05.49.9999.ebuild | 14 | ||||
| -rw-r--r-- | kde-apps/kdeedu-data/kdeedu-data-9999.ebuild | 2 | ||||
| -rw-r--r-- | profiles/updates/2Q-2024 | 2 |
5 files changed, 26 insertions, 9 deletions
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index eb64724f376..35c30d662c9 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -268,7 +268,6 @@ fi if $(ver_test -gt 24.07.75); then case ${PN} in k3b | \ - kdeedu-data | \ kimagemapeditor | \ kmplot | \ poxml) diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.04.90.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.04.90.ebuild index 1fbcfdb9629..dd35987a86e 100644 --- a/kde-apps/kdeedu-data/kdeedu-data-24.04.90.ebuild +++ b/kde-apps/kdeedu-data/kdeedu-data-24.04.90.ebuild @@ -3,16 +3,24 @@ EAPI=8 -inherit gear.kde.org cmake +inherit cmake gear.kde.org DESCRIPTION="Shared icons, artwork and data files for educational applications" LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +SLOT="0" +KEYWORDS="~amd64" IUSE="" BDEPEND=" - dev-qt/qtcore:5 + dev-qt/qtbase:6 kde-frameworks/extra-cmake-modules:0 " + +src_prepare() { + cmake_src_prepare + + # default in git master/>=24.08, no code change since 2023 + # this is a better fit since all revdeps are already KF6 + sed -e "/find_package.*ECM/s/5\.90/6.0/" -i CMakeLists.txt || die +} diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.05.49.9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.05.49.9999.ebuild index a295bfef2ea..c8f26a5677a 100644 --- a/kde-apps/kdeedu-data/kdeedu-data-24.05.49.9999.ebuild +++ b/kde-apps/kdeedu-data/kdeedu-data-24.05.49.9999.ebuild @@ -3,16 +3,24 @@ EAPI=8 -inherit gear.kde.org cmake +inherit cmake gear.kde.org DESCRIPTION="Shared icons, artwork and data files for educational applications" LICENSE="GPL-2" -SLOT="5" +SLOT="0" KEYWORDS="" IUSE="" BDEPEND=" - dev-qt/qtcore:5 + dev-qt/qtbase:6 kde-frameworks/extra-cmake-modules:0 " + +src_prepare() { + cmake_src_prepare + + # default in git master/>=24.08, no code change since 2023 + # this is a better fit since all revdeps are already KF6 + sed -e "/find_package.*ECM/s/5\.90/6.0/" -i CMakeLists.txt || die +} diff --git a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild index 11811036521..8508dce6635 100644 --- a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild +++ b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild @@ -8,7 +8,7 @@ inherit cmake gear.kde.org DESCRIPTION="Shared icons, artwork and data files for educational applications" LICENSE="GPL-2" -SLOT="6" +SLOT="0" KEYWORDS="" IUSE="" diff --git a/profiles/updates/2Q-2024 b/profiles/updates/2Q-2024 new file mode 100644 index 00000000000..453abee0116 --- /dev/null +++ b/profiles/updates/2Q-2024 @@ -0,0 +1,2 @@ +slotmove kde-apps/kdeedu-data 5 0 +slotmove kde-apps/kdeedu-data 6 0 |