commit: abb77101d8d071baa09b724f7d39161def442f79 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 25 18:18:53 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Nov 25 23:00:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb77101
kde-frameworks/kactivities-stats: pkgmove to kde-plasma/plasma-activities-stats Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/kio-extras/kio-extras-23.04.3.ebuild | 2 +- kde-apps/kio-extras/kio-extras-23.08.3.ebuild | 2 +- kde-apps/sweeper/sweeper-23.04.3.ebuild | 2 +- kde-apps/sweeper/sweeper-23.08.3.ebuild | 2 +- .../plasma-activities-stats}/Manifest | 0 .../plasma-activities-stats}/metadata.xml | 1 + .../plasma-activities-stats-5.110.0.ebuild | 13 +++++++++---- .../plasma-activities-stats-5.112.0.ebuild | 13 +++++++++---- kde-plasma/plasma-desktop/plasma-desktop-5.27.8.ebuild | 2 +- kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild | 2 +- .../plasma-workspace/plasma-workspace-5.27.8-r1.ebuild | 2 +- .../plasma-workspace/plasma-workspace-5.27.9.1.ebuild | 2 +- profiles/updates/4Q-2023 | 1 + 13 files changed, 28 insertions(+), 16 deletions(-) diff --git a/kde-apps/kio-extras/kio-extras-23.04.3.ebuild b/kde-apps/kio-extras/kio-extras-23.04.3.ebuild index 42400bf77ec6..f9a87bbfdd66 100644 --- a/kde-apps/kio-extras/kio-extras-23.04.3.ebuild +++ b/kde-apps/kio-extras/kio-extras-23.04.3.ebuild @@ -47,7 +47,7 @@ DEPEND=" activities? ( >=dev-qt/qtsql-${QTMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 ) ios? ( app-pda/libimobiledevice:= diff --git a/kde-apps/kio-extras/kio-extras-23.08.3.ebuild b/kde-apps/kio-extras/kio-extras-23.08.3.ebuild index a0951ad8a670..49844593660e 100644 --- a/kde-apps/kio-extras/kio-extras-23.08.3.ebuild +++ b/kde-apps/kio-extras/kio-extras-23.08.3.ebuild @@ -47,7 +47,7 @@ DEPEND=" activities? ( >=dev-qt/qtsql-${QTMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 ) ios? ( app-pda/libimobiledevice:= diff --git a/kde-apps/sweeper/sweeper-23.04.3.ebuild b/kde-apps/sweeper/sweeper-23.04.3.ebuild index 01aaeae78b05..05391d81b975 100644 --- a/kde-apps/sweeper/sweeper-23.04.3.ebuild +++ b/kde-apps/sweeper/sweeper-23.04.3.ebuild @@ -21,7 +21,7 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 diff --git a/kde-apps/sweeper/sweeper-23.08.3.ebuild b/kde-apps/sweeper/sweeper-23.08.3.ebuild index 01aaeae78b05..05391d81b975 100644 --- a/kde-apps/sweeper/sweeper-23.08.3.ebuild +++ b/kde-apps/sweeper/sweeper-23.08.3.ebuild @@ -21,7 +21,7 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-plasma/plasma-activities-stats/Manifest similarity index 100% rename from kde-frameworks/kactivities-stats/Manifest rename to kde-plasma/plasma-activities-stats/Manifest diff --git a/kde-frameworks/kactivities-stats/metadata.xml b/kde-plasma/plasma-activities-stats/metadata.xml similarity index 86% rename from kde-frameworks/kactivities-stats/metadata.xml rename to kde-plasma/plasma-activities-stats/metadata.xml index 506ecf605bc4..3351d37e0915 100644 --- a/kde-frameworks/kactivities-stats/metadata.xml +++ b/kde-plasma/plasma-activities-stats/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-activities-stats</remote-id> </upstream> <slots> <subslots> diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.110.0.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.110.0.ebuild similarity index 56% rename from kde-frameworks/kactivities-stats/kactivities-stats-5.110.0.ebuild rename to kde-plasma/plasma-activities-stats/plasma-activities-stats-5.110.0.ebuild index 60f26bf423df..84d1c5774491 100644 --- a/kde-frameworks/kactivities-stats/kactivities-stats-5.110.0.ebuild +++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.110.0.ebuild @@ -3,11 +3,16 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) +ECM_NONGUI="true" +ECM_QTHELP="true" +ECM_TEST="true" +KDE_ORG_NAME="kactivities-stats" +KFMIN=$(ver_cut 1-2) QTMIN=5.15.9 inherit ecm frameworks.kde.org -DESCRIPTION="Framework for getting the usage statistics collected by the activities service" +DESCRIPTION="Library for accessing usage data collected by the activities system" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" @@ -15,8 +20,8 @@ IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kactivities-${KFMIN}*:5 + =kde-frameworks/kconfig-${KFMIN}*:5 " DEPEND="${RDEPEND} test? ( dev-libs/boost ) diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.112.0.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.112.0.ebuild similarity index 56% rename from kde-frameworks/kactivities-stats/kactivities-stats-5.112.0.ebuild rename to kde-plasma/plasma-activities-stats/plasma-activities-stats-5.112.0.ebuild index 60f26bf423df..6789a7db7982 100644 --- a/kde-frameworks/kactivities-stats/kactivities-stats-5.112.0.ebuild +++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.112.0.ebuild @@ -3,11 +3,16 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) +ECM_NONGUI="true" +ECM_QTHELP="true" +ECM_TEST="true" +KDE_ORG_NAME="kactivities-stats" +KFMIN=$(ver_cut 1-2) QTMIN=5.15.9 inherit ecm frameworks.kde.org -DESCRIPTION="Framework for getting the usage statistics collected by the activities service" +DESCRIPTION="Library for accessing usage data collected by the activities system" + LICENSE="LGPL-2+" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" @@ -15,8 +20,8 @@ IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 - =kde-frameworks/kactivities-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-plasma/plasma-activities-${KFMIN}*:5 + =kde-frameworks/kconfig-${KFMIN}*:5 " DEPEND="${RDEPEND} test? ( dev-libs/boost ) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.8.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.8.ebuild index fb224ad62dd0..336866aad3f7 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.8.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.8.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild index bfc5511e65dc..64afa507342e 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild index 51a5e2fcae5d..6827b7bd8732 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.8-r1.ebuild @@ -37,7 +37,7 @@ COMMON_DEPEND=" >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild index 1512c7d40d58..39c39440598d 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild @@ -37,7 +37,7 @@ COMMON_DEPEND=" >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023 index 85ab30d4cc66..72c0887d903b 100644 --- a/profiles/updates/4Q-2023 +++ b/profiles/updates/4Q-2023 @@ -29,3 +29,4 @@ slotmove dev-haskell/hdbc 2 0 slotmove dev-haskell/parallel 3 0 slotmove dev-haskell/quickcheck 2 0 move kde-frameworks/plasma kde-plasma/libplasma +move kde-frameworks/kactivities-stats kde-plasma/plasma-activities-stats