summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/attica/Manifest4
-rw-r--r--kde-frameworks/attica/attica-5.115.0.ebuild21
-rw-r--r--kde-frameworks/attica/attica-5.82.0.ebuild26
-rw-r--r--kde-frameworks/attica/attica-5.84.0.ebuild26
-rw-r--r--kde-frameworks/attica/attica-6.1.0.ebuild21
-rw-r--r--kde-frameworks/attica/metadata.xml10
-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.84.0.ebuild35
-rw-r--r--kde-frameworks/baloo/baloo-6.1.0.ebuild35
-rw-r--r--kde-frameworks/baloo/metadata.xml13
-rw-r--r--kde-frameworks/bluez-qt/Manifest4
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-5.115.0.ebuild48
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild38
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-5.84.0.ebuild38
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-6.1.0.ebuild46
-rw-r--r--kde-frameworks/bluez-qt/metadata.xml10
-rw-r--r--kde-frameworks/breeze-icons-rcc/Manifest3
-rw-r--r--kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.115.0.ebuild (renamed from kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild)25
-rw-r--r--kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.84.0.ebuild42
-rw-r--r--kde-frameworks/breeze-icons-rcc/metadata.xml10
-rw-r--r--kde-frameworks/breeze-icons/Manifest4
-rw-r--r--kde-frameworks/breeze-icons/breeze-icons-5.115.0.ebuild (renamed from kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild)31
-rw-r--r--kde-frameworks/breeze-icons/breeze-icons-5.84.0.ebuild49
-rw-r--r--kde-frameworks/breeze-icons/breeze-icons-6.1.0.ebuild53
-rw-r--r--kde-frameworks/breeze-icons/metadata.xml10
-rw-r--r--kde-frameworks/countryflags/Manifest1
-rw-r--r--kde-frameworks/countryflags/countryflags-5.115.0.ebuild22
-rw-r--r--kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch31
-rw-r--r--kde-frameworks/countryflags/metadata.xml16
-rw-r--r--kde-frameworks/extra-cmake-modules/Manifest4
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.115.0.ebuild70
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild83
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.84.0.ebuild78
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.1.0.ebuild70
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch27
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch43
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch81
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch (renamed from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch)55
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch (renamed from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch)28
-rw-r--r--kde-frameworks/extra-cmake-modules/metadata.xml11
-rw-r--r--kde-frameworks/frameworkintegration/Manifest4
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-5.115.0.ebuild (renamed from kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild)13
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-5.84.0.ebuild43
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild41
-rw-r--r--kde-frameworks/frameworkintegration/metadata.xml11
-rw-r--r--kde-frameworks/kactivities-stats/Manifest2
-rw-r--r--kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild23
-rw-r--r--kde-frameworks/kactivities-stats/kactivities-stats-5.84.0.ebuild23
-rw-r--r--kde-frameworks/kactivities/Manifest2
-rw-r--r--kde-frameworks/kactivities/kactivities-5.82.0.ebuild29
-rw-r--r--kde-frameworks/kactivities/kactivities-5.84.0.ebuild29
-rw-r--r--kde-frameworks/kactivities/metadata.xml8
-rw-r--r--kde-frameworks/kapidox/Manifest3
-rw-r--r--kde-frameworks/kapidox/kapidox-5.115.0.ebuild (renamed from kde-frameworks/kapidox/kapidox-5.82.0.ebuild)17
-rw-r--r--kde-frameworks/kapidox/kapidox-5.84.0.ebuild23
-rw-r--r--kde-frameworks/kapidox/metadata.xml10
-rw-r--r--kde-frameworks/karchive/Manifest4
-rw-r--r--kde-frameworks/karchive/karchive-5.115.0.ebuild (renamed from kde-frameworks/karchive/karchive-5.82.0.ebuild)15
-rw-r--r--kde-frameworks/karchive/karchive-6.1.0.ebuild (renamed from kde-frameworks/karchive/karchive-5.84.0.ebuild)15
-rw-r--r--kde-frameworks/karchive/metadata.xml10
-rw-r--r--kde-frameworks/kauth/Manifest4
-rw-r--r--kde-frameworks/kauth/kauth-5.115.0.ebuild (renamed from kde-frameworks/kauth/kauth-5.82.0.ebuild)37
-rw-r--r--kde-frameworks/kauth/kauth-5.84.0.ebuild45
-rw-r--r--kde-frameworks/kauth/kauth-6.1.0.ebuild36
-rw-r--r--kde-frameworks/kauth/metadata.xml11
-rw-r--r--kde-frameworks/kbookmarks/Manifest4
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-5.115.0.ebuild (renamed from kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild)17
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-5.84.0.ebuild34
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild26
-rw-r--r--kde-frameworks/kbookmarks/metadata.xml10
-rw-r--r--kde-frameworks/kcalendarcore/Manifest4
-rw-r--r--kde-frameworks/kcalendarcore/kcalendarcore-5.115.0.ebuild23
-rw-r--r--kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild27
-rw-r--r--kde-frameworks/kcalendarcore/kcalendarcore-5.84.0.ebuild27
-rw-r--r--kde-frameworks/kcalendarcore/kcalendarcore-6.1.0.ebuild23
-rw-r--r--kde-frameworks/kcalendarcore/metadata.xml10
-rw-r--r--kde-frameworks/kcmutils/Manifest4
-rw-r--r--kde-frameworks/kcmutils/kcmutils-5.115.0.ebuild (renamed from kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild)11
-rw-r--r--kde-frameworks/kcmutils/kcmutils-5.84.0.ebuild34
-rw-r--r--kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild30
-rw-r--r--kde-frameworks/kcmutils/metadata.xml10
-rw-r--r--kde-frameworks/kcodecs/Manifest4
-rw-r--r--kde-frameworks/kcodecs/kcodecs-5.115.0.ebuild17
-rw-r--r--kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild24
-rw-r--r--kde-frameworks/kcodecs/kcodecs-5.84.0.ebuild24
-rw-r--r--kde-frameworks/kcodecs/kcodecs-6.1.0.ebuild18
-rw-r--r--kde-frameworks/kcodecs/metadata.xml10
-rw-r--r--kde-frameworks/kcolorscheme/Manifest1
-rw-r--r--kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild24
-rw-r--r--kde-frameworks/kcolorscheme/metadata.xml16
-rw-r--r--kde-frameworks/kcompletion/Manifest4
-rw-r--r--kde-frameworks/kcompletion/kcompletion-5.115.0.ebuild (renamed from kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild)25
-rw-r--r--kde-frameworks/kcompletion/kcompletion-5.84.0.ebuild33
-rw-r--r--kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild25
-rw-r--r--kde-frameworks/kcompletion/metadata.xml10
-rw-r--r--kde-frameworks/kconfig/Manifest4
-rw-r--r--kde-frameworks/kconfig/kconfig-5.115.0.ebuild (renamed from kde-frameworks/kconfig/kconfig-5.82.0.ebuild)23
-rw-r--r--kde-frameworks/kconfig/kconfig-5.84.0.ebuild38
-rw-r--r--kde-frameworks/kconfig/kconfig-6.1.0.ebuild35
-rw-r--r--kde-frameworks/kconfig/metadata.xml14
-rw-r--r--kde-frameworks/kconfigwidgets/Manifest4
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-5.115.0.ebuild (renamed from kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild)28
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-5.84.0.ebuild41
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild34
-rw-r--r--kde-frameworks/kconfigwidgets/metadata.xml10
-rw-r--r--kde-frameworks/kcontacts/Manifest4
-rw-r--r--kde-frameworks/kcontacts/kcontacts-5.115.0.ebuild33
-rw-r--r--kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild35
-rw-r--r--kde-frameworks/kcontacts/kcontacts-5.84.0.ebuild35
-rw-r--r--kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild33
-rw-r--r--kde-frameworks/kcontacts/metadata.xml10
-rw-r--r--kde-frameworks/kcoreaddons/Manifest4
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.115.0.ebuild58
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild51
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.84.0.ebuild51
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild56
-rw-r--r--kde-frameworks/kcoreaddons/metadata.xml10
-rw-r--r--kde-frameworks/kcrash/Manifest4
-rw-r--r--kde-frameworks/kcrash/kcrash-5.115.0.ebuild39
-rw-r--r--kde-frameworks/kcrash/kcrash-5.82.0.ebuild32
-rw-r--r--kde-frameworks/kcrash/kcrash-5.84.0.ebuild32
-rw-r--r--kde-frameworks/kcrash/kcrash-6.1.0.ebuild36
-rw-r--r--kde-frameworks/kcrash/metadata.xml10
-rw-r--r--kde-frameworks/kdav/Manifest4
-rw-r--r--kde-frameworks/kdav/kdav-5.115.0.ebuild33
-rw-r--r--kde-frameworks/kdav/kdav-5.82.0.ebuild37
-rw-r--r--kde-frameworks/kdav/kdav-5.84.0.ebuild37
-rw-r--r--kde-frameworks/kdav/kdav-6.1.0.ebuild32
-rw-r--r--kde-frameworks/kdav/metadata.xml10
-rw-r--r--kde-frameworks/kdbusaddons/Manifest4
-rw-r--r--kde-frameworks/kdbusaddons/kdbusaddons-5.115.0.ebuild (renamed from kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild)18
-rw-r--r--kde-frameworks/kdbusaddons/kdbusaddons-5.84.0.ebuild31
-rw-r--r--kde-frameworks/kdbusaddons/kdbusaddons-6.1.0.ebuild30
-rw-r--r--kde-frameworks/kdbusaddons/metadata.xml10
-rw-r--r--kde-frameworks/kdeclarative/Manifest4
-rw-r--r--kde-frameworks/kdeclarative/kdeclarative-5.115.0.ebuild (renamed from kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild)15
-rw-r--r--kde-frameworks/kdeclarative/kdeclarative-5.84.0.ebuild35
-rw-r--r--kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild28
-rw-r--r--kde-frameworks/kdeclarative/metadata.xml10
-rw-r--r--kde-frameworks/kded/Manifest4
-rw-r--r--kde-frameworks/kded/kded-5.115.0.ebuild (renamed from kde-frameworks/kded/kded-5.82.0.ebuild)18
-rw-r--r--kde-frameworks/kded/kded-5.84.0.ebuild39
-rw-r--r--kde-frameworks/kded/kded-6.1.0.ebuild35
-rw-r--r--kde-frameworks/kded/metadata.xml10
-rw-r--r--kde-frameworks/kdelibs4support/Manifest3
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch (renamed from kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch)2
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.115.0.ebuild (renamed from kde-frameworks/kdelibs4support/kdelibs4support-5.84.0.ebuild)42
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild98
-rw-r--r--kde-frameworks/kdelibs4support/metadata.xml10
-rw-r--r--kde-frameworks/kdesu/Manifest4
-rw-r--r--kde-frameworks/kdesu/kdesu-5.115.0.ebuild (renamed from kde-frameworks/kdesu/kdesu-5.82.0.ebuild)10
-rw-r--r--kde-frameworks/kdesu/kdesu-6.1.0.ebuild (renamed from kde-frameworks/kdesu/kdesu-5.84.0.ebuild)18
-rw-r--r--kde-frameworks/kdesu/metadata.xml10
-rw-r--r--kde-frameworks/kdnssd/Manifest4
-rw-r--r--kde-frameworks/kdnssd/kdnssd-5.115.0.ebuild (renamed from kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild)19
-rw-r--r--kde-frameworks/kdnssd/kdnssd-6.1.0.ebuild (renamed from kde-frameworks/kdnssd/kdnssd-5.84.0.ebuild)23
-rw-r--r--kde-frameworks/kdnssd/metadata.xml10
-rw-r--r--kde-frameworks/kdoctools/Manifest4
-rw-r--r--kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild (renamed from kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild)22
-rw-r--r--kde-frameworks/kdoctools/kdoctools-6.1.0.ebuild (renamed from kde-frameworks/kdoctools/kdoctools-5.84.0.ebuild)36
-rw-r--r--kde-frameworks/kdoctools/metadata.xml10
-rw-r--r--kde-frameworks/kemoticons/Manifest3
-rw-r--r--kde-frameworks/kemoticons/kemoticons-5.115.0.ebuild (renamed from kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild)13
-rw-r--r--kde-frameworks/kemoticons/kemoticons-5.84.0.ebuild28
-rw-r--r--kde-frameworks/kemoticons/metadata.xml10
-rw-r--r--kde-frameworks/kf-env/kf-env-5.ebuild4
-rw-r--r--kde-frameworks/kf-env/metadata.xml5
-rw-r--r--kde-frameworks/kfilemetadata/Manifest4
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-5.115.0.ebuild (renamed from kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild)40
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-6.1.0.ebuild (renamed from kde-frameworks/kfilemetadata/kfilemetadata-5.84.0.ebuild)48
-rw-r--r--kde-frameworks/kfilemetadata/metadata.xml12
-rw-r--r--kde-frameworks/kglobalaccel/Manifest4
-rw-r--r--kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch242
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.ebuild (renamed from kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild)39
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.84.0.ebuild35
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild17
-rw-r--r--kde-frameworks/kglobalaccel/metadata.xml14
-rw-r--r--kde-frameworks/kguiaddons/Manifest4
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.115.0.ebuild48
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild35
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.84.0.ebuild35
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild44
-rw-r--r--kde-frameworks/kguiaddons/metadata.xml13
-rw-r--r--kde-frameworks/kholidays/Manifest4
-rw-r--r--kde-frameworks/kholidays/kholidays-5.115.0.ebuild (renamed from kde-frameworks/kholidays/kholidays-5.82.0.ebuild)21
-rw-r--r--kde-frameworks/kholidays/kholidays-5.84.0.ebuild29
-rw-r--r--kde-frameworks/kholidays/kholidays-6.1.0.ebuild26
-rw-r--r--kde-frameworks/kholidays/metadata.xml10
-rw-r--r--kde-frameworks/khtml/Manifest3
-rw-r--r--kde-frameworks/khtml/khtml-5.115.0.ebuild (renamed from kde-frameworks/khtml/khtml-5.82.0.ebuild)30
-rw-r--r--kde-frameworks/khtml/khtml-5.84.0.ebuild71
-rw-r--r--kde-frameworks/khtml/metadata.xml10
-rw-r--r--kde-frameworks/ki18n/Manifest4
-rw-r--r--kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch11
-rw-r--r--kde-frameworks/ki18n/ki18n-5.115.1.ebuild (renamed from kde-frameworks/ki18n/ki18n-5.82.0.ebuild)28
-rw-r--r--kde-frameworks/ki18n/ki18n-5.84.0.ebuild39
-rw-r--r--kde-frameworks/ki18n/ki18n-6.1.0.ebuild48
-rw-r--r--kde-frameworks/ki18n/metadata.xml10
-rw-r--r--kde-frameworks/kiconthemes/Manifest4
-rw-r--r--kde-frameworks/kiconthemes/kiconthemes-5.115.0.ebuild (renamed from kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild)20
-rw-r--r--kde-frameworks/kiconthemes/kiconthemes-5.84.0.ebuild32
-rw-r--r--kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild31
-rw-r--r--kde-frameworks/kiconthemes/metadata.xml10
-rw-r--r--kde-frameworks/kidletime/Manifest4
-rw-r--r--kde-frameworks/kidletime/kidletime-5.115.0.ebuild (renamed from kde-frameworks/kidletime/kidletime-5.82.0.ebuild)29
-rw-r--r--kde-frameworks/kidletime/kidletime-5.84.0.ebuild46
-rw-r--r--kde-frameworks/kidletime/kidletime-6.1.0.ebuild57
-rw-r--r--kde-frameworks/kidletime/metadata.xml10
-rw-r--r--kde-frameworks/kimageformats/Manifest4
-rw-r--r--kde-frameworks/kimageformats/kimageformats-5.115.0.ebuild (renamed from kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild)33
-rw-r--r--kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild49
-rw-r--r--kde-frameworks/kimageformats/kimageformats-6.1.0.ebuild46
-rw-r--r--kde-frameworks/kimageformats/metadata.xml13
-rw-r--r--kde-frameworks/kinit/Manifest3
-rw-r--r--kde-frameworks/kinit/kinit-5.115.0.ebuild (renamed from kde-frameworks/kinit/kinit-5.82.0.ebuild)21
-rw-r--r--kde-frameworks/kinit/kinit-5.84.0.ebuild51
-rw-r--r--kde-frameworks/kinit/metadata.xml10
-rw-r--r--kde-frameworks/kio/Manifest4
-rw-r--r--kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch46
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch69
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch61
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch52
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch62
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch28
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch79
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch105
-rw-r--r--kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch31
-rw-r--r--kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch53
-rw-r--r--kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch76
-rw-r--r--kde-frameworks/kio/kio-5.115.0.ebuild (renamed from kde-frameworks/kio/kio-5.84.0-r1.ebuild)44
-rw-r--r--kde-frameworks/kio/kio-5.82.0-r2.ebuild111
-rw-r--r--kde-frameworks/kio/kio-6.1.0.ebuild92
-rw-r--r--kde-frameworks/kio/metadata.xml11
-rw-r--r--kde-frameworks/kirigami/Manifest4
-rw-r--r--kde-frameworks/kirigami/kirigami-5.115.0.ebuild (renamed from kde-frameworks/kirigami/kirigami-5.82.0.ebuild)30
-rw-r--r--kde-frameworks/kirigami/kirigami-5.84.0.ebuild46
-rw-r--r--kde-frameworks/kirigami/kirigami-6.1.0.ebuild49
-rw-r--r--kde-frameworks/kirigami/metadata.xml10
-rw-r--r--kde-frameworks/kitemmodels/Manifest4
-rw-r--r--kde-frameworks/kitemmodels/kitemmodels-5.115.0.ebuild (renamed from kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild)12
-rw-r--r--kde-frameworks/kitemmodels/kitemmodels-5.84.0.ebuild33
-rw-r--r--kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild23
-rw-r--r--kde-frameworks/kitemmodels/metadata.xml10
-rw-r--r--kde-frameworks/kitemviews/Manifest4
-rw-r--r--kde-frameworks/kitemviews/kitemviews-5.115.0.ebuild21
-rw-r--r--kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild30
-rw-r--r--kde-frameworks/kitemviews/kitemviews-5.84.0.ebuild30
-rw-r--r--kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild18
-rw-r--r--kde-frameworks/kitemviews/metadata.xml10
-rw-r--r--kde-frameworks/kjobwidgets/Manifest4
-rw-r--r--kde-frameworks/kjobwidgets/kjobwidgets-5.115.0.ebuild (renamed from kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild)18
-rw-r--r--kde-frameworks/kjobwidgets/kjobwidgets-5.84.0.ebuild40
-rw-r--r--kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild25
-rw-r--r--kde-frameworks/kjobwidgets/metadata.xml10
-rw-r--r--kde-frameworks/kjs/Manifest3
-rw-r--r--kde-frameworks/kjs/kjs-5.115.0.ebuild (renamed from kde-frameworks/kjs/kjs-5.84.0.ebuild)8
-rw-r--r--kde-frameworks/kjs/kjs-5.82.0.ebuild23
-rw-r--r--kde-frameworks/kjs/metadata.xml10
-rw-r--r--kde-frameworks/knewstuff/Manifest4
-rw-r--r--kde-frameworks/knewstuff/knewstuff-5.115.0.ebuild (renamed from kde-frameworks/knewstuff/knewstuff-5.84.0.ebuild)12
-rw-r--r--kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild40
-rw-r--r--kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild40
-rw-r--r--kde-frameworks/knewstuff/metadata.xml11
-rw-r--r--kde-frameworks/knotifications/Manifest4
-rw-r--r--kde-frameworks/knotifications/knotifications-5.115.0.ebuild (renamed from kde-frameworks/knotifications/knotifications-5.82.0.ebuild)25
-rw-r--r--kde-frameworks/knotifications/knotifications-5.84.0.ebuild49
-rw-r--r--kde-frameworks/knotifications/knotifications-6.1.0.ebuild23
-rw-r--r--kde-frameworks/knotifications/metadata.xml11
-rw-r--r--kde-frameworks/knotifyconfig/Manifest4
-rw-r--r--kde-frameworks/knotifyconfig/knotifyconfig-5.115.0.ebuild (renamed from kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild)12
-rw-r--r--kde-frameworks/knotifyconfig/knotifyconfig-5.84.0.ebuild34
-rw-r--r--kde-frameworks/knotifyconfig/knotifyconfig-6.1.0.ebuild33
-rw-r--r--kde-frameworks/knotifyconfig/metadata.xml12
-rw-r--r--kde-frameworks/kpackage/Manifest4
-rw-r--r--kde-frameworks/kpackage/kpackage-5.115.0.ebuild (renamed from kde-frameworks/kpackage/kpackage-5.82.0.ebuild)23
-rw-r--r--kde-frameworks/kpackage/kpackage-5.84.0.ebuild39
-rw-r--r--kde-frameworks/kpackage/kpackage-6.1.0.ebuild38
-rw-r--r--kde-frameworks/kpackage/metadata.xml10
-rw-r--r--kde-frameworks/kparts/Manifest4
-rw-r--r--kde-frameworks/kparts/kparts-5.115.0.ebuild (renamed from kde-frameworks/kparts/kparts-5.82.0.ebuild)11
-rw-r--r--kde-frameworks/kparts/kparts-5.84.0.ebuild33
-rw-r--r--kde-frameworks/kparts/kparts-6.1.0.ebuild28
-rw-r--r--kde-frameworks/kparts/metadata.xml10
-rw-r--r--kde-frameworks/kpeople/Manifest4
-rw-r--r--kde-frameworks/kpeople/kpeople-5.115.0.ebuild (renamed from kde-frameworks/kpeople/kpeople-5.84.0.ebuild)21
-rw-r--r--kde-frameworks/kpeople/kpeople-5.82.0.ebuild40
-rw-r--r--kde-frameworks/kpeople/kpeople-6.1.0.ebuild37
-rw-r--r--kde-frameworks/kpeople/metadata.xml11
-rw-r--r--kde-frameworks/kplotting/Manifest4
-rw-r--r--kde-frameworks/kplotting/kplotting-5.115.0.ebuild (renamed from kde-frameworks/kplotting/kplotting-5.82.0.ebuild)11
-rw-r--r--kde-frameworks/kplotting/kplotting-5.84.0.ebuild21
-rw-r--r--kde-frameworks/kplotting/kplotting-6.1.0.ebuild17
-rw-r--r--kde-frameworks/kplotting/metadata.xml10
-rw-r--r--kde-frameworks/kpty/Manifest4
-rw-r--r--kde-frameworks/kpty/kpty-5.115.0.ebuild (renamed from kde-frameworks/kpty/kpty-5.84.0.ebuild)8
-rw-r--r--kde-frameworks/kpty/kpty-6.1.0.ebuild (renamed from kde-frameworks/kpty/kpty-5.82.0.ebuild)13
-rw-r--r--kde-frameworks/kpty/metadata.xml10
-rw-r--r--kde-frameworks/kquickcharts/Manifest4
-rw-r--r--kde-frameworks/kquickcharts/kquickcharts-5.115.0.ebuild (renamed from kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild)12
-rw-r--r--kde-frameworks/kquickcharts/kquickcharts-6.1.0.ebuild (renamed from kde-frameworks/kquickcharts/kquickcharts-5.84.0.ebuild)28
-rw-r--r--kde-frameworks/kquickcharts/metadata.xml11
-rw-r--r--kde-frameworks/kross/Manifest3
-rw-r--r--kde-frameworks/kross/kross-5.115.0.ebuild (renamed from kde-frameworks/kross/kross-5.82.0.ebuild)11
-rw-r--r--kde-frameworks/kross/kross-5.84.0.ebuild34
-rw-r--r--kde-frameworks/kross/metadata.xml10
-rw-r--r--kde-frameworks/krunner/Manifest4
-rw-r--r--kde-frameworks/krunner/krunner-5.115.0.ebuild (renamed from kde-frameworks/krunner/krunner-5.82.0.ebuild)33
-rw-r--r--kde-frameworks/krunner/krunner-5.84.0.ebuild47
-rw-r--r--kde-frameworks/krunner/krunner-6.1.0.ebuild32
-rw-r--r--kde-frameworks/krunner/metadata.xml10
-rw-r--r--kde-frameworks/kservice/Manifest4
-rw-r--r--kde-frameworks/kservice/kservice-5.115.0.ebuild (renamed from kde-frameworks/kservice/kservice-5.82.0.ebuild)23
-rw-r--r--kde-frameworks/kservice/kservice-5.84.0.ebuild51
-rw-r--r--kde-frameworks/kservice/kservice-6.1.0.ebuild37
-rw-r--r--kde-frameworks/kservice/metadata.xml10
-rw-r--r--kde-frameworks/kstatusnotifieritem/Manifest1
-rw-r--r--kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild30
-rw-r--r--kde-frameworks/kstatusnotifieritem/metadata.xml17
-rw-r--r--kde-frameworks/ksvg/Manifest1
-rw-r--r--kde-frameworks/ksvg/ksvg-6.1.0.ebuild27
-rw-r--r--kde-frameworks/ksvg/metadata.xml17
-rw-r--r--kde-frameworks/ktexteditor/Manifest4
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.115.0.ebuild (renamed from kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild)23
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.84.0.ebuild59
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild53
-rw-r--r--kde-frameworks/ktexteditor/metadata.xml11
-rw-r--r--kde-frameworks/ktexttemplate/Manifest1
-rw-r--r--kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild22
-rw-r--r--kde-frameworks/ktexttemplate/metadata.xml (renamed from kde-frameworks/kactivities-stats/metadata.xml)5
-rw-r--r--kde-frameworks/ktextwidgets/Manifest4
-rw-r--r--kde-frameworks/ktextwidgets/ktextwidgets-5.115.0.ebuild (renamed from kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild)11
-rw-r--r--kde-frameworks/ktextwidgets/ktextwidgets-5.84.0.ebuild38
-rw-r--r--kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild37
-rw-r--r--kde-frameworks/ktextwidgets/metadata.xml11
-rw-r--r--kde-frameworks/kunitconversion/Manifest4
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-5.115.0.ebuild33
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild28
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-5.84.0.ebuild28
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild33
-rw-r--r--kde-frameworks/kunitconversion/metadata.xml10
-rw-r--r--kde-frameworks/kuserfeedback/Manifest2
-rw-r--r--kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch27
-rw-r--r--kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild58
-rw-r--r--kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild44
-rw-r--r--kde-frameworks/kuserfeedback/metadata.xml15
-rw-r--r--kde-frameworks/kwallet/Manifest4
-rw-r--r--kde-frameworks/kwallet/kwallet-5.115.0.ebuild (renamed from kde-frameworks/kwallet/kwallet-5.82.0.ebuild)37
-rw-r--r--kde-frameworks/kwallet/kwallet-5.84.0.ebuild53
-rw-r--r--kde-frameworks/kwallet/kwallet-6.1.0.ebuild52
-rw-r--r--kde-frameworks/kwallet/metadata.xml11
-rw-r--r--kde-frameworks/kwayland/Manifest2
-rw-r--r--kde-frameworks/kwayland/kwayland-5.82.0.ebuild34
-rw-r--r--kde-frameworks/kwayland/kwayland-5.84.0.ebuild34
-rw-r--r--kde-frameworks/kwayland/metadata.xml8
-rw-r--r--kde-frameworks/kwidgetsaddons/Manifest4
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild31
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild36
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.84.0.ebuild36
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild28
-rw-r--r--kde-frameworks/kwidgetsaddons/metadata.xml10
-rw-r--r--kde-frameworks/kwindowsystem/Manifest4
-rw-r--r--kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch75
-rw-r--r--kde-frameworks/kwindowsystem/kwindowsystem-5.115.0.ebuild (renamed from kde-frameworks/kwindowsystem/kwindowsystem-5.84.0.ebuild)21
-rw-r--r--kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild46
-rw-r--r--kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild50
-rw-r--r--kde-frameworks/kwindowsystem/metadata.xml10
-rw-r--r--kde-frameworks/kxmlgui/Manifest4
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.115.0.ebuild (renamed from kde-frameworks/kxmlgui/kxmlgui-5.84.0.ebuild)27
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild53
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild39
-rw-r--r--kde-frameworks/kxmlgui/metadata.xml10
-rw-r--r--kde-frameworks/metadata.xml11
-rw-r--r--kde-frameworks/modemmanager-qt/Manifest4
-rw-r--r--kde-frameworks/modemmanager-qt/metadata.xml10
-rw-r--r--kde-frameworks/modemmanager-qt/modemmanager-qt-5.115.0.ebuild (renamed from kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild)12
-rw-r--r--kde-frameworks/modemmanager-qt/modemmanager-qt-6.1.0.ebuild (renamed from kde-frameworks/modemmanager-qt/modemmanager-qt-5.84.0.ebuild)20
-rw-r--r--kde-frameworks/networkmanager-qt/Manifest4
-rw-r--r--kde-frameworks/networkmanager-qt/metadata.xml10
-rw-r--r--kde-frameworks/networkmanager-qt/networkmanager-qt-5.115.0.ebuild (renamed from kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild)26
-rw-r--r--kde-frameworks/networkmanager-qt/networkmanager-qt-6.1.0.ebuild (renamed from kde-frameworks/networkmanager-qt/networkmanager-qt-5.84.0.ebuild)29
-rw-r--r--kde-frameworks/oxygen-icons/Manifest4
-rw-r--r--kde-frameworks/oxygen-icons/metadata.xml10
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-5.115.0.ebuild (renamed from kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild)23
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-5.84.0.ebuild37
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild42
-rw-r--r--kde-frameworks/plasma/Manifest3
-rw-r--r--kde-frameworks/plasma/metadata.xml8
-rw-r--r--kde-frameworks/plasma/plasma-5.82.0.ebuild77
-rw-r--r--kde-frameworks/plasma/plasma-5.84.0.ebuild74
-rw-r--r--kde-frameworks/prison/Manifest4
-rw-r--r--kde-frameworks/prison/metadata.xml11
-rw-r--r--kde-frameworks/prison/prison-5.115.0.ebuild (renamed from kde-frameworks/prison/prison-5.84.0.ebuild)12
-rw-r--r--kde-frameworks/prison/prison-6.1.0.ebuild (renamed from kde-frameworks/prison/prison-5.82.0.ebuild)20
-rw-r--r--kde-frameworks/purpose/Manifest4
-rw-r--r--kde-frameworks/purpose/metadata.xml11
-rw-r--r--kde-frameworks/purpose/purpose-5.115.0.ebuild (renamed from kde-frameworks/purpose/purpose-5.82.0.ebuild)43
-rw-r--r--kde-frameworks/purpose/purpose-5.84.0.ebuild68
-rw-r--r--kde-frameworks/purpose/purpose-6.1.0.ebuild70
-rw-r--r--kde-frameworks/qqc2-desktop-style/Manifest4
-rw-r--r--kde-frameworks/qqc2-desktop-style/metadata.xml10
-rw-r--r--kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.115.0.ebuild (renamed from kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild)13
-rw-r--r--kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.84.0.ebuild28
-rw-r--r--kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild31
-rw-r--r--kde-frameworks/solid/Manifest4
-rw-r--r--kde-frameworks/solid/metadata.xml10
-rw-r--r--kde-frameworks/solid/solid-5.115.0.ebuild (renamed from kde-frameworks/solid/solid-5.84.0.ebuild)19
-rw-r--r--kde-frameworks/solid/solid-6.1.1.ebuild (renamed from kde-frameworks/solid/solid-5.82.0.ebuild)35
-rw-r--r--kde-frameworks/sonnet/Manifest4
-rw-r--r--kde-frameworks/sonnet/metadata.xml15
-rw-r--r--kde-frameworks/sonnet/sonnet-5.115.0.ebuild (renamed from kde-frameworks/sonnet/sonnet-5.82.0.ebuild)38
-rw-r--r--kde-frameworks/sonnet/sonnet-5.84.0.ebuild44
-rw-r--r--kde-frameworks/sonnet/sonnet-6.1.0.ebuild41
-rw-r--r--kde-frameworks/syndication/Manifest4
-rw-r--r--kde-frameworks/syndication/metadata.xml10
-rw-r--r--kde-frameworks/syndication/syndication-5.115.0.ebuild (renamed from kde-frameworks/syndication/syndication-5.84.0.ebuild)10
-rw-r--r--kde-frameworks/syndication/syndication-5.82.0.ebuild23
-rw-r--r--kde-frameworks/syndication/syndication-6.1.0.ebuild23
-rw-r--r--kde-frameworks/syntax-highlighting/Manifest4
-rw-r--r--kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch85
-rw-r--r--kde-frameworks/syntax-highlighting/metadata.xml10
-rw-r--r--kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild28
-rw-r--r--kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild29
-rw-r--r--kde-frameworks/syntax-highlighting/syntax-highlighting-5.84.0.ebuild29
-rw-r--r--kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild27
-rw-r--r--kde-frameworks/threadweaver/Manifest4
-rw-r--r--kde-frameworks/threadweaver/metadata.xml10
-rw-r--r--kde-frameworks/threadweaver/threadweaver-5.115.0.ebuild (renamed from kde-frameworks/threadweaver/threadweaver-5.84.0.ebuild)8
-rw-r--r--kde-frameworks/threadweaver/threadweaver-6.1.0.ebuild (renamed from kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild)9
429 files changed, 4821 insertions, 5584 deletions
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 34e5a299b17e..697693aaf4de 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1,2 @@
-DIST attica-5.82.0.tar.xz 66220 BLAKE2B 22ee6014cae294cf772eabd874fe1afb493ad1ac92a1f511cbe6912dbbc4f81a684989a285d388d6a1dc5f7180d6930e839a5ba05c1e81b306ee69e572f6fb2b SHA512 8569ec110679bc026f98cf98ef79aba44279821f10f6153f0054c7a75806921683a83317bc1873896f5bba23679eb4fbe50b50ea43b22813dd2b203e84bf44d2
-DIST attica-5.84.0.tar.xz 66604 BLAKE2B 72474f0925d1f3ebde9369a59dead7406789a9631ae7bb56cc5312322da333dc5512a7da394c8f09830da3554b2754ab1658f8614aa5093e05a4f1251c60c5aa SHA512 6baf5dae5785784f7c52efec17394ae5f5ee7eac76f7d8ca76448de15e735350d43b8200ab88a4bb69d228637e0584d38c0d073e998c16a3d46e4b358e5c0c8e
+DIST attica-5.115.0.tar.xz 69520 BLAKE2B 55eff477f7de3117db0b8186d81787ac85c4ac95697218e1ce83d2b66b50055c7e631c3310a9bf7b81cbf0d2c10e473b7783a34f966e6d0ccfc7aa1dd89fa040 SHA512 9d530ae6425b0edf7831fa9aa25573da66c8813fbf7776c6d300445c54ec175e91b6c4abbfc6f4985a0f003b41c5e3218ca560466a6b0fc3177d3951151e6cab
+DIST attica-6.1.0.tar.xz 68848 BLAKE2B f4f59a63cdb9facdec4d1cce25a3765cc2e188bb6b3ba737a25c8779c11f8ca917799e6df1b6dfb74922f796dae7af209db20f130f7d500cdb5d5d9b507e5673 SHA512 25cf795e81e96065c6f25b5dbb77fea93eeb14a3475bc5b61472618d0d8703c5d913742bf7f7058dfb9ade2af414437d7ac18bd90b96c55458c727a0c4087e13
diff --git a/kde-frameworks/attica/attica-5.115.0.ebuild b/kde-frameworks/attica/attica-5.115.0.ebuild
new file mode 100644
index 000000000000..91d02f3c8d0f
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.115.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+RDEPEND=">=dev-qt/qtnetwork-${QTMIN}:5"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+ # requires network access, bug #661230
+ providertest
+)
diff --git a/kde-frameworks/attica/attica-5.82.0.ebuild b/kde-frameworks/attica/attica-5.82.0.ebuild
deleted file mode 100644
index a080e3b49c6f..000000000000
--- a/kde-frameworks/attica/attica-5.82.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
- # requires network access, bug #661230
- local myctestargs=(
- -E "(providertest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/attica/attica-5.84.0.ebuild b/kde-frameworks/attica/attica-5.84.0.ebuild
deleted file mode 100644
index a05e53578cc4..000000000000
--- a/kde-frameworks/attica/attica-5.84.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
- # requires network access, bug #661230
- local myctestargs=(
- -E "(providertest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/attica/attica-6.1.0.ebuild b/kde-frameworks/attica/attica-6.1.0.ebuild
new file mode 100644
index 000000000000..c6a7e11d4893
--- /dev/null
+++ b/kde-frameworks/attica/attica-6.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[network]"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+ # requires network access, bug #661230
+ providertest
+)
diff --git a/kde-frameworks/attica/metadata.xml b/kde-frameworks/attica/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/attica/metadata.xml
+++ b/kde-frameworks/attica/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 832a2228c191..0093b39649f8 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.84.0.tar.xz 280888 BLAKE2B 237af667440d9951b3f8eaa3a6cb3c7592569d14c1271d3db8c2e3f84f9fa99befeadefa5f65b43c644c19f83032cb38a5a014f15b20a43c4e4217e749bc259f SHA512 724a8eb9183548ccf99bd2a3cf6938d937731f01e72a9ea3b83e65a96be8e52c0a5690e19b95fd2f43ef1cf3404efe9d61ba0bed5439b73d50762c48156c7529
+DIST baloo-5.115.0.tar.xz 311360 BLAKE2B 6092b85cbde534f1cf3fc344fe913b945900c4bbd1db4516e690a4090e890b02e35cd56f9e235605494e0c007fd61c5bb3c2d8be5e8974aa354c69771ee7e8c8 SHA512 43130d873845a3d8f0a7a25b04a032e7cd834170b5f67b7b18396a800086801ce0910865dc7efc333dd0764121b65c8fddcec4e072af6503e0b1bc55c642f4d6
+DIST baloo-6.1.0.tar.xz 319828 BLAKE2B 21427c4f4e79e9168f747ecba1c64cc5d409e5138c1de110030763c97dff92460ca9d7300d82c17faab428208dd8088947479badd3aff233601cd164d5cbf344 SHA512 a755a52ace391235bb2231b51a192ba6e32b682670ce761b57c858b10231cee0965c3d9657a27198e4be86a07460660b064e16e2c952c40d880f1dcc32d7eb27
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.84.0.ebuild b/kde-frameworks/baloo/baloo-5.84.0.ebuild
deleted file mode 100644
index 245f2f64562f..000000000000
--- a/kde-frameworks/baloo/baloo-5.84.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.1.0.ebuild b/kde-frameworks/baloo/baloo-6.1.0.ebuild
new file mode 100644
index 000000000000..d98f5ec95bd3
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-6.1.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>
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index dd2019f7595a..a5ef882c8e2f 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,2 +1,2 @@
-DIST bluez-qt-5.82.0.tar.xz 101788 BLAKE2B b9e67c22a8c3c6e8756fb140622d5847c52dbc536ffe4cbba6811af7a49996abb3613dc2fe481dea98c16badca9a560d9636653dd180dfea6256cb4b6e298ddf SHA512 defb301f7095730e183e63d267fa774dd6466b8d62eee2377d4f1d8a77393a848caf7f401c778b3ae7fcbaf1b0c408fff365e2a13d109120e07ddbd2735dc3e8
-DIST bluez-qt-5.84.0.tar.xz 101792 BLAKE2B 7fbfb79e4b911bb1a9591d2a450de8ec5f1e99d7697ea0be3d75708455e6be6fab41c1e20156bb2796f9ded940b79481775cef3dbf26bf23719a984efb3ed2cc SHA512 5d206e911c0d54f660ad8d5c3d7558a96080f20cd1784fd23ed1ae368e0edaa4dba423ba12ebdb157437d1f39d79e837f0f9954da73e85c08e151dcdcfba35e8
+DIST bluez-qt-5.115.0.tar.xz 114776 BLAKE2B b89c25e6384d95d71f22cd3bebf899c0543eef5f559f28e35d95793587cf3aed79cde73a83e43c276111bdf4b0a11dc5f9cb27ebe5c58bc1e3278ed5132fd9d3 SHA512 b56ffb59d1fdabfc5bc76ae888a591eb24b1b7d145d9a1efd7c0aafb51f47c49ba98f375ab461a141f321e7e4811b8c6928faeef07001a4ee46b49540441b985
+DIST bluez-qt-6.1.0.tar.xz 116788 BLAKE2B d606410f10f535e6922358f343fb0f322ddfd5fc90d13bc25bff9a5b8de5ae2171a01858ad3f158939adc9be487d934198ff40369eb31807a3901557dfaa5bd4 SHA512 68bb245313c8394bbca5d5c0e38953f26e2afc094bc82b1c961f726cd00d9b22a3dedb9b980a9e25a128e9d227d84152a8bc8095ff763bff361aae270015b506
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.115.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.115.0.ebuild
new file mode 100644
index 000000000000..a8f9498cf479
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.115.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.9
+VIRTUALX_REQUIRED="test" # bug 910062 (tests hang)
+inherit ecm frameworks.kde.org udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+
+LICENSE="LGPL-2"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 668196, hangs
+ managertest
+ )
+ # parallel tests fail, bug 609248
+ ecm_src_test -j1
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ udev_reload
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ udev_reload
+}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
deleted file mode 100644
index 35e86fa8244a..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # parallel tests fail, bug 609248; managertest hangs, bug 668196
- local myctestargs=(
- -j1
- -E "(managertest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.84.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.84.0.ebuild
deleted file mode 100644
index a55ee208fcbb..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.84.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # parallel tests fail, bug 609248; managertest hangs, bug 668196
- local myctestargs=(
- -j1
- -E "(managertest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-6.1.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-6.1.0.ebuild
new file mode 100644
index 000000000000..d6a3372e536c
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-6.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,network]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 668196, hangs
+ managertest
+ )
+ # parallel tests fail, bug 609248
+ ecm_src_test -j1
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ udev_reload
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ udev_reload
+}
diff --git a/kde-frameworks/bluez-qt/metadata.xml b/kde-frameworks/bluez-qt/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/bluez-qt/metadata.xml
+++ b/kde-frameworks/bluez-qt/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index ee5c41064298..f43e5a7e9081 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,2 +1 @@
-DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
-DIST breeze-icons-5.84.0.tar.xz 2049972 BLAKE2B b18a537a7d50bc0da49dd446588d0a7f46d8ed657581d656e56bc8bd469ff4b786b1cd9f39ba986faceab1bbad847202cb677077415d6810b52b85098ff96bfa SHA512 51cd603a220cf95cc311124fa589769aaa549364e44d1edaafa67793ee313f5ad3934b6b7941715942b29119e6d7cb7159508a16346d6b6cc54a3f397c3a1a23
+DIST breeze-icons-5.115.0.tar.xz 2173528 BLAKE2B 712c9cabb74bbdf9feb9a889fddda6ea654fd2a618f5c36a4aa782b5389032b829919ca5ef69a3310749ac10e2dc381700474d56e7cbc1478ae51030248d8789 SHA512 f4b5f54bb80dcd2bba6edd02a412eb675b02d438ba0ee82d6dc4eaac1ed2aceb11b46ce143bbe825c26f823d5b897619e02c26b23addf2de05830a320dd124f8
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.115.0.ebuild
index d410c4771dae..2d648b47b47f 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.115.0.ebuild
@@ -1,30 +1,30 @@
-# 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
KDE_ORG_NAME="breeze-icons"
PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake kde.org python-any-r1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake frameworks.kde.org python-any-r1
DESCRIPTION="Breeze SVG icon theme binary resource"
LICENSE="LGPL-3"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
IUSE="test"
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
+DEPEND="test? ( dev-qt/qttest:5 )"
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
dev-qt/qtcore:5
- >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:0
test? ( app-misc/fdupes )
"
-DEPEND="test? ( dev-qt/qttest:5 )"
python_check_deps() {
- has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
}
src_prepare() {
@@ -40,3 +40,10 @@ src_configure() {
)
cmake_src_configure
}
+
+src_install() {
+ cmake_src_install
+
+ # provided by kde-frameworks/breeze-icons
+ rm -rv "${ED}"/usr/$(get_libdir)/cmake/KF5BreezeIcons || die
+}
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.84.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.84.0.ebuild
deleted file mode 100644
index cf56dfe74633..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.84.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="breeze-icons"
-PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- dev-qt/qtcore:5
- >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
- test? ( app-misc/fdupes )
-"
-DEPEND="test? ( dev-qt/qttest:5 )"
-
-python_check_deps() {
- has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- cmake_src_prepare
- use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPython_EXECUTABLE="${PYTHON}"
- -DBINARY_ICONS_RESOURCE=ON
- -DSKIP_INSTALL_ICONS=ON
- )
- cmake_src_configure
-}
diff --git a/kde-frameworks/breeze-icons-rcc/metadata.xml b/kde-frameworks/breeze-icons-rcc/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/breeze-icons-rcc/metadata.xml
+++ b/kde-frameworks/breeze-icons-rcc/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index ee5c41064298..74bd506c8570 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
-DIST breeze-icons-5.84.0.tar.xz 2049972 BLAKE2B b18a537a7d50bc0da49dd446588d0a7f46d8ed657581d656e56bc8bd469ff4b786b1cd9f39ba986faceab1bbad847202cb677077415d6810b52b85098ff96bfa SHA512 51cd603a220cf95cc311124fa589769aaa549364e44d1edaafa67793ee313f5ad3934b6b7941715942b29119e6d7cb7159508a16346d6b6cc54a3f397c3a1a23
+DIST breeze-icons-5.115.0.tar.xz 2173528 BLAKE2B 712c9cabb74bbdf9feb9a889fddda6ea654fd2a618f5c36a4aa782b5389032b829919ca5ef69a3310749ac10e2dc381700474d56e7cbc1478ae51030248d8789 SHA512 f4b5f54bb80dcd2bba6edd02a412eb675b02d438ba0ee82d6dc4eaac1ed2aceb11b46ce143bbe825c26f823d5b897619e02c26b23addf2de05830a320dd124f8
+DIST breeze-icons-6.1.0.tar.xz 2253668 BLAKE2B 6003d2b96d0d42dff7b14214620c7821b410ec40a0d111150207fe3810265598db8df88ecea901b340a846318019ccd7157484ac6332fdcc9d5665d1cb2a89dc SHA512 9592b75d22aef6437d03f13fb242d012977b665d043b8066a5f7f49f1f4b282a921bda29b99b8b63156a3bd3a9f616b9bc1eba8423d547d595ff9156d5053d66
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.115.0.ebuild
index 8921f1f69c70..da876a1dbb42 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.115.0.ebuild
@@ -1,30 +1,34 @@
-# 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
PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake kde.org python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake frameworks.kde.org python-any-r1 xdg-utils
DESCRIPTION="Breeze SVG icon theme"
LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
IUSE="test"
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
-DEPEND="test? ( dev-qt/qttest:5 )"
+DEPEND="
+ test? (
+ dev-qt/qtcore:5
+ dev-qt/qttest:5
+ )
+"
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- dev-qt/qtcore:5
- >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:0
test? ( app-misc/fdupes )
"
python_check_deps() {
- has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
}
src_prepare() {
@@ -40,6 +44,13 @@ src_configure() {
cmake_src_configure
}
+src_install() {
+ cmake_src_install
+ # bug 770988
+ find "${ED}"/usr/share/icons/ -type d -empty -delete || die
+ find "${ED}"/usr/share/icons/ -xtype l -delete || die
+}
+
pkg_postinst() {
xdg_icon_cache_update
}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.84.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.84.0.ebuild
deleted file mode 100644
index 904234c52640..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.84.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake kde.org python-any-r1 xdg-utils
-
-DESCRIPTION="Breeze SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT+=" !test? ( test )"
-
-DEPEND="test? ( dev-qt/qttest:5 )"
-BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- dev-qt/qtcore:5
- >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
- test? ( app-misc/fdupes )
-"
-
-python_check_deps() {
- has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- cmake_src_prepare
- use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPython_EXECUTABLE="${PYTHON}"
- -DBINARY_ICONS_RESOURCE=OFF
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-6.1.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-6.1.0.ebuild
new file mode 100644
index 000000000000..8e96af91da95
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-6.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake frameworks.kde.org python-any-r1 xdg
+
+DESCRIPTION="Breeze SVG icon theme"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !kde-frameworks/${PN}:5
+ !kde-frameworks/${PN}-rcc:5
+ !kde-frameworks/${PN}-rcc:6
+"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ dev-qt/qtbase:6
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:*
+ test? ( app-misc/fdupes )
+"
+
+python_check_deps() {
+ python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ cmake_src_prepare
+ use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPython_EXECUTABLE="${PYTHON}"
+ -DBINARY_ICONS_RESOURCE=ON
+ -DSKIP_INSTALL_ICONS=OFF
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ # bug 770988
+ find "${ED}"/usr/share/icons/ -type d -empty -delete || die
+ find "${ED}"/usr/share/icons/ -xtype l -delete || die
+}
diff --git a/kde-frameworks/breeze-icons/metadata.xml b/kde-frameworks/breeze-icons/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/breeze-icons/metadata.xml
+++ b/kde-frameworks/breeze-icons/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/countryflags/Manifest b/kde-frameworks/countryflags/Manifest
new file mode 100644
index 000000000000..b28a15aba8d1
--- /dev/null
+++ b/kde-frameworks/countryflags/Manifest
@@ -0,0 +1 @@
+DIST kdelibs4support-5.115.0.tar.xz 3723592 BLAKE2B efb5a384b71f781d666d78c3157188179eaf54237d6a8c442217273e5b4b1b604d86f5db73cce6528d991f669d6ddb6cf156035d5606d1eb03912c7b99ddf26b SHA512 511e14975c2810217e8f08d14a800cfdd04654399303b04a45d69b2f1959cf482027f2444c9e8202bdda60f1779fe572af0a55fae1b3692ec49cea97beeb894f
diff --git a/kde-frameworks/countryflags/countryflags-5.115.0.ebuild b/kde-frameworks/countryflags/countryflags-5.115.0.ebuild
new file mode 100644
index 000000000000..0482a7e8be0d
--- /dev/null
+++ b/kde-frameworks/countryflags/countryflags-5.115.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+KDE_ORG_NAME="kdelibs4support"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Icons of flags for various countries"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+
+CMAKE_USE_DIR="${S}/src/l10n"
+
+# https://phabricator.kde.org/T13722
+# https://invent.kde.org/frameworks/breeze-icons/-/issues/1
+PATCHES=( "${FILESDIR}/${PN}-5.90.0-standalone.patch" )
+
+RDEPEND="!<kde-frameworks/kdelibs4support-5.90.0:5"
diff --git a/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch b/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch
new file mode 100644
index 000000000000..777fc622580d
--- /dev/null
+++ b/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch
@@ -0,0 +1,31 @@
+From 4abd415bae7dd03cfb30f7db3597e0ab241f19e5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 17 Dec 2021 16:09:12 +0100
+Subject: [PATCH] Standalone install of countryflags (src/l10n)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/l10n/CMakeLists.txt | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/l10n/CMakeLists.txt b/src/l10n/CMakeLists.txt
+index babb57b8..915b6fe4 100644
+--- a/src/l10n/CMakeLists.txt
++++ b/src/l10n/CMakeLists.txt
+@@ -1,3 +1,13 @@
++cmake_minimum_required(VERSION 3.16)
++
++project(CountryFlags)
++
++include(FeatureSummary)
++find_package(ECM 5.89.0 NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
++
++include(KDEInstallDirs)
++
+ install( FILES northafrica.desktop westafrica.desktop southafrica.desktop centralafrica.desktop eastafrica.desktop caribbean.desktop oceania.desktop centralamerica.desktop northamerica.desktop southamerica.desktop easteurope.desktop westeurope.desktop centraleurope.desktop northeurope.desktop southeurope.desktop southasia.desktop southeastasia.desktop eastasia.desktop centralasia.desktop middleeast.desktop DESTINATION ${KDE_INSTALL_DATADIR_KF5}/locale/countries )
+
+ set(listLang C epo ad ae af ag ai al am an ao ar as at au aw ax az ba bb bd be bf bg bh bi bj bl bm bn bo br bs bt bw by bz ca cc cd cf cg ch ci ck cl cm cn co cr cu cv cx cy cz de dj dk dm do dz ec ee eg eh er es et fi fj fk fm fo fr ga gb gd ge gf gg gh gi gl gm gn gp gq gr gt gu gw gy hk hn hr ht hu id ie il im in iq ir is it je jm jo jp ke kg kh ki km kn kp kr kw ky kz la lb lc li lk lr ls lt lu lv ly ma mc md me mf mg mh mk ml mm mn mo mp mq mr ms mt mu mv mw mx my mz na nc ne nf ng ni nl no np nr nu nz om pa pe pf pg ph pk pl pm pn pr ps pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sk sl sm sn so sr ss st sv sy sz tc td tg th tj tk tl tm tn to tp tr tt tv tw tz ua ug us uy uz va vc ve vg vi vn vu wf ws ye yt za zm zw )
+--
+2.34.1
+
diff --git a/kde-frameworks/countryflags/metadata.xml b/kde-frameworks/countryflags/metadata.xml
new file mode 100644
index 000000000000..506ecf605bc4
--- /dev/null
+++ b/kde-frameworks/countryflags/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+</pkgmetadata>
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index b6ca624a35b7..29ab50ec462d 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,2 @@
-DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
-DIST extra-cmake-modules-5.84.0.tar.xz 315224 BLAKE2B 1f159ae22ccc2f5bbb144bb1e5b2e1327a583748897385b11d9e282e74849a70a66e04455077fe8ed2afc3443b07eeedd61ce66fc7e05c0df7c8bad23e8ea6b7 SHA512 442b734b000fe3916f3c1bd42849996777c8c22718350db21505dd86bfdfb3f805cb9516461c363cb1d70e5737987797fb75e59ed0197c0ea12bda897dd5d1a6
+DIST extra-cmake-modules-5.115.0.tar.xz 332504 BLAKE2B e76e2dcd990f95cb96f9ae049c0a22e05d3eb9d87e419ff80b4e5f2f2adb06f6fc9f09c69101f1e9155d6c31c4062eafe5d3c90ac94f3cc95f80ea889f0965c8 SHA512 53c44d8ccb58266bdf72014467cd57de86acb89ba272f1fb09f80af1c858a442cb59347fbff95cb3188c14a5cc520f9e952d1b396f2c5f2ed99aa070beacac22
+DIST extra-cmake-modules-6.1.0.tar.xz 341972 BLAKE2B 95a39b94d1e16bb78e6f6ce290baf2801d3eee7eaafa2f2c45ec6276cfa83916a5894aab7ea3bf7e96c5fb270e1b8b35562bcbfdd4228b8677d080b093e1d650 SHA512 8e31c576e461de927b5f9ff7a0f6c368f95b66c721ef1fb810ae2f2e6ea486e0fe23766023c223c65c2a3cacc62466f0e38d6353c65cfa1db5a7f55f4e3a5820
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.115.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.115.0.ebuild
new file mode 100644
index 000000000000..b3f9beee0ee6
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.115.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+QTMIN=5.15.9
+inherit cmake frameworks.kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/libarchive[bzip2]"
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+ >=dev-qt/qthelp-${QTMIN}:5
+ )
+ test? (
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ >=dev-qt/qtcore-${QTMIN}:5
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+ "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+ "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
+ "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256
+)
+
+python_check_deps() {
+ python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+ -DBUILD_QTHELP_DOCS=$(usex doc)
+ -DBUILD_HTML_DOCS=$(usex doc)
+ -DBUILD_MAN_DOCS=$(usex doc)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # passes, but then breaks src_install
+ ECMToolchainAndroidTest
+ # broken, bug #627806
+ ECMPoQmToolsTest
+ # can not possibly succeed in releases, bug #764953
+ KDEFetchTranslations
+ )
+ # possible race condition with multiple jobs, bug #701854
+ cmake_src_test -j1
+}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
deleted file mode 100644
index 8d8b8249034a..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-QTMIN=5.15.2
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-IUSE="doc test"
-
-RESTRICT+=" !test? ( test )"
-
-RDEPEND="
- app-arch/libarchive[bzip2]
-"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
- ')
- >=dev-qt/qthelp-${QTMIN}:5
- )
- test? (
- >=dev-qt/linguist-tools-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
- "${FILESDIR}/${P}-sphinx-4.patch" # bug 789096, pending upstream MR 121
-)
-
-python_check_deps() {
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
- has_version "dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # Requires PyQt5, bug #680256
- sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
- tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
- -DBUILD_QTHELP_DOCS=$(usex doc)
- -DBUILD_HTML_DOCS=$(usex doc)
- -DBUILD_MAN_DOCS=$(usex doc)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # ECMToolchainAndroidTest passes but then breaks src_install
- # ECMPoQmToolsTest is broken, bug #627806
- # KDEFetchTranslations can not possibly succeed in releases, bug #764953
- # possible race condition with multiple jobs, bug #701854
- local myctestargs=(
- -j1
- -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
- )
-
- cmake_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.84.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.84.0.ebuild
deleted file mode 100644
index 13b356518d93..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.84.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-QTMIN=5.15.2
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
- >=dev-qt/qthelp-${QTMIN}:5
- )
- test? (
- >=dev-qt/linguist-tools-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- )
-"
-RDEPEND="
- app-arch/libarchive[bzip2]
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
-)
-
-python_check_deps() {
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- # Requires PyQt5, bug #680256
- sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
- tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
- -DBUILD_QTHELP_DOCS=$(usex doc)
- -DBUILD_HTML_DOCS=$(usex doc)
- -DBUILD_MAN_DOCS=$(usex doc)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # ECMToolchainAndroidTest passes but then breaks src_install
- # ECMPoQmToolsTest is broken, bug #627806
- # KDEFetchTranslations can not possibly succeed in releases, bug #764953
- # possible race condition with multiple jobs, bug #701854
- local myctestargs=(
- -j1
- -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
- )
-
- cmake_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.1.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.1.0.ebuild
new file mode 100644
index 000000000000..ecb22352a8b3
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+QTMIN=6.6.2
+inherit cmake frameworks.kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/libarchive[bzip2]"
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+ >=dev-qt/qttools-${QTMIN}:6[assistant]
+ )
+ test? (
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
+ >=dev-qt/qtbase-${QTMIN}:6
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+ "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+ "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256
+ "${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch"
+)
+
+python_check_deps() {
+ python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+ -DBUILD_QTHELP_DOCS=$(usex doc)
+ -DBUILD_HTML_DOCS=$(usex doc)
+ -DBUILD_MAN_DOCS=$(usex doc)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # passes, but then breaks src_install
+ ECMToolchainAndroidTest
+ # broken, bug #627806
+ ECMPoQmToolsTest
+ # can not possibly succeed in releases, bug #764953
+ KDEFetchTranslations
+ )
+ # possible race condition with multiple jobs, bug #701854
+ cmake_src_test -j1
+}
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch
new file mode 100644
index 000000000000..17d60448056f
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch
@@ -0,0 +1,27 @@
+From 35d209b5662e468aa2f613ffdb9b91bc2e7f7e26 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 18 Nov 2023 17:58:36 +0100
+Subject: [PATCH] Disable tests requiring PyQt5
+
+Gentoo-bug: https://bugs.gentoo.org/680256
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 1415bb91..09d998e4 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -79,7 +79,7 @@ find_file(SIP_Qt5Core_Mod_FILE
+ PATH_SUFFIXES share/sip/PyQt5/QtCore
+ )
+
+-if(NOT SIP_Qt5Core_Mod_FILE)
++if(TRUE)
+ message(STATUS "WARNING: skipping tests that require PyQt")
+ else()
+ find_package(PythonModuleGeneration)
+--
+2.42.1
+
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch
new file mode 100644
index 000000000000..a684745d3965
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch
@@ -0,0 +1,43 @@
+From 528cdf38261239d8475e2a3e82dd1b5cb73c770b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ modules/ECMFindQmlModule.cmake.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
+index 3da55ced..46e8b0ce 100644
+--- a/modules/ECMFindQmlModule.cmake.in
++++ b/modules/ECMFindQmlModule.cmake.in
+@@ -9,6 +9,13 @@ include(FindPackageHandleStandardArgs)
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
+ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
++
++if(ECM_DISABLE_QMLPLUGINDUMP)
++ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
++ set(@GENMODULE@_FOUND TRUE)
++ set(@GENMODULE@_VERSION @VERSION@)
++else()
+ if (QT_MAJOR_VERSION EQUAL "6")
+ include(${ECM_MODULE_DIR}/ECMQmlModule.cmake)
+ # Get the qmldir file
+@@ -68,6 +75,7 @@ if (NOT CMAKE_CROSSCOMPILING AND NOT MODULE_NOTFOUND AND NOT @GENMODULE@_FOUND)
+ set(@GENMODULE@_FOUND FALSE)
+ endif()
+ endif()
++endif()
+
+ set(@GENMODULE@_FOUND ${@GENMODULE@_FOUND} PARENT_SCOPE)
+ set(@GENMODULE@_VERSION ${@GENMODULE@_VERSION} PARENT_SCOPE)
+--
+2.42.1
+
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch
deleted file mode 100644
index 7ccd024affc4..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 02abfc3695b71e05e3d5df83514f50ec0ab60bdf Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 14 May 2021 20:42:02 +0200
-Subject: [PATCH] Fix doc build with Sphinx 4
-
-Port away from removed functions. In particular, port to the new index structure which was introduced in 1.4 (released november 2016).
-Also account for the new default location of built man pages.
-
-BUG: 436818
----
- docs/CMakeLists.txt | 3 ++-
- docs/sphinx/ext/ecm.py | 13 ++++++++-----
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 84cca9ea..32687b64 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -110,7 +110,8 @@ if(BUILD_MAN_DOCS)
- set(name "${CMAKE_MATCH_1}")
- set(sec "${CMAKE_MATCH_2}")
- install(
-- FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec}
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} ${CMAKE_CURRENT_BINARY_DIR}/man/${sec}/${name}.${sec}
-+ OPTIONAL
- DESTINATION ${MAN_INSTALL_DIR}/man${sec}
- )
- endif()
-diff --git a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py
-index 8667b367..a09e4890 100644
---- a/docs/sphinx/ext/ecm.py
-+++ b/docs/sphinx/ext/ecm.py
-@@ -5,6 +5,7 @@
- #
- # SPDX-License-Identifier: BSD-3-Clause
-
-+import html
- import os
- import re
-
-@@ -19,8 +20,11 @@ CMakeLexer.tokens["args"].append(('(\\$<)(.+?)(>)',
-
- # Monkey patch for sphinx generating invalid content for qcollectiongenerator
- # https://bitbucket.org/birkenfeld/sphinx/issue/1435/qthelp-builder-should-htmlescape-keywords
--from sphinx.util.pycompat import htmlescape
--from sphinx.builders.qthelp import QtHelpBuilder
-+try:
-+ from sphinxcontrib.qthelp import QtHelpBuilder
-+except ImportError:
-+ # sphinx < 4.0
-+ from sphinx.builders.qthelp import QtHelpBuilder
- old_build_keywords = QtHelpBuilder.build_keywords
- def new_build_keywords(self, title, refs, subitems):
- old_items = old_build_keywords(self, title, refs, subitems)
-@@ -29,13 +33,12 @@ def new_build_keywords(self, title, refs, subitems):
- before, rest = item.split("ref=\"", 1)
- ref, after = rest.split("\"")
- if ("<" in ref and ">" in ref):
-- new_items.append(before + "ref=\"" + htmlescape(ref) + "\"" + after)
-+ new_items.append(before + "ref=\"" + html.escape(ref) + "\"" + after)
- else:
- new_items.append(item)
- return new_items
- QtHelpBuilder.build_keywords = new_build_keywords
-
--
- from docutils.parsers.rst import Directive, directives
- from docutils.transforms import Transform
- try:
-@@ -127,7 +130,7 @@ class _ecm_index_entry:
- self.desc = desc
-
- def __call__(self, title, targetid):
-- return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main')
-+ return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main', None)
-
- _ecm_index_objs = {
- 'manual': _ecm_index_entry('manual'),
---
-GitLab
-
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
index 08fcf32338b6..06406a7eaf6d 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
@@ -1,33 +1,39 @@
-From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
+From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 8 Dec 2019 15:01:33 +0100
Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
avoid sandbox violations
-Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744136
BUG: 387753
---
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
+ modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++-------------
+ 1 file changed, 27 insertions(+), 18 deletions(-)
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 8109ab8..1edc01d 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,23 +26,32 @@
- #=============================================================================
-
+diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
+index 0ee5665e..d6e1f14c 100644
+--- a/modules/ECMFindQmlModule.cmake.in
++++ b/modules/ECMFindQmlModule.cmake.in
+@@ -7,27 +7,36 @@
include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
--query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
-
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-if (QT_MAJOR_VERSION EQUAL "5")
+- include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+- ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
+- find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-elseif (QT_MAJOR_VERSION EQUAL "6")
+- find_package(Qt6 COMPONENTS QmlTools REQUIRED)
+- get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
+-endif()
+-
-if(NOT QMLPLUGINDUMP_PROGRAM)
- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-endif()
--
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
+
-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
-
-if(ExitCode EQUAL 0)
@@ -39,16 +45,21 @@ index 8109ab8..1edc01d 100644
else()
- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
- set(@GENMODULE@_FOUND FALSE)
-+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+
-+ query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++ if (QT_MAJOR_VERSION EQUAL "5")
++ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
++ ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
++ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
++ elseif (QT_MAJOR_VERSION EQUAL "6")
++ find_package(Qt6 COMPONENTS QmlTools REQUIRED)
++ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
++ endif()
+
-+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+ if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
+ endif()
+
-+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
++ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
+
+ if(ExitCode EQUAL 0)
+ set(@GENMODULE@_FOUND TRUE)
@@ -61,5 +72,5 @@ index 8109ab8..1edc01d 100644
find_package_handle_standard_args(@GENMODULE@
--
-2.24.0
+2.35.1
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
index 72541d73e72e..84e192919c78 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -1,7 +1,8 @@
-From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001
+From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 11 Jul 2020 23:04:16 +0200
-Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is not available
+Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
+ available
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
@@ -10,26 +11,26 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
2 files changed, 14 insertions(+)
diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
-index 4bc7fb8..12825aa 100644
+index 58c78d05..994ed1e4 100644
--- a/modules/ECMAddTests.cmake
+++ b/modules/ECMAddTests.cmake
-@@ -81,6 +81,10 @@ function(ecm_add_test)
+@@ -84,6 +84,10 @@ function(ecm_add_test)
message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
endif()
-+ if(NOT TARGET Qt5::Test)
++ if(NOT TARGET Qt::Test)
+ return()
+ endif()
+
set(_testname ${ARG_NAME_PREFIX}${_targetname})
set(gui_args)
if(ARG_GUI)
-@@ -122,6 +126,11 @@ function(ecm_add_tests)
+@@ -127,6 +131,11 @@ function(ecm_add_tests)
endif()
set(test_names)
set(target_names)
+
-+ if(NOT TARGET Qt5::Test)
++ if(NOT TARGET Qt::Test)
+ return()
+ endif()
+
@@ -37,12 +38,15 @@ index 4bc7fb8..12825aa 100644
ecm_add_test(${_test_source}
NAME_PREFIX ${ARG_NAME_PREFIX}
diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
-index e77b33f..4e191fe 100644
+index aa7e73a1..f9fb10cb 100644
--- a/tests/ECMAddTests/CMakeLists.txt
+++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+if(NOT TARGET Qt5::Test)
-+ message(STATUS "WARNING: skipping tests that require Qt5::Test")
+@@ -4,6 +4,11 @@ else()
+ set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
+ endif()
+
++if(NOT TARGET Qt::Test)
++ message(STATUS "WARNING: skipping tests that require Qt::Test")
+ return()
+endif()
+
@@ -50,5 +54,5 @@ index e77b33f..4e191fe 100644
string(REPLACE "." "/" dir "${NAME}")
string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
--
-2.27.0
+2.35.1
diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml
index ce744e04eafa..465dd12c5a8d 100644
--- a/kde-frameworks/extra-cmake-modules/metadata.xml
+++ b/kde-frameworks/extra-cmake-modules/metadata.xml
@@ -1,9 +1,18 @@
<?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>
+ <remote-id type="kde-invent">frameworks/extra-cmake-modules</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
<stabilize-allarches/>
</pkgmetadata>
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 58e98e65b739..a96bf08863d4 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1,2 @@
-DIST frameworkintegration-5.82.0.tar.xz 1755828 BLAKE2B 18c056daf8db8e06995d3f0b6985f9aabb05e8a4e7323635faf92701f04dbf135cf63221fe739504d2ccd7718dd02a6718ab7fa7ba84b86cb37394ff878b6e3f SHA512 5865e560789c50829c5648365db58497d0da141d1699f396ca431740e6f919ef68c89e2cb98ac1f320cdb07fae098de683b17c920f79a2b459ffd874935b6e77
-DIST frameworkintegration-5.84.0.tar.xz 1755824 BLAKE2B 97782740521c7d6794a5f3063c4f2bea54f25d665857f7cabe8b67eb67d46ba26f8277d630cf1af71cc07c0342a36c25ae71fa1f7b0752f62aa2607291b6f7c7 SHA512 eb226600a1c17ebb9387eb42b212b6d2397f118ce2c52ba2463e8c8acf62b39f96aafe68573b9474bf4c0a13d6542bcadcb35ff4c8880425d448838630ea179f
+DIST frameworkintegration-5.115.0.tar.xz 1760436 BLAKE2B 59127e732c3b1786e54a079315bf7d47b5025bd653348c67c167afdc2b6291ceb595d85f49c62cc080475fb0963851c07fd95aa2c344b8f0cc76610b701b5be8 SHA512 83cc9d4e1063cd1496dbe373f30f706dcb2ce2515735d7b82cd45cf35b20a8e6c51625b752c6e9a53033db1b0573f2f3159bd569becc707b3a2e7250ce7fd20a
+DIST frameworkintegration-6.1.0.tar.xz 54792 BLAKE2B 7c9d9c0bee425d3d2719949daf7642785bb8fab714c590cc02f0e85638e20ee1c2f166f66271148e6f0f65ba21ed83b441305d3c4c32f6eeb42cd1feb4caabb2 SHA512 2f16528997b54ebb95e2fde1fe94133d672e72ef91bb2e607887b733fef128ea9c3e57b1f3f8cbf0ba74835dab6e145729725746918eaac98b643446a0cb3391
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.115.0.ebuild
index eae353b9bea1..a9ffe580bd72 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.115.0.ebuild
@@ -1,22 +1,21 @@
-# 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_QTHELP="false"
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 integrating Qt applications with KDE Plasma workspaces"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
# requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.84.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.84.0.ebuild
deleted file mode 100644
index 8fbf5abdb53b..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.84.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires running Plasma environment
-RESTRICT+=" test"
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/knewstuff-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild
new file mode 100644
index 000000000000..e34dff31968e
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-6.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/knewstuff-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}
+ =kde-frameworks/kpackage-${PVCUT}*:6
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/frameworkintegration/metadata.xml b/kde-frameworks/frameworkintegration/metadata.xml
index 2fdbf33d963d..f8b37b05993a 100644
--- a/kde-frameworks/frameworkintegration/metadata.xml
+++ b/kde-frameworks/frameworkintegration/metadata.xml
@@ -1,8 +1,17 @@
<?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>
+ <remote-id type="kde-invent">frameworks/frameworkintegration</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
deleted file mode 100644
index bf0cc5f8b2f3..000000000000
--- a/kde-frameworks/kactivities-stats/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kactivities-stats-5.82.0.tar.xz 81740 BLAKE2B e9cccc36e88a743f7a9b47c8b03ca5be980075346820be8108ca8f0f612e2468d379729be063318a1c3edf15afd3bf56b691b65ad1492e6ba07f64cfc703a02e SHA512 0dd6bed082318a40afc94f0f525cb9c8cd6f9066a4bc38389d23f3dfcc8ed46929e4150660b3c2eaa37241fdbedd10e6b4d472e8d649664dc9acf68b002f206d
-DIST kactivities-stats-5.84.0.tar.xz 81692 BLAKE2B 3e1262678bd53416447496b13e2f8e00c89bd4f6318ec2e1cd1ca1e1f7baab4a5f24a6111ab2ea64d963b89acaad6ff365a0193742dba84fe22396b0b8d9abb6 SHA512 eb0c0fee91f178b656b791abcaed58fa00233590162f3e22e702d98be90091788475a788ad3ff1d4e6274e1f69f958c8f5a37f1d37c51f8b20d8157f8463f35c
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
deleted file mode 100644
index ae6fce28519e..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.84.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.84.0.ebuild
deleted file mode 100644
index 0888d85d34a2..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.84.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
deleted file mode 100644
index 5de3029e2ae8..000000000000
--- a/kde-frameworks/kactivities/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kactivities-5.82.0.tar.xz 71356 BLAKE2B c83b384f4aed32554dfd96951a9efc22cd8cd6c644a674b8d492e571ebf261201be78ac2834722f12fb43822ff17741054e7153c279a8ea7bdf6318cecef20bd SHA512 f1da5447405e53a4c7d11c0ff14ee80c725f07df929ba6b4380239675e2efef21bb2e6e0d028146ad621440b01f76314549779a3f7a79e639537fa7bb8e96729
-DIST kactivities-5.84.0.tar.xz 71336 BLAKE2B c7fb74d6c274643c4e7e4d9f7e306c36baccabf72637f132b15457bcfcf2e218f72fcf14ba00ded7bb12323e71ffee9d9936751e4831675f19f834acca1ceec9 SHA512 b43680cccd6cb4c6d627bfd2b9cca12b1b33e743bc78c68c8251f7f6ab27d61992a378d741083dda4bff1bddbe8144b4895346162546d53a70d0b8a3fc5b7d1e
diff --git a/kde-frameworks/kactivities/kactivities-5.82.0.ebuild b/kde-frameworks/kactivities/kactivities-5.82.0.ebuild
deleted file mode 100644
index 6456476b3466..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.82.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/kactivities-5.84.0.ebuild b/kde-frameworks/kactivities/kactivities-5.84.0.ebuild
deleted file mode 100644
index 8c56185f55b6..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.84.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kactivities/metadata.xml b/kde-frameworks/kactivities/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-frameworks/kactivities/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 3c235d3ec415..6b08ff50ba7f 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1 @@
-DIST kapidox-5.82.0.tar.xz 194608 BLAKE2B 3f45c5d23a3b939ba2d7249358344ce8db7458bad7017aa40ad97ce2bbf626bcbc9a3adda18b87f8f5f37e5378bb98762accb779523932e9e388aa6b8eea1f64 SHA512 4f69a497878a6a6f0271e7d073a0be80d7c43be2c90bc14accc6d861d0e569131ea9543f81949f2b54765aa2ff6c6bc0e3f6339a4dcc1f875a01adac54e547f9
-DIST kapidox-5.84.0.tar.xz 194776 BLAKE2B e1f804989035cf96227953a46f70c21a56ce3fa5d6449940e47b2d076836c12c9b833ae99c25b62c5e8bc31c325d69cf9872fa4a1ccd94325e309c0afdbe0670 SHA512 d292514fc11202c721134420b2d8dcc44e6e2f892245fa7e8ada8fe3fde4d1a1614f64c553d76beeaeb10b6e008d30c68b627accfd59342770a2cf0c6b32e22b
+DIST kapidox-5.115.0.tar.xz 198860 BLAKE2B d310501d9ae678426373f4e42c5c4e0b1918ae00787a9cef2fab2f48b0238fed2ec1bf53d7fdbe39ae5ddc24f271e1a3aa02eb87a67b653af091e01b112f1904 SHA512 6e2911a619e9520b679987deb4a3460d5ef57887185dbb7a72b91196441a8f8d0d3e0ddef5d41bdc74c4c05823c4cc23f620faeb973ae7ff83bed06b17d43710
diff --git a/kde-frameworks/kapidox/kapidox-5.82.0.ebuild b/kde-frameworks/kapidox/kapidox-5.115.0.ebuild
index 2ccf963f84e2..799700285a19 100644
--- a/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.115.0.ebuild
@@ -1,20 +1,21 @@
-# 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
-DISTUTILS_SINGLE_IMPL="true"
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit kde.org distutils-r1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit frameworks.kde.org distutils-r1
DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+
LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
RDEPEND="
- app-doc/doxygen
+ app-text/doxygen
$(python_gen_cond_dep '
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/kde-frameworks/kapidox/kapidox-5.84.0.ebuild b/kde-frameworks/kapidox/kapidox-5.84.0.ebuild
deleted file mode 100644
index 727d5203cf84..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.84.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL="true"
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- app-doc/doxygen
- $(python_gen_cond_dep '
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
- media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/kde-frameworks/kapidox/metadata.xml b/kde-frameworks/kapidox/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kapidox/metadata.xml
+++ b/kde-frameworks/kapidox/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index ba3b9228dc10..ebfe8960a105 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1,2 @@
-DIST karchive-5.82.0.tar.xz 984872 BLAKE2B 1a8e6b758479a4ff5f1be774b6deede551d9a306bf8a3fef845ff6a1532fc84d36aa9697f6de7455746410f233c70072ec49d729e20eae2baab529cc1d3ea9af SHA512 7b735b3f1c325bf8dc9044fc9644fdaa3442baeae16831ea79cf84f7da0d5cb7757e2201d8cb73f18a831c49f079b87c75c8387a53c236386e4da47437884183
-DIST karchive-5.84.0.tar.xz 984864 BLAKE2B cfde6007f1e3590ee54bf1c92b7bfc92a931005d8eda819e9ded4f7df361f2084eb0b4e24dd1e75c1065aa1107bc0ce147158d35b5c8d32bd02a4858971426bb SHA512 2aad7a9920942b2a458aa5ab85c13f0671c924e99a04803eba056c339d426ed6dad1706d83c7bb8169bab69fc79d1a3ff064b6c6dfcc029d2d6b842dbd58ea86
+DIST karchive-5.115.0.tar.xz 1025336 BLAKE2B 5a3a2d0fef2aefbe7121b313d11f28859a95aeb3296eb7dbb254b7159d3420849985a20cf0560443e8cf4e6b5bc5883e0b0f2f77f970d0962bb4e8c7b9829bc3 SHA512 f17baaaa850368ae517d0750a5100020448a21276c1ed5f304628b34b6e2634a9c151985f28306e0217ac17a4e91afa82562afe5cd5ec4558d16074e161e6e5a
+DIST karchive-6.1.0.tar.xz 1031284 BLAKE2B 3d3c9503d1c732bf2d9e4b424f3e847a65bc33a36c5894e8e91f85abb154cca0b0df90d0490811ab31e570401a27b7667c3de55fd5521635be990c4f912a2725 SHA512 14af2a3335de1ef320f838a8dc4176cfea9fc861576ea6ba3e8d072d422432b08d5e01fa2c681b26e11798da4970749516785d7dbaf5f4137c2b2bcb45f62f12
diff --git a/kde-frameworks/karchive/karchive-5.82.0.ebuild b/kde-frameworks/karchive/karchive-5.115.0.ebuild
index 353068a75fbf..3536cd132ca7 100644
--- a/kde-frameworks/karchive/karchive-5.82.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.115.0.ebuild
@@ -1,13 +1,15 @@
-# 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
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+
LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="+zstd"
DEPEND="
@@ -17,7 +19,10 @@ DEPEND="
zstd? ( app-arch/zstd:= )
"
RDEPEND="${DEPEND}"
-BDEPEND="zstd? ( virtual/pkgconfig )"
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ zstd? ( virtual/pkgconfig )
+"
src_prepare() {
ecm_src_prepare
diff --git a/kde-frameworks/karchive/karchive-5.84.0.ebuild b/kde-frameworks/karchive/karchive-6.1.0.ebuild
index 77a707c97948..f708b8a282d1 100644
--- a/kde-frameworks/karchive/karchive-5.84.0.ebuild
+++ b/kde-frameworks/karchive/karchive-6.1.0.ebuild
@@ -1,13 +1,15 @@
-# 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
-inherit ecm kde.org
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+
LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
IUSE="+zstd"
DEPEND="
@@ -17,7 +19,10 @@ DEPEND="
zstd? ( app-arch/zstd:= )
"
RDEPEND="${DEPEND}"
-BDEPEND="zstd? ( virtual/pkgconfig )"
+BDEPEND="
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
+ zstd? ( virtual/pkgconfig )
+"
src_prepare() {
ecm_src_prepare
diff --git a/kde-frameworks/karchive/metadata.xml b/kde-frameworks/karchive/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/karchive/metadata.xml
+++ b/kde-frameworks/karchive/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 26f937bf64c8..563b91d0e864 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1,2 @@
-DIST kauth-5.82.0.tar.xz 88396 BLAKE2B 1c99917b26f9738b876385276251b7bb616a35bdc82bf581aabba693a0846b8fd615e960dc95829e6a19b158299117988aef10ba965ca16135cbd51c2f4891a5 SHA512 ff69853dbdfee9b22431ee495c07875430015ee706357acdcdfc93b3deca7a373eecf40d30977de97253f044a4dad7548b2ad55c84583b92587a77be285e3ed8
-DIST kauth-5.84.0.tar.xz 88588 BLAKE2B 398316b036e51c9dc30f786fd309383ac87af2dd16599d4a3162ab3e5ca92a20be484f8f2b104c0638740e8868257f53d4a1837020024b849953d4be3e26d1dd SHA512 1b7d23e0afbcb2bbf918afaa2461cf0c49ae5f14cfb5243e025a4be5ea9ca4e8c10894267986ffcb3c732819d310d47c5ecd5bd1a0755bf074ad72b680d836bf
+DIST kauth-5.115.0.tar.xz 2307844 BLAKE2B a4d8ec60f0cc4728ea42b876c1f3b7a233280b99d8ff5608297e80920e6c1a287839c4a88916d0e19121a49d2d47c9c2c049c93b490b4cfed31b4d67ab79a300 SHA512 ace9bcefdba0425dc4e2fc4dfe90bd8faad91b1e5b6ed16ec5b7870f3f22e4384d4b1776c97da501eefb5dc7ed31412593c59a5567cb394e11838d8cfe118fde
+DIST kauth-6.1.0.tar.xz 2303944 BLAKE2B ca25a6ac2b0abcef4029a181ce8f67415c2ce4e815e8833a7285a5ae271bc4f381d410deedccde698cde9941dac82225957c7e17567ba6bc860f40007dc0eb96 SHA512 c9c13280cada75ec2f8b2e6add95ab2afe8086b16b3a8d464722202ea97c86e107395abfaac690fa77934fdf2e98eab9c60c31d000ecb7f1c62636af9abe0e6d
diff --git a/kde-frameworks/kauth/kauth-5.82.0.ebuild b/kde-frameworks/kauth/kauth-5.115.0.ebuild
index 1d351fb7f603..30cab0cc4dd4 100644
--- a/kde-frameworks/kauth/kauth-5.82.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.115.0.ebuild
@@ -1,45 +1,38 @@
-# 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
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 to let applications perform actions as a privileged user"
+
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls +policykit"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="+policykit"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
- policykit? ( >=sys-auth/polkit-qt-0.113.0 )
+ policykit? ( >=sys-auth/polkit-qt-0.113.0[qt5(+)] )
"
RDEPEND="${DEPEND}"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent:* )"
+
+CMAKE_SKIP_TESTS=(
+ # KAuthHelperTest test fails, bug 654842
+ KAuthHelperTest
+)
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package policykit PolkitQt5-1)
)
ecm_src_configure
}
-
-src_test() {
- # KAuthHelperTest test fails, bug 654842
- local myctestargs=(
- -E "(KAuthHelperTest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/kauth/kauth-5.84.0.ebuild b/kde-frameworks/kauth/kauth-5.84.0.ebuild
deleted file mode 100644
index b87b08b797b7..000000000000
--- a/kde-frameworks/kauth/kauth-5.84.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls +policykit"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- policykit? ( >=sys-auth/polkit-qt-0.113.0 )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package policykit PolkitQt5-1)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # KAuthHelperTest test fails, bug 654842
- local myctestargs=(
- -E "(KAuthHelperTest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/kauth/kauth-6.1.0.ebuild b/kde-frameworks/kauth/kauth-6.1.0.ebuild
new file mode 100644
index 000000000000..ae4082ded7af
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-6.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="+policykit"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ policykit? ( >=sys-auth/polkit-qt-0.113.0[qt6(-)] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent:* )"
+
+CMAKE_SKIP_TESTS=(
+ # KAuthHelperTest test fails, bug 654842
+ KAuthHelperTest
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package policykit PolkitQt6-1)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kauth/metadata.xml b/kde-frameworks/kauth/metadata.xml
index 2fdbf33d963d..48cd37476321 100644
--- a/kde-frameworks/kauth/metadata.xml
+++ b/kde-frameworks/kauth/metadata.xml
@@ -1,8 +1,17 @@
<?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>
+ <remote-id type="cpe">cpe:/a:kde:kauth</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 2cfec8216161..a55bcf92305f 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1,2 @@
-DIST kbookmarks-5.82.0.tar.xz 126800 BLAKE2B df1aa0b34b1fcc21a481995001ab563ebafdca67d307d1f610033aa364899bfb9dbf5a9aad4d4eea4bc5a8a4e93c5afcc45dc1efb78dbd79d7cd4125ec8749af SHA512 aa1ad09e63eee22eb5aeb094b9d2986f6a700038c790023878d7a6a6fd6e9e2f0af0092f576d1e1e6b2413219c3461f1bbe3347afb19e3be8e9a081443aa5872
-DIST kbookmarks-5.84.0.tar.xz 126780 BLAKE2B 0f520f82596a0f2c002be218c2fa222c7cc5c75256b05d6a41403af2e1628ba30a0b9603d6394097f2cf83ab92552d6fe43442f1d7d215159d083bac687233ce SHA512 33896dc0de0c976975e5982ec605d007fdcf2c813c7f4044ff403ad85b154eab00c3afb964b3e6908a4d8475208b8d604cfca598a54e2666802ecdafcc2e67fd
+DIST kbookmarks-5.115.0.tar.xz 1125188 BLAKE2B eee16cddeba27aa03a0b226055032b107883e8eee724f1e021a6869d803b8c5d85e8c9532e1a07a324b62830011879e512066e863111215d626df1b1c30106fd SHA512 5a8354bdd425e6891d133d9b77e85c31567356aeedeb996fbb187d64acb8835d560629b8874ce805312fbbd8f0f8737ede35a9c8cecfc6ac0ee218005f0367d2
+DIST kbookmarks-6.1.0.tar.xz 1110592 BLAKE2B 4fd40b64360dcd92024e054dbd510880ebbcbb10ceb0fdd960766257a4227cb4119d11be5db7acbfd860793ace54ab21c148deffd916548f9cba65d6a92d732e SHA512 4d70b78149e515a4e03f7ef4e1349d1fba5792527bad0a1521e436689e4b059c194a4846a79fe135b44e4d707e30ad10b28cd6f52a52c5e19c09ebe654d5393a
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.115.0.ebuild
index ad414332afcf..8b785c11e8cf 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.115.0.ebuild
@@ -1,22 +1,18 @@
-# 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
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 managing bookmarks stored in XBEL format"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE=""
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -32,3 +28,4 @@ RDEPEND="
DEPEND="${RDEPEND}
>=kde-frameworks/kconfigwidgets-${PVCUT}:5
"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.84.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.84.0.ebuild
deleted file mode 100644
index 8d622a20ed1f..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.84.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kconfigwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild
new file mode 100644
index 000000000000..5f2868f98599
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-6.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kbookmarks/metadata.xml b/kde-frameworks/kbookmarks/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kbookmarks/metadata.xml
+++ b/kde-frameworks/kbookmarks/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 8db6d83f8a2d..33c26c1cd2c4 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,2 +1,2 @@
-DIST kcalendarcore-5.82.0.tar.xz 254996 BLAKE2B 255728d2ce6036bbb35a2acb077a1cca23420d3d60584179a27ea2d801b9191d7696b4322fb41023420993a69dac5649f43fb4a52c708f9b48aa732719297c5a SHA512 26d76b20faebe36b9e5a9e234364fb5e8cda1c3c519ce5e3fbd0d9e36657348010dfc7ef4865fcc3326978aa88847f5d5304d3dcccbfd0d728c568b2e149214b
-DIST kcalendarcore-5.84.0.tar.xz 256408 BLAKE2B ebd48ae7a396a4528013534441516c38fb5bd4b2e6007f9eb109711ba3262c2333e7ce384b596fea380020db2c764bce9ba3fa565e11ed901e425e01c7511170 SHA512 9e01ae59b1fe8dbeccb718aec99a62de17dffb25bdb991b2a77697af4741901f2a5028fd83a7c7119f48d2c3f37a68a9ab346622f34b230b0799de4b39174065
+DIST kcalendarcore-5.115.0.tar.xz 268372 BLAKE2B f1be69ae1a9f09b1d67eda3922ceb0c6e8584e27ce62a3f8879aa8ddc5738bdd6bd1f7c0531c2887d467f5cedb87a74ebfef994262f295c007e6ecec5389ffb7 SHA512 20a47d83a8eedc62e307f8ff49e42d9c74cb4867c15b8ad52a1a20442c839d1a1484abb8c76e17cc0c189578a71f4f40e3cff5e591118904cf3c738b18a03e24
+DIST kcalendarcore-6.1.0.tar.xz 261344 BLAKE2B cb3dd6f22e093d4b407569038f8337aa0f678a25500e10a1136f207bda22d3061fd23f7fdc92e2ec49a05c4ecf4c13c0c8f46644a37c070c7607f2db3b6052ed SHA512 f7390829497719d7a3be9fadb24807bbc510856bf5aefcf50bd44e90031b9889e5aeb275bc7787f0889a0404ebf3c00819116c1403b54188f739050011a35e85
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.115.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.115.0.ebuild
new file mode 100644
index 000000000000..b823fd3f8483
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.115.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+RESTRICT="test" # multiple tests fail or hang indefinitely
+
+DEPEND="
+ >=dev-libs/libical-3.0.5:=
+ >=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-alternatives/yacc"
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
deleted file mode 100644
index f446b084d89b..000000000000
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for interfacing with calendars"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
-
-BDEPEND="
- sys-devel/bison
-"
-DEPEND="
- >=dev-libs/libical-3.0.5:=
- >=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kcalcore:5
-"
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.84.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.84.0.ebuild
deleted file mode 100644
index ab621edd1b5b..000000000000
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.84.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for interfacing with calendars"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
-
-BDEPEND="
- sys-devel/bison
-"
-DEPEND="
- >=dev-libs/libical-3.0.5:=
- >=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kcalcore:5
-"
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-6.1.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-6.1.0.ebuild
new file mode 100644
index 000000000000..9805f5615ca7
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-6.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test" # multiple tests fail or hang indefinitely
+
+DEPEND="
+ >=dev-libs/libical-3.0.5:=
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-alternatives/yacc"
diff --git a/kde-frameworks/kcalendarcore/metadata.xml b/kde-frameworks/kcalendarcore/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kcalendarcore/metadata.xml
+++ b/kde-frameworks/kcalendarcore/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index dc261c425132..41f35e2651fe 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1,2 @@
-DIST kcmutils-5.82.0.tar.xz 160816 BLAKE2B fd75c8e42c7df2c05048ece51e19d4a27358871c56b6df3c086b4ea2fd83e3be758a9e370bd9b4956da18ffe9025044bea91da3a1a3fc4a9e65894d976a3585f SHA512 709294fbbbaabf31384753651a320069e6779d101dbbec94ba09ae95146344989e854cab5fdd39510c300e026f113a156fe43d3b2fa57191851c95709a1997e4
-DIST kcmutils-5.84.0.tar.xz 162792 BLAKE2B 2236bb2194827533cfb26c520010fefefda9917758e4fae54a575027051df4bf3eb4f736b6d3c6fa26961ac846e181283d5f3faa009c982df7eaf7bafa82b4d4 SHA512 176533ba2b3039c736478ddcb2d921396ebcf0b9c5e50b70878b111de1419b64ab7ee02227052e3e5c1f71f65f41db5caacf0c12e6055e9661318820d91d3eb3
+DIST kcmutils-5.115.0.tar.xz 2483684 BLAKE2B 2fd6f1abd993abf34f6c03b11729e1504a972c70bbeb78648b413b0ad8da117dd5962be8e95072abb5ba80ffdd0bf4b610983c472c365af47d91e5af648b268f SHA512 69e91cf73587365d2861d54e90860adbe8de254473fd86da04a34aabed0623d5ee4500eebc691bcb68d3f271eafab67b32389745992c25d0b9f2b1383ee4511c
+DIST kcmutils-6.1.0.tar.xz 2472384 BLAKE2B ad5ea4080e52fcb663fd2206e26e6f7a57b197cafd9c04aa303606606ac57f4a9ccc644dfc77d1f29066467417bad31e146a1cd8aa6ce64e79286193df7a3518 SHA512 676724395781a44a57d224b55a36b9afa450ce502b0a6bd24127d5e638dbfcfc3165ebe7ccf10bf40460fde80d189058cd9f5fa17527b07d573ef97984ccf7a6
diff --git a/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.115.0.ebuild
index 4cca4dbf2ade..59b6cfe16a0e 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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 to work with KDE System Settings modules"
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-frameworks/kcmutils/kcmutils-5.84.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.84.0.ebuild
deleted file mode 100644
index 20ca3e07e7f9..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.84.0.ebuild
+++ /dev/null
@@ -1,34 +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 to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kauth-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild b/kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild
new file mode 100644
index 000000000000..3fedf3df984f
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-6.1.0.ebuild
@@ -0,0 +1,30 @@
+# 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 to work with KDE System Settings modules"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcmutils/metadata.xml b/kde-frameworks/kcmutils/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kcmutils/metadata.xml
+++ b/kde-frameworks/kcmutils/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 3a6306f3c0d0..6c018d734148 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1,2 @@
-DIST kcodecs-5.82.0.tar.xz 230560 BLAKE2B 53494862c07e1df594c0c2f2e7ec295c763635c6e1203111d797195a0cd0a7d4f76d152945971051a136971c3b072744cc08b913e40534fd64d568e6748c95f9 SHA512 fd331cd1ead5dba016f1c94429bc4fbfc5268563341e93d418e856340c63fc7b7e72fb6aeac6ade0de209235c52e8d16118351825000e9d8b47491a55124ecfc
-DIST kcodecs-5.84.0.tar.xz 231844 BLAKE2B 9e98bbbdc7c3fc486f8f1399affc7c50bcc192806cfdfccdf6247d9710e56bcfb626e3e0c68ef8b5ab8e4007b083440ea0b24ca499b6b3623414ae2e8622562c SHA512 96b56a9388998cdffed4133a920325dd469cdd6fa14e86517886f0818f60e2a5933ab16a7bf039dc299c43a58acc3d1b7c3ef89e5d66027991a3e2262fc14ef8
+DIST kcodecs-5.115.0.tar.xz 2507248 BLAKE2B d0788d92fe882aa8a5d9b44c3f963f2cd551a69f9bb51f390ef8c2226987880489c6fcfcb9f66f19e61b91809075a4572a002ed621f4b187f5e5c288482671c5 SHA512 e2fb8a82c38e1038cd6bb230b658c45af8e4fd42dca29ee0f775f7c44154895ba4e983f26a98ab30ab394f246f6c7960642178b2a8b0d50d701b66945e798041
+DIST kcodecs-6.1.0.tar.xz 2503120 BLAKE2B 611d5ee69b3459c0105765690b62a1077fbedfbc683a3901e26b8587c72b4f58e5aa2fc7b4aba3c7dedbfcf09f1646d7e00589dd82edd6d9537dc06d38de3df5 SHA512 a2eb61b15849270df76ea78bbf289ca32792b6fc9b6710cd146a09eff36e7d4ff4dc1540a2baef59f29c1949cd5a5887064d9d070754c4987a6aa3ed0d4d5451
diff --git a/kde-frameworks/kcodecs/kcodecs-5.115.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.115.0.ebuild
new file mode 100644
index 000000000000..5abde2678ee2
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.115.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE=""
+
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ dev-util/gperf
+"
diff --git a/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
deleted file mode 100644
index e782ea72b2de..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
- dev-util/gperf
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kcodecs/kcodecs-5.84.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.84.0.ebuild
deleted file mode 100644
index 151dde78056a..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.84.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- dev-util/gperf
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kcodecs/kcodecs-6.1.0.ebuild b/kde-frameworks/kcodecs/kcodecs-6.1.0.ebuild
new file mode 100644
index 000000000000..55c07e671523
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-6.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
+ dev-util/gperf
+"
diff --git a/kde-frameworks/kcodecs/metadata.xml b/kde-frameworks/kcodecs/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kcodecs/metadata.xml
+++ b/kde-frameworks/kcodecs/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcolorscheme/Manifest b/kde-frameworks/kcolorscheme/Manifest
new file mode 100644
index 000000000000..4127c7945d85
--- /dev/null
+++ b/kde-frameworks/kcolorscheme/Manifest
@@ -0,0 +1 @@
+DIST kcolorscheme-6.1.0.tar.xz 44212 BLAKE2B 957090716f262be3eedfa0cd45133a1a9470cc8e1be07de50b838875679f06c62056e20338456eea9c2a85fcfad2ba472ba9bf546faa8a0429935365ceb3a326 SHA512 0a23e54f0575fe6bd353b8559869683e273288413bcc0549915ae29572390780f7c2b1eacb39df08d80601669b380a07f126b5be909b1d8a6f8fe20e391a31f8
diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild
new file mode 100644
index 000000000000..922838ee94f4
--- /dev/null
+++ b/kde-frameworks/kcolorscheme/kcolorscheme-6.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcolorscheme/metadata.xml b/kde-frameworks/kcolorscheme/metadata.xml
new file mode 100644
index 000000000000..506ecf605bc4
--- /dev/null
+++ b/kde-frameworks/kcolorscheme/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+</pkgmetadata>
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 0daad186b9c2..a4ca22bcfe57 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1,2 @@
-DIST kcompletion-5.82.0.tar.xz 122088 BLAKE2B ce534393489d6ab980d3c093ef39b3d2341734e147231e6f22c5316091bafd40ef343432128926ec18e25ec8d3843018fa582bd2dc7475bb3c260e42452cc949 SHA512 19b76a46d09005ed5ab5b66ca48403f4bb0baade2b2f937ad6afdf5ef92adf7c94330502adc3aae29bb88fc5848469580319cbf4bba4bfa128537f4541fd9d24
-DIST kcompletion-5.84.0.tar.xz 122020 BLAKE2B 9ca799bc7808c0bf56f80d9c243e6d7ac10026c17eceb5a675c21284f06c1ce6a8ccdd8bee3fddf818606ae37c41c08142bc182fbe2c741aff67a5c8d7079849 SHA512 fd30f997079d17719534969addaa96d99b21774fc1310adfb8a07720b3ddeec179a98a8bf3162d813fff46dcf429e712d6122eaca0e0afe00befe0e32da22ed0
+DIST kcompletion-5.115.0.tar.xz 2337732 BLAKE2B 30c3d99b5c81c72aefd4e4872ac94b85c77ea1e2c1612d6450939c5754befafd9311b01914d01d844a1df1e246227d3bae7faf4a2e426ba20a462ed1ba35ede8 SHA512 0d54721fcb35740df8cafa3969b9e4a74d16cd624aa19b3e60ac67e633d10c7efa95f6692b9111aeea9f2708a642fea0ca6587d802b7a99845e880414c169bb6
+DIST kcompletion-6.1.0.tar.xz 2332432 BLAKE2B 285451527b6feb49f5786bb454bd8029b105aca9362a172be5286650c8cb2502e46d9ec5aa20ca6d0985c8670fd86ded4df9673d0c8e9521da35b98b05733678 SHA512 a9732b69a85cad3b300219b08020a1701b6cfb44a841e8474204bf4b30b5f254ccffa5fa14646641e675b9f2a60fb2b8d0533130b83b8db932ef5e3f3bff92c0
diff --git a/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.115.0.ebuild
index eb367056a0e8..47f95c7634cb 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.115.0.ebuild
@@ -1,22 +1,19 @@
-# 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_DESIGNERPLUGIN="true"
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 common completion tasks such as filename or URL completion"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE=""
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -24,10 +21,4 @@ DEPEND="
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
diff --git a/kde-frameworks/kcompletion/kcompletion-5.84.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.84.0.ebuild
deleted file mode 100644
index a0fa08fde404..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.84.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild b/kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild
new file mode 100644
index 000000000000..540f12bb312b
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-6.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kcompletion/metadata.xml b/kde-frameworks/kcompletion/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kcompletion/metadata.xml
+++ b/kde-frameworks/kcompletion/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index e4873ee949ac..e8916f14200c 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1,2 @@
-DIST kconfig-5.82.0.tar.xz 268416 BLAKE2B c59d435f2e562f218b0b6080c862758c6c271aad4ae76ad000e722b7f2edd0b40cdc4e9f64d5128c6f7f2c0028fcb5d4ae35c696b511a7593651a34c4b1528a6 SHA512 8989bcd1dabc2ad795aa464a7bf7ff2e4e2a4c56a5e7828906e00852eb5fc2946e89a4fa7df691f8c5e1940d0b171c02729bdab5ce9f7d6ecc0d3d1880e2ee4a
-DIST kconfig-5.84.0.tar.xz 269556 BLAKE2B 749a3dc2279df10e5e09e98d6120f6586a2c1e9de461ecf828e9b1f4399977ed972af49911b0919a6629dfb3a0917396d48ee8e90a87c9123b68452d1a703483 SHA512 2a51e5e08a863432b42807b4f0b82991328aba4bf880e570bfe5a4270aed6c017ea0a9a0277130fd07b634a2978dcdcc7a2f3958de1def4d7e02a23aa44d1fdb
+DIST kconfig-5.115.0.tar.xz 295620 BLAKE2B 5daf3dc5c5e8696260dbbd3688e02010bf70f3cb5470ae08b9d712a6248901c4500e467321c639dbc437dfa1d2fe37e06baf087c6be27c24e74b10c99fe999a8 SHA512 e06df4c057ba4e03dd88e444c20e3f9481a8bea53fedb049796b9efb59ddd81569368608c98ca3434ad0249b7a7dd6774d5150966117da2c37e988e43395bbbf
+DIST kconfig-6.1.0.tar.xz 293324 BLAKE2B 3812eddf5fe7b940bcd3ce4307aba899df03c5ce1ec18f316178df47d680faf6618d2494aeb58aa8803516e26895044eaa5954bdcd13cffca6a09c5df3cb1cc9 SHA512 e7eafb0d66e93a4aa20dfc3a006cafdea2cbd5815eb8fe83fa7ebf3e9fb891621bc4b1063bd2904b1443889706ca9505cf2bf40ae0d87e1b95e5ca4dbdad15c5
diff --git a/kde-frameworks/kconfig/kconfig-5.82.0.ebuild b/kde-frameworks/kconfig/kconfig-5.115.0.ebuild
index f2ff3c6bfaf2..6ae5945ed05a 100644
--- a/kde-frameworks/kconfig/kconfig-5.82.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.115.0.ebuild
@@ -1,38 +1,37 @@
-# 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
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for reading and writing configuration"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="dbus nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="dbus qml"
# bug 560086
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
"
DEPEND="${RDEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DKCONFIG_USE_DBUS=$(usex dbus)
+ -DKCONFIG_USE_QML=$(usex qml)
)
ecm_src_configure
}
diff --git a/kde-frameworks/kconfig/kconfig-5.84.0.ebuild b/kde-frameworks/kconfig/kconfig-5.84.0.ebuild
deleted file mode 100644
index c03101c447be..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.84.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dbus nls"
-
-# bug 560086
-RESTRICT+=" test"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- -DKCONFIG_USE_DBUS=$(usex dbus)
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kconfig/kconfig-6.1.0.ebuild b/kde-frameworks/kconfig/kconfig-6.1.0.ebuild
new file mode 100644
index 000000000000..56d42d7cf0e5
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-6.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for reading and writing configuration"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="dbus qml"
+
+# bug 560086
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,xml]
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKCONFIG_USE_DBUS=$(usex dbus)
+ -DKCONFIG_USE_QML=$(usex qml)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kconfig/metadata.xml b/kde-frameworks/kconfig/metadata.xml
index 2fdbf33d963d..d99f466aae3e 100644
--- a/kde-frameworks/kconfig/metadata.xml
+++ b/kde-frameworks/kconfig/metadata.xml
@@ -1,8 +1,20 @@
<?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>
+ <remote-id type="cpe">cpe:/a:kde:kconfig</remote-id>
+ </upstream>
+ <use>
+ <flag name="qml">Enable QML/QtQuick support via <pkg>dev-qt/qtdeclarative</pkg></flag>
+ </use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 1c564ea76a7e..24723cd7ea49 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST kconfigwidgets-5.82.0.tar.xz 401320 BLAKE2B c117777cef4ff0627577b6b7b3fe4b18b8a0ded1b233888953f56beca6c7bf2675382e1d5f6e05e64a4eabb793dbe2e0b3f1b56296606da76a0d54e15cf2e530 SHA512 309b6e2591ae88a454bd6dee4cff5e1eca3dbb36ca4b7b02081602fbd6b4bfe06a99d2afa6eb931fa927759f2c32e315b3c548746207673751e9753de651a6cf
-DIST kconfigwidgets-5.84.0.tar.xz 408888 BLAKE2B 5e727412027f56dee98a6d195bf239cf4da9c36951f32eb07dc3554bfa28e7d9a3441f72a5e0e33e4b1bcb11dab48358be41bb680f1698f2cf3edb81faaa79b2 SHA512 e7b5b3ba4ffd50c81b1227340811e6cc9c12e488e7f045d7caba56fc8052d6f3b24211709ae2b9a11ddf5215d3542d058d58dae0f2f6eb110e4206067653072f
+DIST kconfigwidgets-5.115.0.tar.xz 2614352 BLAKE2B f77f0d0add151e651479fdc8e454a448af6ed5c0c81fd6e9932cf47f3a59c235a4e1f9075a12779227fcffd406c75b3ca95d338255b489e1ab5934504c8a5e68 SHA512 2491e0dead8fc5b2ea5bb64587405383f5d8f5eec2dc289cd9d404e797f8d9fda7cbe3d56846c6253f035db54f1f262f29e7dcfb68266f3734303d393e94209e
+DIST kconfigwidgets-6.1.0.tar.xz 2565676 BLAKE2B 27a1b19ba2bef500f035bacb755b62b24ac74736051002b29d6274ba659228a0507d5cd3a341c808d8e516899ff728cb1560a29facca6bec5ae6ad30b117fb21 SHA512 546c4399537d6b65a58c4fe302bd7d3186161b10fe38b008b42b344c57455941e0d007d7a51fa4cec93fc9e404e2bfce39121b6810d6c45e8ac2c83751c1661a
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.115.0.ebuild
index 289879e3b037..572423485d96 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.115.0.ebuild
@@ -1,23 +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_DESIGNERPLUGIN="true"
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 providing an assortment of configuration-related widgets"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="+man"
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -29,11 +26,18 @@ DEPEND="
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( =kde-frameworks/kconfig-${PVCUT}*:5[dbus] )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+CMAKE_SKIP_TESTS=(
+ # bugs: 864250
+ kstandardactiontest
+)
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package man KF5DocTools)
)
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.84.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.84.0.ebuild
deleted file mode 100644
index 704b573a1c8d..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.84.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kauth-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package man KF5DocTools)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild
new file mode 100644
index 000000000000..ff1ddada473a
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+CMAKE_SKIP_TESTS=(
+ # bugs: 864250
+ kstandardactiontest
+)
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}
+ test? ( =kde-frameworks/kconfig-${PVCUT}*:6[dbus] )
+"
diff --git a/kde-frameworks/kconfigwidgets/metadata.xml b/kde-frameworks/kconfigwidgets/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kconfigwidgets/metadata.xml
+++ b/kde-frameworks/kconfigwidgets/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index b13d4b73cd03..293c814740ba 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,2 +1,2 @@
-DIST kcontacts-5.82.0.tar.xz 543960 BLAKE2B 48deb0a593825fafbd850f0345ff052d4809970706b18355388c077cdbd0f66d63f951bc8d063df82495822a6754b02531dfc676c100217f882d29f837045a75 SHA512 05cde28d3b9c83054d004fe6fa9d439358fd95ae3b739089a08b37a3b44e1b3119242de64c5e5155bda9df9ad5736a2629385c1b1c39326fbd9e3fa6a1984e6f
-DIST kcontacts-5.84.0.tar.xz 543772 BLAKE2B 2a4efd01d377cd98bd506fa2b8918ae2ff581e31848e22e1636047fd91ed8fa1948e8a2a2a750d29851d55d649f5dd33e839ffad7ea796c07e27305a4d3c02a5 SHA512 8bc88f2ce9ebdb0c28ae47311b411de01885cd4bf29a5125818acd8c0ac0c71635eefd87ca8f0c8f873ca303268741e0fccc235e6f887b1ceee880dbca7dd2ff
+DIST kcontacts-5.115.0.tar.xz 214204 BLAKE2B 6f1ed98c1bc899ad6f173be7f6038405c54086838e67425d919150490dde11865a2a51a46da792214aaa7f528ddcf95aaa055c56963537e859e4e8617ae51df1 SHA512 7e53ed4810fb82a34ae3bf46aeb1b4ae1c70b46500928a15748a3b8a4762a3d86b95c7ca70d7387dd92f25c7e10d6c991de4c837c8efaf52ff0b69478391b1df
+DIST kcontacts-6.1.0.tar.xz 207172 BLAKE2B 4a287437f52a098383de42353de424bd54320635542848cdd12f4bfbaf7d69efc6fdecaebbbfbc0942b31ee0792bface0103a11858ecd67748ea57a282aaf5b0 SHA512 3173f9bb6cd55fb5e0035c6fd828a9ab26dbfeb7df54c215c45f60674a12005e15c4597e7a0365b964df5797c9cb430a489e8e08559510a4e1242663a2dd9c00
diff --git a/kde-frameworks/kcontacts/kcontacts-5.115.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.115.0.ebuild
new file mode 100644
index 000000000000..694a642e5dc4
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-5.115.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+
+LICENSE="GPL-2+"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ =kde-frameworks/kcodecs-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+
+CMAKE_SKIP_TESTS=(
+ # bug #566648 (access to /dev/dri/card0 denied)
+ kcontacts-picturetest
+ # bug #838502 (again some Qt translations loading related err...)
+ kcontacts-addresstest
+)
diff --git a/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
deleted file mode 100644
index 36692b8d727b..000000000000
--- a/kde-frameworks/kcontacts/kcontacts-5.82.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="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kcontacts:5
- app-text/iso-codes
-"
-
-src_test() {
- # bug #566648 (access to /dev/dri/card0 denied), bug #625988
- local myctestargs=(
- -E "(kcontacts-addresstest|kcontacts-picturetest)"
- )
- ecm_src_test
-}
diff --git a/kde-frameworks/kcontacts/kcontacts-5.84.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.84.0.ebuild
deleted file mode 100644
index 9c7352d00bb1..000000000000
--- a/kde-frameworks/kcontacts/kcontacts-5.84.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="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kcontacts:5
- app-text/iso-codes
-"
-
-src_test() {
- # bug #566648 (access to /dev/dri/card0 denied), bug #625988
- local myctestargs=(
- -E "(kcontacts-addresstest|kcontacts-picturetest)"
- )
- ecm_src_test
-}
diff --git a/kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild b/kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild
new file mode 100644
index 000000000000..d463d85e0655
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-6.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+
+CMAKE_SKIP_TESTS=(
+ # bug #566648 (access to /dev/dri/card0 denied)
+ kcontacts-picturetest
+ # bug #838502 (again some Qt translations loading related err...)
+ kcontacts-addresstest
+)
diff --git a/kde-frameworks/kcontacts/metadata.xml b/kde-frameworks/kcontacts/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kcontacts/metadata.xml
+++ b/kde-frameworks/kcontacts/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index dc4d6d1b5a8f..ecfcb25fad23 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kcoreaddons-5.82.0.tar.xz 414272 BLAKE2B a24534a5f3ba900c6e77afcbb6218fa02f093c58283f228f8b41272ab82eca214f2b080356facaa2a800f63ee80f048c7e20d9e22bc2d7d2604a7fe9d2c93d3b SHA512 25e320e6d9a436091491572cf8623a0abaf3abc7d5edde44403701471fc0315b6ad5d09a44b93de023298ffeb9c14366de23c08f43abc51c87c87f9258a652a7
-DIST kcoreaddons-5.84.0.tar.xz 419632 BLAKE2B e6c58fe326f0dfb7277d888c90eecfdaf7009f773da7afd965be2e19ec18fc1cda9f37fdbb689eb064f8b665f9db96e7748a2fc52359ec9880daf31ff20936c9 SHA512 c9818af2c58910d25b68c4e036e25469465b5fa6f34c3e7a53967b2e51c258ac446fbca22524393d09d7e93c506ac87c22864fb6806bcab53e36913c96d9383d
+DIST kcoreaddons-5.115.0.tar.xz 2611124 BLAKE2B d547ca61b96a52b1da49b4773d18765886fe93ab9a0bf7e17ff32ba8de4e0a0e28db30b9a80f771ee96e56b7bd8eda0cb517b0446ab19409cc4ce05c0557d2e5 SHA512 66a209496de8370a3f69549462f101dfca76f87c6bb4e2ad5e616e5fd6b460d17ea3e93386d6450992e6ca3759868d1818bc29987af780b466100a9389504939
+DIST kcoreaddons-6.1.0.tar.xz 2576112 BLAKE2B bca50bf6c68e63f755282a33adcb6537bca3f89a9b9072400e5b2af80c0e9e432585e1dcfdd4dcc2466768314b690d638e9ad3fd26b4b17243ce3e7abec510eb SHA512 1f9aa728898ed9e1e3bbff96b300a895022065d51fd21a15e68e7a71eb09c1b507e69c6723511ce66a8e6cdac29b8839535226764e819cc3541ee0b675cc064a
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.115.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.115.0.ebuild
new file mode 100644
index 000000000000..8cf3bbd2347b
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.115.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="dbus fam"
+
+DEPEND="
+ >=dev-qt/qtcore-${QTMIN}:5[icu]
+ virtual/libudev:=
+ dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+ fam? ( virtual/fam )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qttranslations-${QTMIN}:5
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+src_configure() {
+ local mycmakeargs=(
+ -D_KDE4_DEFAULT_HOME_POSTFIX=4
+ $(cmake_use_find_package fam FAM)
+ $(cmake_use_find_package dbus Qt5DBus)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 632398
+ kautosavefiletest
+ # bug 647414
+ kdirwatch_qfswatch_unittest
+ kdirwatch_stat_unittest
+ # bugs 665682
+ kformattest
+ )
+ # bug 619656
+ ecm_src_test -j1
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
deleted file mode 100644
index 7bc686743a95..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="fam nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtcore-${QTMIN}:5[icu]
- fam? ( virtual/fam )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -D_KDE4_DEFAULT_HOME_POSTFIX=4
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package fam FAM)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # bugs: 619656, 632398, 647414, 665682
- local myctestargs=(
- -j1
- -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.84.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.84.0.ebuild
deleted file mode 100644
index 1c4c1e7552ea..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.84.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="fam nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtcore-${QTMIN}:5[icu]
- fam? ( virtual/fam )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -D_KDE4_DEFAULT_HOME_POSTFIX=4
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package fam FAM)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # bugs: 619656, 632398, 647414, 665682
- local myctestargs=(
- -j1
- -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild
new file mode 100644
index 000000000000..2f8f3781828e
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-6.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="dbus"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus?,icu]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ virtual/libudev:=
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qttranslations-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+ local mycmakeargs=(
+ -DKCOREADDONS_USE_QML=ON
+ $(cmake_use_find_package dbus Qt6DBus)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 632398
+ kautosavefiletest
+ # bug 647414
+ kdirwatch_qfswatch_unittest
+ kdirwatch_stat_unittest
+ # bugs 665682
+ kformattest
+ )
+ # bug 619656
+ ecm_src_test -j1
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcoreaddons/metadata.xml b/kde-frameworks/kcoreaddons/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kcoreaddons/metadata.xml
+++ b/kde-frameworks/kcoreaddons/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 726a5c399c7a..e3a2a1793cec 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1,2 @@
-DIST kcrash-5.82.0.tar.xz 24696 BLAKE2B e13388661d3661216df8900875e86d7ad71352c229e9cc4be78d11469cefcecc51cc11aa95badb12e2dcba22eba22533b959ca3ab8317c205a06e3f5e906b203 SHA512 9cec96ef82f9628fbbbe0fd4e0687c094f7a1b1385e6ba6807f1dd49c9f8d19a29497b29b31bd9a86c59f498d76d54bdcbfafa86a480ccfb29dcd488eee22340
-DIST kcrash-5.84.0.tar.xz 27596 BLAKE2B 8038d7523e7510826085e2ed63349afe7dc841510224ce6d6f0c637b78915c57266b866f3d34b11a321f9c17a3497458c9b328c9f1bda8c4bf0d52290ede2fac SHA512 be4187d745105e68d0243057831f1cd7ab9691682e6d505a30c0f69988caf0f881569b7cfdc29a01b6ed4e608080842266ae8a5d6ac58e9605f1a2a57da59463
+DIST kcrash-5.115.0.tar.xz 28288 BLAKE2B f9297149410458a81b21ff8220a0b13facba11340d4c17c09fd03cccc0a8ae3ce7c5aa54d8627fa07f805718b31a63c90c2f439ba82da630cf8373dcfa8c202f SHA512 a8c9d9676433f6017681328b93a9218a6e87794712488a905ba6a783c4b370a3d65b9efe6e8c77d809f72cde0fa28a43020b3e0ef909197918c76d94592b3233
+DIST kcrash-6.1.0.tar.xz 29132 BLAKE2B 1f995cf4559260bcf5732574c709ffa13c1b25df1e7e9bbdbcd8bea6e28361dc920999a831d52e9bf92537e6b2fce2d29a72886d83ee041f8184e92e46533ccd SHA512 6334c6924e5f78f97cd433ea1d41f82db51fb3abc9205320d5c3ffd4034383d9bb2c1810cc71c7d3639e53294a819be2b96a53469d826d132f6faf2d49ed97a4
diff --git a/kde-frameworks/kcrash/kcrash-5.115.0.ebuild b/kde-frameworks/kcrash/kcrash-5.115.0.ebuild
new file mode 100644
index 000000000000..a0f0b6842ece
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.115.0.ebuild
@@ -0,0 +1,39 @@
+# 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=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=$(usex X)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kcrash/kcrash-5.82.0.ebuild b/kde-frameworks/kcrash/kcrash-5.82.0.ebuild
deleted file mode 100644
index beb50af40504..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.82.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/kcrash/kcrash-5.84.0.ebuild b/kde-frameworks/kcrash/kcrash-5.84.0.ebuild
deleted file mode 100644
index c9026f018d6a..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.84.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/kcrash/kcrash-6.1.0.ebuild b/kde-frameworks/kcrash/kcrash-6.1.0.ebuild
new file mode 100644
index 000000000000..66b242efadce
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-6.1.0.ebuild
@@ -0,0 +1,36 @@
+# 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 intercepting and handling application crashes"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=$(usex X)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kcrash/metadata.xml b/kde-frameworks/kcrash/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kcrash/metadata.xml
+++ b/kde-frameworks/kcrash/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 594995c604b6..1fc40126331d 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,2 +1,2 @@
-DIST kdav-5.82.0.tar.xz 60180 BLAKE2B f4860970f75588ea69f032912d9f105fa8f204b36a0ba48e7cf57246c48ce612d66f7f1bcf0cc773dd699e6cc475c139ed450767a79afdea92e6f4de9036419a SHA512 84882e4c4debc2cecd7c206e84b7534bd23fcbd28abf8e1438c8ed06faacdd3312e955dcb5233cb38f1cba4d4fa88cdec9f2ba0e7bc13af3bb07ac999efcfeb2
-DIST kdav-5.84.0.tar.xz 61048 BLAKE2B 1625bba583046eb837aca036922e086d55cb893eaabf7a10ab21dd9efa31f37569154b1d357ec7e2d2821013d3600fe48bafc7b95ea46f3ba133bd9e39db35d4 SHA512 68109913384f5205dfda6c23f33b75217d58ba179d74c8e3d08f899bae56d72272caf83cba31bae14f454f37de8cbf8618232be70c09ce7745741df0199cce6a
+DIST kdav-5.115.0.tar.xz 66476 BLAKE2B c7550c0281e97d29d2cbb8e18ce29e1503506afb46d3e8600c1fdfa6a8f444028b6c12984ef61e58a5789919f771d0648c4cfc3c120fe1b7c113aacb5c98c786 SHA512 62e25deaa926c5f927e40e7d3baa06d536b1cf143515ff5607987808a3153295d7415519036239683614662a52a390aae7722b43d8e623a32231bf2811abad03
+DIST kdav-6.1.0.tar.xz 68220 BLAKE2B 136f53d87da69779179fbf9dfd3d235c92001c2f32f410a869a843e3310dda595d69cd22c1e6ec361c9584f1d8998ac004509a3f642d9f94e724615d296eb619 SHA512 f7e37640f7048d0da6a4377d1eabc3a4d817dd9c22ab7df8fbb1cf22f641fadbd2cc34014948341261fc8c5782586b01d9526526657fd2ef818898218254c4d7
diff --git a/kde-frameworks/kdav/kdav-5.115.0.ebuild b/kde-frameworks/kdav/kdav-5.115.0.ebuild
new file mode 100644
index 000000000000..a18a5efa9c00
--- /dev/null
+++ b/kde-frameworks/kdav/kdav-5.115.0.ebuild
@@ -0,0 +1,33 @@
+# 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=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+ # bug 616808: requires D-Bus
+ kdav-davitemfetchjob
+ # bug 653602: mimetypes unsupported
+ kdav-davitemslistjob
+ # bug 765061
+ kdav-davcollectionsmultifetchjobtest
+)
diff --git a/kde-frameworks/kdav/kdav-5.82.0.ebuild b/kde-frameworks/kdav/kdav-5.82.0.ebuild
deleted file mode 100644
index 0cbd15e85055..000000000000
--- a/kde-frameworks/kdav/kdav-5.82.0.ebuild
+++ /dev/null
@@ -1,37 +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="DAV protocol implemention with KJobs"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- >=kde-frameworks/kcoreaddons-${PVCUT}:5
- >=kde-frameworks/ki18n-${PVCUT}:5
- >=kde-frameworks/kio-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdav:5
-"
-
-src_test() {
- # bug 616808 - DavItemFetchJobTest requires D-Bus
- # bug 653602 - DavItemsListJobTest mimetypes unsupported
- local myctestargs=(
- -E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
- )
- ecm_src_test
-}
diff --git a/kde-frameworks/kdav/kdav-5.84.0.ebuild b/kde-frameworks/kdav/kdav-5.84.0.ebuild
deleted file mode 100644
index 925ae2c1cb33..000000000000
--- a/kde-frameworks/kdav/kdav-5.84.0.ebuild
+++ /dev/null
@@ -1,37 +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="DAV protocol implemention with KJobs"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- >=kde-frameworks/kcoreaddons-${PVCUT}:5
- >=kde-frameworks/ki18n-${PVCUT}:5
- >=kde-frameworks/kio-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdav:5
-"
-
-src_test() {
- # bug 616808 - DavItemFetchJobTest requires D-Bus
- # bug 653602 - DavItemsListJobTest mimetypes unsupported
- local myctestargs=(
- -E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
- )
- ecm_src_test
-}
diff --git a/kde-frameworks/kdav/kdav-6.1.0.ebuild b/kde-frameworks/kdav/kdav-6.1.0.ebuild
new file mode 100644
index 000000000000..4ae8f4047b29
--- /dev/null
+++ b/kde-frameworks/kdav/kdav-6.1.0.ebuild
@@ -0,0 +1,32 @@
+# 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="DAV protocol implemention with KJobs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,xml]
+ >=kde-frameworks/kcoreaddons-${PVCUT}:6
+ >=kde-frameworks/ki18n-${PVCUT}:6
+ >=kde-frameworks/kio-${PVCUT}:6
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+ # bug 616808: requires D-Bus
+ kdav-davitemfetchjob
+ # bug 653602: mimetypes unsupported
+ kdav-davitemslistjob
+ # bug 765061
+ kdav-davcollectionsmultifetchjobtest
+)
diff --git a/kde-frameworks/kdav/metadata.xml b/kde-frameworks/kdav/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdav/metadata.xml
+++ b/kde-frameworks/kdav/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 42825e7bc710..2cc402f392c6 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kdbusaddons-5.82.0.tar.xz 42792 BLAKE2B 7b20072c93b1149d31f3bbc020de124a05ae96bdd6affa6a77d46ea69f5ac1b458851f97115dbd6ce18e12773e39c240daa2035056496a431849a51a096383e9 SHA512 a0ece70b7f79a5d391244d145d8167c0bbeba5f99db48b513f187638aff6af3f150a75b84d8534ea7b381d858dd743bf73884286bb2ab951d4f6e1675d319fa4
-DIST kdbusaddons-5.84.0.tar.xz 43152 BLAKE2B 21a0c2fc5910ca7a3e1ac403de17f36c33026ceb9ea5a9d3d2aa414dbd8ef0572988503558294ce73a5ab123230cae4f2c7fb94adc9f1671c43922a2a80b87eb SHA512 b4e60ecf2c321cae408e716f2d80c00f244aa33d68267bd89b620cd39bf014017801f365dc213654ce0f6b388828323a5e94ff2d1537bc54b89391407b0cdb71
+DIST kdbusaddons-5.115.0.tar.xz 48924 BLAKE2B d781b8a42b80abc3096f10e7fe2ae8bd5d6d7306e0d6c0cd61b82c28719c8ecdfb9652388bcd29d49e614fdfdf448ac4cfbf7de7abbb7ea7f8cc1f632ce565b4 SHA512 4d43d39300652a7923a8f2a66dab18e606c2472c18f9629d3481bfc9329ff60b0d53f463de88d6dabfa106cebf68422184a4dc76b35c95f05050271eac29654e
+DIST kdbusaddons-6.1.0.tar.xz 46420 BLAKE2B b22b3e59dbd47b774ef7226ee4d6ade506c3ca7c6e25658efeba62ad6729643345b6d3ff2d33b1225dc57eec61977eb94fc56d3859c7d72488a1f80c120f1a42 SHA512 924d21179c624fdeed9de230c22b12d4682980b8578e81a8473bb95a1d251a104d5d6dd7e999e01caf5652a60a6b78ad2baf07e98d1d1d60c5ed2c4c7e6a844d
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.115.0.ebuild
index d6b709bbfbbb..1576a302b9fe 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.115.0.ebuild
@@ -1,29 +1,27 @@
-# 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
-QTMIN=5.15.2
+QTMIN=5.15.9
VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls X"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="X"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
"
RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package X Qt5X11Extras)
)
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.84.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.84.0.ebuild
deleted file mode 100644
index 6b5380dc9482..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.84.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls X"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package X Qt5X11Extras)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-6.1.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-6.1.0.ebuild
new file mode 100644
index 000000000000..8022427363d4
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-6.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+VIRTUALDBUS_TEST="true"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
+ X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdbusaddons/metadata.xml b/kde-frameworks/kdbusaddons/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdbusaddons/metadata.xml
+++ b/kde-frameworks/kdbusaddons/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 2755eaa998b6..c79f6efd48a1 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1,2 @@
-DIST kdeclarative-5.82.0.tar.xz 186252 BLAKE2B e5b4c22e14cca01614d1bc5556bda00e1ffbcf2b1b1b3277d96a12b380b627a5df4151ad443b5301eeed568bbe1852ef29e3a47f2dc4bc3c037b449441cf8542 SHA512 48ea28aac41cb6d5d15488b80e5cf7abc18b774fe35d22dc14d030b22e56b3b9bd116a44a0e7c44adf9fd26d0d4cd73782a6aa187f35375ffbbbf08374cb5658
-DIST kdeclarative-5.84.0.tar.xz 187128 BLAKE2B 9ab46e9e207d3e320474ad789fbd998ca213a1263bc9197bc9ca28257b93ebb82d93b088cb6eabfb791debf92aae4b2ca9d28e00dddf8ac594dc27669e9addd1 SHA512 043f2fd23d1cbb5291239cc27a018d5b99ec7bc7309490dd84daf59d3b571851e2f7d5f7fc3771654429f869f7c144fe59dfda973622eef3c91c45afd4cf113c
+DIST kdeclarative-5.115.0.tar.xz 2492688 BLAKE2B 26c140a97a362ccc97d8c193c889fbf83b445532708c6e4ca99b7f5e85daeb4c13b9feb28731d48eeed1f81a8f55e2aab3c2e2360cc44191b0ff222ea4caf480 SHA512 e744d970605de5c0f32485ae471f52950c4af72a7e0e3fc3011b2320f7c951ea3e1a1a80f84916ba0fd1d4019c009b66967af70f06e5aa9ea758189c221310ce
+DIST kdeclarative-6.1.0.tar.xz 2436156 BLAKE2B 9dfb3eb1916fef53020e6a57292c86a17ae273785659c73d50c4b400af728e4349e3efdea7ac0164a2dfbfa73b89170725fe73faf39430efa34532601314a5c7 SHA512 cba39ef2f03f80a1ef739b53fe2c8843574b4a67ab2ed185033295a2e6c04a76d9769a207f333d5e95944c311c73ae72bf1855cda5288a2d3f6491d6ec60c74b
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.115.0.ebuild
index 33e27c78cac8..84a8b4088efe 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.115.0.ebuild
@@ -1,17 +1,17 @@
-# 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="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework providing integration of QML and KDE work spaces"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE=""
DEPEND="
@@ -22,6 +22,7 @@ DEPEND="
=kde-frameworks/kconfig-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kiconthemes-${PVCUT}*:5
=kde-frameworks/kio-${PVCUT}*:5
@@ -32,4 +33,6 @@ DEPEND="
=kde-frameworks/kwindowsystem-${PVCUT}*:5
media-libs/libepoxy
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.84.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.84.0.ebuild
deleted file mode 100644
index 34815c54112f..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.84.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="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild
new file mode 100644
index 000000000000..100291c53016
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-6.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kglobalaccel-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/metadata.xml b/kde-frameworks/kdeclarative/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdeclarative/metadata.xml
+++ b/kde-frameworks/kdeclarative/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index a66ae94fb025..f362f87d532e 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,2 @@
-DIST kded-5.82.0.tar.xz 36964 BLAKE2B bbc92bde53caaca442808c154bf7bb88c3edca9b979c597ea08a0a0901b40d67004e2f45acec663b22e318e547c86397a99c8c895a374b73d066c2ff67b3f868 SHA512 10ef292186d652a519aae01681934f70f820ff4c480f9ed9868f7dfaf9dba016e035b565b220fb5d3ef89dae5180088ed3a93d0682c54ba27978b53df00c2755
-DIST kded-5.84.0.tar.xz 36932 BLAKE2B 88bb0c1e7ffa832288cce7824902acb14f51fb7ca09609b1d55f602688262218241a1de75cae130fbfd7e6b7b754effbf41b056001bf63afa1fd1431ae73e1e5 SHA512 67f86d90cc87a0a4c923726d9c74d90232fd37d0975bf93eca2a6a48761569d56dd91e5b2ea8b926012e47392480679d7d82372dfaab921bfd4a92679ec173f5
+DIST kded-5.115.0.tar.xz 41064 BLAKE2B bbff8afe58d72f43ac6daab92e5b981465ca1b95d2e28089a847301430c958d6fa1f7909b5e05e3422bc219ba2c22ec8ba073b510b45680e0d948af6d5317da7 SHA512 880fb068bcd0ebbbc07ec0396a58d763a8b9f5f431874748b4f8d88c79c06d670cd01fc706e60f2f87816a7bc64b4b4e4e367eedc04bc2c160a1a64fe7f68fdb
+DIST kded-6.1.0.tar.xz 32232 BLAKE2B 4d25a26f747b11a232b48a37a31a0d956aaddca4b60c1e020cc86db56f61e283c5345fe1194127490c101340c505835725b559a9f70e47f7a88abea69f4b1f74 SHA512 d0832122f3d81ffb79079881cd735230b9d3e4cbaef2b2cc5cc35bfec872145e8ba85b29d7ac3eda3f2966256d1a3c8a8d7df50c3c096094dc3344e432b6408e
diff --git a/kde-frameworks/kded/kded-5.82.0.ebuild b/kde-frameworks/kded/kded-5.115.0.ebuild
index 5b72774094fc..c92e19f9d173 100644
--- a/kde-frameworks/kded/kded-5.82.0.ebuild
+++ b/kde-frameworks/kded/kded-5.115.0.ebuild
@@ -1,34 +1,32 @@
-# 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_QTHELP="false"
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Central daemon of KDE workspaces"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="+man"
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[dbus]
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/kcrash-${PVCUT}*:5
=kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kinit-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
src_configure() {
local mycmakeargs=(
diff --git a/kde-frameworks/kded/kded-5.84.0.ebuild b/kde-frameworks/kded/kded-5.84.0.ebuild
deleted file mode 100644
index 9ab73b764aaf..000000000000
--- a/kde-frameworks/kded/kded-5.84.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
- >=dev-qt/qtdbus-${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/kinit-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package man KF5DocTools)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kded/kded-6.1.0.ebuild b/kde-frameworks/kded/kded-6.1.0.ebuild
new file mode 100644
index 000000000000..6532602ce5bc
--- /dev/null
+++ b/kde-frameworks/kded/kded-6.1.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_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="+man"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ =kde-frameworks/kconfig-${PVCUT}*:6[dbus]
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kcrash-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF6DocTools)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kded/metadata.xml b/kde-frameworks/kded/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kded/metadata.xml
+++ b/kde-frameworks/kded/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 8060a169ab19..b28a15aba8d1 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1 @@
-DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
-DIST kdelibs4support-5.84.0.tar.xz 3553320 BLAKE2B ba9ed75ef8a187411a72677dd57c13b8fa9db5df5f151f14cfe4bfa4a59998f3d56bf0ef9a5df0c99a2ec9670977b741ad041ec27fb02a53dcaa519c7f56caad SHA512 9c4cfd20ad16ba8bd4f8feeade4142e8126c37d5967f61672282e6f98f5cd505f2e4fec36700b15451c08549416c0bb81ce3bf450bdd25e5ef11670c093c51ff
+DIST kdelibs4support-5.115.0.tar.xz 3723592 BLAKE2B efb5a384b71f781d666d78c3157188179eaf54237d6a8c442217273e5b4b1b604d86f5db73cce6528d991f669d6ddb6cf156035d5606d1eb03912c7b99ddf26b SHA512 511e14975c2810217e8f08d14a800cfdd04654399303b04a45d69b2f1959cf482027f2444c9e8202bdda60f1779fe572af0a55fae1b3692ec49cea97beeb894f
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
index e6a287ebda37..8614a8490222 100644
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
@@ -17,7 +17,7 @@ index 2a432591..e503999d 100644
@@ -20,7 +20,7 @@ include(GenerateExportHeader)
include(CMakeFindFrameworks)
- set(REQUIRED_QT_VERSION 5.15.0)
+ set(REQUIRED_QT_VERSION 5.15.2)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.84.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.115.0.ebuild
index 8cf2a1aa39dd..d76a8b156bcf 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.84.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.115.0.ebuild
@@ -1,26 +1,23 @@
-# 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_HANDBOOK="true"
+ECM_HANDBOOK_DIR="docs"
ECM_QTHELP="false"
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 easing the development transition from KDELibs 4 to KF 5"
+
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="networkmanager X"
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- dev-lang/perl
- dev-perl/URI
-"
COMMON_DEPEND="
app-text/docbook-xml-dtd:4.2
dev-libs/openssl:0
@@ -49,16 +46,17 @@ COMMON_DEPEND="
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/kitemviews-${PVCUT}*:5
=kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5[X?]
=kde-frameworks/kparts-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kunitconversion-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
virtual/libintl
+ networkmanager? ( net-misc/networkmanager )
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libICE
@@ -73,25 +71,35 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/countryflags-${PVCUT}:5
=kde-frameworks/kinit-${PVCUT}*:5
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+"
PATCHES=(
- "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
- "${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
+ # downstream patches
+ "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
+ "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
)
src_prepare() {
ecm_src_prepare
+
if ! use handbook; then
sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
fi
+
+ cmake_run_in src cmake_comment_add_subdirectory l10n
}
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
+ $(cmake_use_find_package networkmanager NetworkManager)
)
ecm_src_configure
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
deleted file mode 100644
index ac93c4e494ce..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RESTRICT+=" test"
-
-BDEPEND="
- dev-lang/perl
- dev-perl/URI
-"
-COMMON_DEPEND="
- app-text/docbook-xml-dtd:4.2
- dev-libs/openssl:0
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qttest-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kauth-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- >=kde-frameworks/kded-${PVCUT}:5
- =kde-frameworks/kdoctools-${PVCUT}*:5
- =kde-frameworks/kemoticons-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kparts-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kunitconversion-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/solid-${PVCUT}*:5
- virtual/libintl
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${COMMON_DEPEND}
- test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kinit-${PVCUT}*:5
- =kde-frameworks/kitemmodels-${PVCUT}*:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
- "${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
-)
-
-src_prepare() {
- ecm_src_prepare
- if ! use handbook; then
- sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdelibs4support/metadata.xml
+++ b/kde-frameworks/kdelibs4support/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 3d6c488c4bde..324353b29b32 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1,2 @@
-DIST kdesu-5.82.0.tar.xz 52236 BLAKE2B e674b6e7779cbe858828d17a8e72e14570007776461d3da99cd86adf92380fa5a95bfc394436f8e900e2fd90052b35c6a68b91c2e12e9c8cd835483c7f2b6262 SHA512 6d4cbbc783959d093f59221dc0cf7862f30444878a32475976519b443713e8ea1f154c8a62f7cf4468e807ebd983afb037211d5641335822037bad04501552ae
-DIST kdesu-5.84.0.tar.xz 52448 BLAKE2B e100c2f306f871790e23bbe06950e41033563caeec2b4893c61c1ba6609069ad761b40d0f8f35ccd17b1fad4fa9c49cdef6b7bd895c13a302e2034ea484440e3 SHA512 ebc9ac1df994f30c6d74682dcf42b10f4f850b27e871d3b31b5bb067d906f3ab681dfd052c71d88ade873d98923e5360e8770f14d0104fde182b8eeba7084c2a
+DIST kdesu-5.115.0.tar.xz 56812 BLAKE2B d37c45d6ff7d0fa1f2dcc452c7ce3bfb1daca057d691c33b91c08aff1eb53686d99a089ba901cc3e001c7f019bb23bde999d66e5b449252c831de8cad8aab682 SHA512 097a4ad960fd6f47600a70b6117f8f3517bc627c3bd32616b95acedddb75d49cf44ac07ecd7fad139ac366463741e3358b96e0d2b1af7ab6fc46e009bdbf3e3d
+DIST kdesu-6.1.0.tar.xz 56920 BLAKE2B e5ee0ca91d3fa6669ea1c2f3a85be70812b6756517d6e8ca2f0c13175a785a9dfb7e6b71ef8f470829c783d5ddcb16676bca87dfa0f3a039fa5bbb0c93b53433 SHA512 6ea4e6ae3f648915e8ad63d605e56fd504954138e8c663e0d41fbe1a2bd9da738f5b9024e1be631171fb38b1af7eff1af2db11cd5418a8602862a81a2da5ed2d
diff --git a/kde-frameworks/kdesu/kdesu-5.82.0.ebuild b/kde-frameworks/kdesu/kdesu-5.115.0.ebuild
index efdf8a265ca7..98794005bd5f 100644
--- a/kde-frameworks/kdesu/kdesu-5.82.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.115.0.ebuild
@@ -1,15 +1,16 @@
-# 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="true"
PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework to handle super user actions"
+
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="X"
RDEPEND="
@@ -17,7 +18,6 @@ RDEPEND="
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kpty-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
X? ( x11-libs/libX11 )
"
DEPEND="${RDEPEND}
diff --git a/kde-frameworks/kdesu/kdesu-5.84.0.ebuild b/kde-frameworks/kdesu/kdesu-6.1.0.ebuild
index f80367b7e219..dc1ef8cc42ab 100644
--- a/kde-frameworks/kdesu/kdesu-5.84.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-6.1.0.ebuild
@@ -1,23 +1,23 @@
-# 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="true"
PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework to handle super user actions"
+
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
IUSE="X"
RDEPEND="
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kpty-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kpty-${PVCUT}*:6
X? ( x11-libs/libX11 )
"
DEPEND="${RDEPEND}
diff --git a/kde-frameworks/kdesu/metadata.xml b/kde-frameworks/kdesu/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdesu/metadata.xml
+++ b/kde-frameworks/kdesu/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 9608474a6f43..638fa9a52cdd 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1,2 @@
-DIST kdnssd-5.82.0.tar.xz 58296 BLAKE2B 3a7b2d48724fd9982ab74f9bbfcf48dc465082753fa1375d73fae3b53121dcc994ef45777ff01bf27b4f691c0e84d40cf7715ef5d5fc4cb511f6a6983b400cce SHA512 fb365bcf77f81f75a8a2fc62154fec9ef16df30e0efc40d89936532b197d43fe9708f889caef9297946f9c2dc4e44ecef0d8cc30f2e1a847d2b745b2b5dd0e9e
-DIST kdnssd-5.84.0.tar.xz 58684 BLAKE2B babeeef20edd8cdddfcf584ae508bb91a34bb9735e8784ab90f5e96c725ff91cd4ac76e1969a027cfda15a961e532970e6da57e10efee4b3d3cbee3ce197e7d4 SHA512 78997c9aa4254e41e5da14e8893f7ebbce76e52cfe913851048e110597b692fcbbfdc8bec8b9d491642c61daa5b0c583f3dcde416492b63dc22a4123e4d0756a
+DIST kdnssd-5.115.0.tar.xz 2280800 BLAKE2B 44d103bc5273815f2e40fddbfc5d097a570620994c47834bab29bf85edb332f7b8331ad3d3c4d3c68b7bf4ae1736534548722bfacaf8fcd596ab1872da4f74b4 SHA512 f78ed9a9f4434ec1b071363de35df57d7ad4f114ed91fb9ce361aa0100c42e345ad08c8190c33cefea8d2ed46186b28e2ca9236e319615f6f65855835afdb1d7
+DIST kdnssd-6.1.0.tar.xz 2277964 BLAKE2B d177963cc3a31ad0ae3d349a48e35c093671a7af6f0d672fccc2819f5299820bb39fb611b3c00c69af8814c44c846a94a1d51bd4f89d0599d72db1413c03aa10 SHA512 8d20f5b481872e52746a1605194354f4d0a56fefe091679c07e39e7d96330ab67b49b424c8568e74a027c028f8c01064311bdce6be8fe87fb81558a29326fb9f
diff --git a/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.115.0.ebuild
index 827c3e56131e..1dc0f052dc8d 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.115.0.ebuild
@@ -1,19 +1,17 @@
-# 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
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for network service discovery using Zeroconf"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls zeroconf"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="zeroconf"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtnetwork-${QTMIN}:5
zeroconf? (
@@ -22,12 +20,13 @@ DEPEND="
)
"
RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
$(cmake_use_find_package zeroconf Avahi)
)
+ use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
ecm_src_configure
}
diff --git a/kde-frameworks/kdnssd/kdnssd-5.84.0.ebuild b/kde-frameworks/kdnssd/kdnssd-6.1.0.ebuild
index 57dc346bb8ab..b3a404c71ce4 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.84.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-6.1.0.ebuild
@@ -1,33 +1,32 @@
-# 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
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for network service discovery using Zeroconf"
+
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls zeroconf"
+KEYWORDS="~amd64"
+IUSE="zeroconf"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
- >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[network]
zeroconf? (
- >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
net-dns/avahi[mdnsresponder-compat]
)
"
RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
$(cmake_use_find_package zeroconf Avahi)
)
+ use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
ecm_src_configure
}
diff --git a/kde-frameworks/kdnssd/metadata.xml b/kde-frameworks/kdnssd/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdnssd/metadata.xml
+++ b/kde-frameworks/kdnssd/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 5eecc4882fcb..2a89afa930f1 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,2 @@
-DIST kdoctools-5.82.0.tar.xz 437024 BLAKE2B 6e51452eef36a28af3adae497906ab02429ac57361bf598b347dca7ae0f9df33b7af0ef4c7ecaa5cde1f1021e9a44633013014d2d5a893f319bd8085b732eb65 SHA512 5255b78f1a51a9e2adeb1c6fe113c6555f50eb8af04d3d78c3942f924c071c11c1598245793c68c97eaa3bd1f299b8f9fe7f190da5b720ab7930ed53070f58d3
-DIST kdoctools-5.84.0.tar.xz 437044 BLAKE2B 6ef70322977660f68668a450d3582e84f2b216ac3a2ce0415868f002b61775c0a10c1b973e703fbcb5d2a36eba5be155d83c334c7e86e00cb0a16320ede3ca04 SHA512 6ac82dd14844e3c1857d566eb0b90bac27fc13275b9e74989da94fd844c6a2cfbd3c7604e1a71ad50cb1f8a9e4e1405c92b12a6d99b4a82b6ee10cab6341ab81
+DIST kdoctools-5.115.0.tar.xz 465436 BLAKE2B bf7af3333a8fbf121e326eaa2c54c16f9a9ba1552a982061337c365d57eb9d5beab8952f0360b6bb2c0bda07afd42fae050072a3ae9fafe32a54e77df4dce48d SHA512 f7c95c090899fa8d7ea0d730e48a87a4881f271a37bb1d0af6f67aaa52954613e957e04a91b94b985bf993c0b9db3736aa922033d100d2c8beb2f24ae50b2caf
+DIST kdoctools-6.1.0.tar.xz 460212 BLAKE2B 154f3b322ab2dbb19e3cfecb186a58db931324ebcfdaa72fcafadc7f2d564b685efe871836e0e0ecab5db4a0b2282581432686b1223d5c0bda1d194f2375b67b SHA512 51ea89b116502aa07ddc848d952247112d8aed0ff2d6f4b401a9b2d4ff2da65517f4cf1d973382b55428502ba5f1b2383b26aab878d5784764785779f72d42bf
diff --git a/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild
index 9718a54d230d..e0ad7364b427 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.115.0.ebuild
@@ -1,16 +1,16 @@
-# 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_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="nls"
BDEPEND="
@@ -28,6 +28,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+CMAKE_SKIP_TESTS=(
+ # bug 665622
+ kdoctools_install
+)
+
PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
src_configure() {
@@ -37,12 +42,3 @@ src_configure() {
ecm_src_configure
}
-
-src_test() {
- # bug 665622
- local myctestargs=(
- -E "(kdoctools_install)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/kdoctools/kdoctools-5.84.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.1.0.ebuild
index 3b3ac23b5f35..95efa167a741 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.84.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-6.1.0.ebuild
@@ -1,48 +1,44 @@
-# 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_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
IUSE="nls"
-BDEPEND="
- dev-lang/perl
- dev-perl/URI
- nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
-"
DEPEND="
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
app-text/sgml-common
dev-libs/libxml2:2
dev-libs/libxslt
- =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:6
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+ nls? ( >=kde-frameworks/ki18n-${PVCUT}:6 )
+"
+
+CMAKE_SKIP_TESTS=(
+ # bug 665622
+ kdoctools_install
+)
PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package nls KF5I18n)
+ $(cmake_use_find_package nls KF6I18n)
)
ecm_src_configure
}
-
-src_test() {
- # bug 665622
- local myctestargs=(
- -E "(kdoctools_install)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/kdoctools/metadata.xml b/kde-frameworks/kdoctools/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kdoctools/metadata.xml
+++ b/kde-frameworks/kdoctools/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 8220b06180e4..09e68c3e3466 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1 @@
-DIST kemoticons-5.82.0.tar.xz 1698472 BLAKE2B fc5f8401a4b5482126a9b054f1fe6107c2da759df0a4ea960cc4a139d9ce8dcc22e6b94aff64780d7b7cf049d68b67b799011f3d999b07ce2f1e065e6d6612e3 SHA512 c3c3813613891e23db9b5605de6dcfdf3e5f973e162d27d37e907b60d49bfc3ba99743534d3749dad6a67217e44220fcf52c880563da82dc465eb10536ea40d7
-DIST kemoticons-5.84.0.tar.xz 1698512 BLAKE2B e2830e894d3c097b6761f09d7a51c610dc5fd89a59de1e4a4ef1e4533edb384df1400fb97df94895ca5ece473269f3c346c1b179c6edc0978b6672431c5c7cd7 SHA512 e3019fd7565a36021d7aa6c6b904779d4f897498eb49bb3b805afcaec7c27974355e4cec2e63dcb054ca3cd828496337deff6fdeeb28e632a5f7a61ecc7dd9ff
+DIST kemoticons-5.115.0.tar.xz 1700720 BLAKE2B 06a62962f007e273d8d3dcff9c4bec24c4982707f11931a19a87e8712ce7589fd325bfb42dc974e6907df79078a4445711549522d052834f61f395d93ccc689f SHA512 412729a4c236f27d584d508de5104b7a9ac451758427d5595c44ff07c045b91c69f024ea589b3b1f8eca95eb827deab789870ca36acb5cf6a06b3b22169604dc
diff --git a/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.115.0.ebuild
index b5495b48b170..350625768951 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.115.0.ebuild
@@ -1,20 +1,19 @@
-# 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
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 converting text emoticons to graphical representations"
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
# requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-frameworks/kemoticons/kemoticons-5.84.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.84.0.ebuild
deleted file mode 100644
index 6c6f658b72cf..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.84.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT+=" test"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kemoticons/metadata.xml b/kde-frameworks/kemoticons/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kemoticons/metadata.xml
+++ b/kde-frameworks/kemoticons/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kf-env/kf-env-5.ebuild b/kde-frameworks/kf-env/kf-env-5.ebuild
index e848ab87fa9a..f0edd769011e 100644
--- a/kde-frameworks/kf-env/kf-env-5.ebuild
+++ b/kde-frameworks/kf-env/kf-env-5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
IUSE=""
RDEPEND=">=x11-misc/xdg-utils-1.1.1-r1"
diff --git a/kde-frameworks/kf-env/metadata.xml b/kde-frameworks/kf-env/metadata.xml
index 2fdbf33d963d..d925f2439758 100644
--- a/kde-frameworks/kf-env/metadata.xml
+++ b/kde-frameworks/kf-env/metadata.xml
@@ -1,8 +1,11 @@
<?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>
</pkgmetadata>
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 40d35918db01..be5a50d8ca6b 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,2 +1,2 @@
-DIST kfilemetadata-5.82.0.tar.xz 425540 BLAKE2B d9102aaca3c49fb81bdbef517ba1a6040d0653ce1fd517ce61854b221b8abffbc49c69ad38b98cfc47877f02d7885b9560834cc55b5e03ae2d05eaee51906a12 SHA512 7bd70ae0c2d49d2a9d312dd79dc9268862efefeb48042d0fd8a8e11daf75cc67b6dbeb28fcee7c3f87517476f6eabbd3d4e9a1c61440f62cee0ef93c165cfae5
-DIST kfilemetadata-5.84.0.tar.xz 426308 BLAKE2B 4479d9cd0c2cb1f07040ec5541991ce56d6e8545552f2c40434a59e311557936407a9f870aca1360bd648c43b160d937b7d0a083e4cb15ac1b65ee1f987f3ee7 SHA512 cda78dc3ff73a29d5b913226e60cce87813feca53f0c8d38a4a5267e4149928cb9b5cd304022f4c2a1307ee3b0b72beb25792e3a3d2541c4843a77d45008f745
+DIST kfilemetadata-5.115.0.tar.xz 526912 BLAKE2B a6c80153d451e242f5e16ddbed9cccb3b6f64700f1081de954aeac64f814ef74b1ea4a9960be1e0f83d7217f67034b57b25cd8ea7cd1df9a6f717a607a8fb8f0 SHA512 db7fc7e79abf358ee0def12601de140e8f5d62d939f5580b7940a492780eea8d5b4eb2f679ed15ab02134277d15353d24511a6e41260751811af52398ee037e4
+DIST kfilemetadata-6.1.0.tar.xz 592036 BLAKE2B ea53949e8818ca9c83cabdc51018206b9908615ea830be326553745167d95a9df0ee1bccf3b30f7b7b87eeaf3b4bb901a3abe157414ca2c08d211025a1fcf6d8 SHA512 afeee8f47c202906d12a48153f325dc694e929d634ec785d6bf1db36c23dca913c3e0d4cd39947b1f4cf6aa62b5f3fa4e543590ec81b736e666335e62182dbd2
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.115.0.ebuild
index 44f0a06500cc..dfbdf72e8425 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.115.0.ebuild
@@ -1,37 +1,43 @@
-# 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
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{10..12} )
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature python-any-r1
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org optfeature python-any-r1
DESCRIPTION="Library for extracting file metadata"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="epub exif ffmpeg mobi pdf taglib"
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- test? ( ${PYTHON_DEPS} )
-"
RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/karchive-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
epub? ( app-text/ebook-tools )
exif? ( media-gfx/exiv2:= )
ffmpeg? ( media-video/ffmpeg:0= )
- office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
+ mobi? ( kde-apps/kdegraphics-mobipocket:5 )
pdf? ( app-text/poppler[qt5] )
- taglib? ( media-libs/taglib )
+ taglib? ( media-libs/taglib:= )
"
DEPEND="${RDEPEND}
kernel_linux? ( sys-apps/attr )
"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+CMAKE_SKIP_TESTS=(
+ # FIXME: bug 644650, fails on tmpfs (but not for everyone)
+ usermetadatawritertest
+)
pkg_setup() {
use test && python-any-r1_pkg_setup
@@ -43,7 +49,7 @@ src_configure() {
$(cmake_use_find_package epub EPub)
$(cmake_use_find_package exif LibExiv2)
$(cmake_use_find_package ffmpeg FFmpeg)
- $(cmake_use_find_package office KF5Archive)
+ $(cmake_use_find_package mobi QMobipocket)
$(cmake_use_find_package pdf Poppler)
$(cmake_use_find_package taglib Taglib)
)
@@ -51,12 +57,6 @@ src_configure() {
ecm_src_configure
}
-src_test() {
- # FIXME: bug 644650, fails on tmpfs (but not for everyone)
- local myctestargs=( -E "(usermetadatawritertest)" )
- ecm_src_test
-}
-
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.84.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-6.1.0.ebuild
index 09ccbeab9dd3..0135c867ceee 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.84.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-6.1.0.ebuild
@@ -1,37 +1,43 @@
-# 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
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{10..12} )
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature python-any-r1
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org optfeature python-any-r1
DESCRIPTION="Library for extracting file metadata"
+
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
+KEYWORDS="~amd64"
+IUSE="epub exif ffmpeg mobi pdf taglib"
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- test? ( ${PYTHON_DEPS} )
-"
RDEPEND="
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui,xml]
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
epub? ( app-text/ebook-tools )
exif? ( media-gfx/exiv2:= )
ffmpeg? ( media-video/ffmpeg:0= )
- office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
- pdf? ( app-text/poppler[qt5] )
- taglib? ( media-libs/taglib )
+ mobi? ( kde-apps/kdegraphics-mobipocket:6 )
+ pdf? ( app-text/poppler[qt6(-)] )
+ taglib? ( media-libs/taglib:= )
"
DEPEND="${RDEPEND}
kernel_linux? ( sys-apps/attr )
"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+CMAKE_SKIP_TESTS=(
+ # FIXME: bug 644650, fails on tmpfs (but not for everyone)
+ usermetadatawritertest
+)
pkg_setup() {
use test && python-any-r1_pkg_setup
@@ -43,7 +49,7 @@ src_configure() {
$(cmake_use_find_package epub EPub)
$(cmake_use_find_package exif LibExiv2)
$(cmake_use_find_package ffmpeg FFmpeg)
- $(cmake_use_find_package office KF5Archive)
+ $(cmake_use_find_package mobi QMobipocket)
$(cmake_use_find_package pdf Poppler)
$(cmake_use_find_package taglib Taglib)
)
@@ -51,12 +57,6 @@ src_configure() {
ecm_src_configure
}
-src_test() {
- # FIXME: bug 644650, fails on tmpfs (but not for everyone)
- local myctestargs=( -E "(usermetadatawritertest)" )
- ecm_src_test
-}
-
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
diff --git a/kde-frameworks/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml
index c3a96764b1a5..e82a63be4785 100644
--- a/kde-frameworks/kfilemetadata/metadata.xml
+++ b/kde-frameworks/kfilemetadata/metadata.xml
@@ -1,12 +1,20 @@
<?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="epub">Enable support for reading EPUB ebook metadata</flag>
- <flag name="office">Enable support for reading ODF and OOXML metadata</flag>
+ <flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 25b606708270..ccf019ab70b9 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1,2 @@
-DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
-DIST kglobalaccel-5.84.0.tar.xz 87848 BLAKE2B 7cf47f877da8176a37511ef1dc9e909279c3f1f91ddddbd0b0e5fa34024fe3b773838aaa1c5d396dc865cf60cc6850d5f1d8074cc80873c70c570a5a0bd9efc3 SHA512 2d9175aafdc9e3df27bab9b701ae8783f9676fd27df4f0e886e00e1bb103f5a58a79419d57e8fcb691a29397b912eebcd351cd8f3b7f704de3138e61cfc3c229
+DIST kglobalaccel-5.115.0.tar.xz 2338984 BLAKE2B a7c3a5ab9037930bc0b031b1822fc2acf61d859924181b4a1cfad6479876f84c3cd3d13d03e62e8810c21c0c1ef60be0ea754e959b0ef2d2d60c367fd43a2311 SHA512 0cf7649637d6aac4fa2e0d99392663593e2781f2b5de2cdf501b5d9ce20fc93febf24e8a452fe3592a566d72af4d266545c386d04f785dc307e6027ee334b312
+DIST kglobalaccel-6.1.0.tar.xz 2303876 BLAKE2B ed387244e8ad3535e1458726798d04c06938d6ed7374a74f33562509d237b2816648c26cde79615c2bd964dcc7de3569eb8b96d0ef228d46ac3eafeba685735e SHA512 6ff600d6fa0431458b81d8023ec2fcc3366722f3194bc110133958d8565629c6c6689d4b8f535bc40f8871b15c2d404c32331a36d7132f5511be2271abfb4f74
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch
deleted file mode 100644
index 1cea821ebe96..000000000000
--- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From 9a48818abf50340e31d718cc675501dec6c51429 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 26 May 2021 13:14:13 -0600
-Subject: [PATCH] Revert "Prevent kglobalaccel5 getting activated on non-Plasma
- systems"
-
-This reverts commit 48c3376927e5e9c13377bf3cfc8b0c411783e7f3.
-
-This change broke users of KGlobalAccel run outside of the Plasma
-Desktop. This sort of behavior change probably needs to be made during
-a major transition like KF6 so that developers have some notice and it
-doesn't randomly change and break stuff unexpectedly.
-
-CCBUG: 435420
-BUG: 437034
-FIXED-IN: 5.83
----
- src/kglobalaccel.cpp | 80 --------------------------------------------
- 1 file changed, 80 deletions(-)
-
-diff --git a/src/kglobalaccel.cpp b/src/kglobalaccel.cpp
-index 8bb43e5..154caed 100644
---- a/src/kglobalaccel.cpp
-+++ b/src/kglobalaccel.cpp
-@@ -25,11 +25,6 @@
- #include <QX11Info>
- #endif
-
--bool active()
--{
-- return qgetenv("XDG_CURRENT_DESKTOP") == QByteArrayLiteral("KDE");
--}
--
- org::kde::kglobalaccel::Component *KGlobalAccelPrivate::getComponent(const QString &componentUnique, bool remember = false)
- {
- // Check if we already have this component
-@@ -148,11 +143,6 @@ KGlobalAccel::~KGlobalAccel()
- void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, const QString &contextFriendly, const QString &programName)
- {
- Q_UNUSED(contextFriendly);
--
-- if (!active()) {
-- return;
-- }
--
- // TODO: provide contextFriendly
- self()->d->iface()->activateGlobalShortcutContext(programName, contextUnique);
- }
-@@ -160,10 +150,6 @@ void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, c
- // static
- bool KGlobalAccel::cleanComponent(const QString &componentUnique)
- {
-- if (!active()) {
-- return false;
-- }
--
- org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique);
- if (!component) {
- return false;
-@@ -175,10 +161,6 @@ bool KGlobalAccel::cleanComponent(const QString &componentUnique)
- // static
- bool KGlobalAccel::isComponentActive(const QString &componentUnique)
- {
-- if (!active()) {
-- return false;
-- }
--
- org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique);
- if (!component) {
- return false;
-@@ -196,10 +178,6 @@ bool KGlobalAccel::isEnabled() const
-
- org::kde::kglobalaccel::Component *KGlobalAccel::getComponent(const QString &componentUnique)
- {
-- if (!active()) {
-- return nullptr;
-- }
--
- return d->getComponent(componentUnique);
- }
-
-@@ -526,10 +504,6 @@ void KGlobalAccelPrivate::reRegisterAll()
- #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
- QList<QStringList> KGlobalAccel::allMainComponents()
- {
-- if (!active()) {
-- return {};
-- }
--
- return d->iface()->allMainComponents();
- }
- #endif
-@@ -537,9 +511,6 @@ QList<QStringList> KGlobalAccel::allMainComponents()
- #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
- QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actionId)
- {
-- if (!active()) {
-- return {};
-- }
- return d->iface()->allActionsForComponent(actionId);
- }
- #endif
-@@ -548,29 +519,17 @@ QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actio
- #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
- QStringList KGlobalAccel::findActionNameSystemwide(const QKeySequence &seq)
- {
-- if (!active()) {
-- return {};
-- }
--
- return self()->d->iface()->action(seq[0]);
- }
- #endif
-
- QList<KGlobalShortcutInfo> KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &seq)
- {
-- if (!active()) {
-- return {};
-- }
--
- return self()->d->iface()->getGlobalShortcutsByKey(seq[0]);
- }
-
- bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QString &comp)
- {
-- if (!active()) {
-- return false;
-- }
--
- return self()->d->iface()->isGlobalShortcutAvailable(seq[0], comp);
- }
-
-@@ -578,10 +537,6 @@ bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QStr
- #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
- bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq)
- {
-- if (!active()) {
-- return false;
-- }
--
- if (actionIdentifier.size() < 4) {
- return false;
- }
-@@ -604,10 +559,6 @@ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringL
- // static
- bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KGlobalShortcutInfo> &shortcuts, const QKeySequence &seq)
- {
-- if (!active()) {
-- return false;
-- }
--
- if (shortcuts.isEmpty()) {
- // Usage error. Just say no
- return false;
-@@ -640,10 +591,6 @@ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KG
- // static
- void KGlobalAccel::stealShortcutSystemwide(const QKeySequence &seq)
- {
-- if (!active()) {
-- return;
-- }
--
- // get the shortcut, remove seq, and set the new shortcut
- const QStringList actionId = self()->d->iface()->action(seq[0]);
- if (actionId.size() < 4) { // not a global shortcut
-@@ -676,10 +623,6 @@ bool checkGarbageKeycode(const QList<QKeySequence> &shortcut)
-
- bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag)
- {
-- if (!active()) {
-- return false;
-- }
--
- if (checkGarbageKeycode(shortcut)) {
- return false;
- }
-@@ -695,10 +638,6 @@ bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence>
-
- bool KGlobalAccel::setShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag)
- {
-- if (!active()) {
-- return false;
-- }
--
- if (checkGarbageKeycode(shortcut)) {
- return false;
- }
-@@ -724,9 +663,6 @@ QList<QKeySequence> KGlobalAccel::shortcut(const QAction *action) const
-
- QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, const QString &actionId) const
- {
-- if (!active()) {
-- return {};
-- }
- // see also d->updateGlobalShortcut(action, KGlobalAccelPrivate::ActiveShortcut, KGlobalAccel::Autoloading);
-
- // how componentName and actionId map to QAction, e.g:
-@@ -740,19 +676,11 @@ QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, c
-
- void KGlobalAccel::removeAllShortcuts(QAction *action)
- {
-- if (!active()) {
-- return;
-- }
--
- d->remove(action, KGlobalAccelPrivate::UnRegister);
- }
-
- bool KGlobalAccel::hasShortcut(const QAction *action) const
- {
-- if (!active()) {
-- return false;
-- }
--
- return d->actionShortcuts.contains(action) || d->actionDefaultShortcuts.contains(action);
- }
-
-@@ -765,10 +693,6 @@ bool KGlobalAccel::eventFilter(QObject *watched, QEvent *event)
-
- bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList<QKeySequence> &shortcut)
- {
-- if (!active()) {
-- return false;
-- }
--
- KGlobalAccel *g = KGlobalAccel::self();
- return g->d->setShortcutWithDefault(action, shortcut, Autoloading);
- }
-@@ -780,10 +704,6 @@ bool KGlobalAccel::setGlobalShortcut(QAction *action, const QKeySequence &shortc
-
- bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList<QKeySequence> &shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag)
- {
-- if (!active()) {
-- return false;
-- }
--
- if (checkGarbageKeycode(shortcut)) {
- return false;
- }
---
-GitLab
-
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.ebuild
index 5cf9c27bbefb..3f0aae37e5cf 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.115.0.ebuild
@@ -1,20 +1,21 @@
-# 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
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 to handle global shortcuts"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="kf6compat"
-DEPEND="
+RESTRICT="test" # requires installed instance
+
+COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -27,12 +28,24 @@ DEPEND="
x11-libs/libxcb
x11-libs/xcb-util-keysyms
"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ =kde-frameworks/kdeclarative-${PVCUT}*:5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ kf6compat? ( kde-plasma/kglobalacceld:6 )
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-PATCHES=(
- "${FILESDIR}"/${P}-revert-prevent-activate-w-o-plasma.patch # KDE-bug 437034
-)
+src_configure() {
+ local mycmakeargs=(
+ -DKF6_COMPAT_BUILD=$(usex kf6compat)
+ )
+ ecm_src_configure
+}
src_test() {
XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.84.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.84.0.ebuild
deleted file mode 100644
index c07636e53c53..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.84.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle global shortcuts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
-"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
-
-src_test() {
- XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
-}
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild
new file mode 100644
index 000000000000..3fbcff390fe6
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-6.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to handle global shortcuts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml
index 2fdbf33d963d..72a6fda39c07 100644
--- a/kde-frameworks/kglobalaccel/metadata.xml
+++ b/kde-frameworks/kglobalaccel/metadata.xml
@@ -1,8 +1,20 @@
<?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>
+ <remote-id type="kde-invent">frameworks/kglobalaccel</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+ <use>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+ </use>
</pkgmetadata>
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 88dbecd9e392..e61c9a99943b 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kguiaddons-5.82.0.tar.xz 59020 BLAKE2B 7954f85a013b0ea5a69f524a7a8e4f715aae3a6e526c9f574e8d185bb3d840fc16a7556424c9183b51782007f39df2470d2f511ab9fb486ac61da245b7df1970 SHA512 8713b2036371240e92503e4be51bdd16a354bc08f1831fe242f64841945ce99e1c1e3a62d367f1c07c4769768d724341733c6f1360985e215bfd3a85d2574ca6
-DIST kguiaddons-5.84.0.tar.xz 60652 BLAKE2B 7cd64e6c0a4aac5878204c076c50f7720175f025225436f3a67e545f7ac96004146b0280c6b483b5fcdc274a9ee939545f2058c07a59f2ef8233731aa9bc114b SHA512 7dc5d417e2b214b0d2a98b64162a570be14b74202a3aa6cd12d699c9372a9ad7e32b778f0a70266f9dee8b88cb5381aa6157d9ce6774f26e134aa6c79005bf57
+DIST kguiaddons-5.115.0.tar.xz 78428 BLAKE2B 95b7867c2d81245bfa82da1707a7962b4a3ca60409d0bb2d3a7d7181c12f96d96cf59b7ff5459cf5584d01a0bb12a42d69699b14a39ed5c563afa9243d89bb5d SHA512 4416b0f9d2a9859fe2a8b24cb25405ea4eaa0670168348eaedf5a8e44ade59f582118f8ad7525e5829bac5dc6d4b56dd1e47b58e5df6bbe4226a8039a27ff5aa
+DIST kguiaddons-6.1.0.tar.xz 82260 BLAKE2B 490a16ce270e344bc95870f8ebc8a9011ba3f70672687384acef91c6510a8aabb4d14d289fe2d54561c8a3d04c5172e3e45204675018a66bce48d835c1fb13a2 SHA512 e4413c692099cc946c260917777fd57e0ffac9bb3a251b70653f7557c64889558a3565896b4c79643504549b29a8b87b28b8cd98bf7762cb4c7056c5e563b869
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.115.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.115.0.ebuild
new file mode 100644
index 000000000000..abea3ab05df7
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.115.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="dbus kf6compat wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+COMMON_DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+ wayland? (
+ dev-libs/wayland
+ >=dev-qt/qtgui-${QTMIN}:5=[wayland]
+ >=dev-qt/qtwayland-${QTMIN}:5
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+ wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
+ X? ( x11-libs/libxcb )
+"
+RDEPEND="${COMMON_DEPEND}
+ kf6compat? ( kde-frameworks/kguiaddons:6 )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_GEO_SCHEME_HANDLER=$(usex !kf6compat)
+ -DWITH_DBUS=$(usex dbus)
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
deleted file mode 100644
index 7d5fb2750491..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.82.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
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland"
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5[wayland?]
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- wayland? (
- dev-libs/wayland
- >=dev-qt/qtwayland-${QTMIN}:5
- )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libxcb
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- -DWITH_WAYLAND=$(usex wayland)
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.84.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.84.0.ebuild
deleted file mode 100644
index fbdfcada5f5d..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.84.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
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="wayland"
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5[wayland?]
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- wayland? (
- dev-libs/wayland
- >=dev-qt/qtwayland-${QTMIN}:5
- )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libxcb
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- -DWITH_WAYLAND=$(usex wayland)
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild
new file mode 100644
index 000000000000..14139ab53c1c
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="dbus wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+COMMON_DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus?,gui]
+ wayland? (
+ dev-libs/wayland
+ >=dev-qt/qtbase-${QTMIN}:6=[wayland]
+ >=dev-qt/qtwayland-${QTMIN}:6
+ )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+ wayland? ( >=dev-libs/plasma-wayland-protocols-1.11.1 )
+ X? ( x11-libs/libxcb )
+"
+RDEPEND="${COMMON_DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_GEO_SCHEME_HANDLER=ON
+ -DWITH_DBUS=$(usex dbus)
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/metadata.xml b/kde-frameworks/kguiaddons/metadata.xml
index 2fdbf33d963d..36ef35ac2598 100644
--- a/kde-frameworks/kguiaddons/metadata.xml
+++ b/kde-frameworks/kguiaddons/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>
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index bc0506524cf5..8822a46f156d 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,2 +1,2 @@
-DIST kholidays-5.82.0.tar.xz 226732 BLAKE2B 76a1f0adbe3a558b2cf6aac7782795fad869423cb42e70fe5f8dabbc1d5aa0b5a6e5036d7fd68b8bbf6fffc63e095a471a72afd9501c328f2a7878e20e53996e SHA512 902065bc4d1ea733d24adf349bc895020eb49ec1d3f98c3e8ef4a59e3d0c968e998081c7ff1a18466201372c6f51fa9ae251e747da1b959f696975c886a42306
-DIST kholidays-5.84.0.tar.xz 229300 BLAKE2B c42de513b633124311f22a0f56d180cc5b311c413df80688641b8f5adf55f05ed974fe6c8c0369959ac5c79382cdc04f418bab3675b8d90d1ccb691b931938f7 SHA512 e6c8f45de3bc76df6f66c0b4423214244361cf48bd752ae3f38e5dd3f6f7641a65311aafb4c594618fe5b763bbbf18c25787bf1a7a1e6fdbe42d70b0cc5d1f11
+DIST kholidays-5.115.0.tar.xz 255936 BLAKE2B 13c041432c1f773c1375d9ded0027e03c7bb85684172e540d72d12ded9650499b9a306452c777ed18480b96d9de3751cc28b3cce4181e7bfaafdc98db852e876 SHA512 db1c7d1575c1037e3de2ca96999d58b95e7c50c7d60483704723bec90fb738136d31895e04fa4256674b983831c812df87d7256582342c39af3213b209ca1378
+DIST kholidays-6.1.0.tar.xz 254140 BLAKE2B 1215bf6415d1eab42aa14b4fc15f7e3c27aa26cf9b9b030d2104765b2978021e7c2539fb8016955e5f7b50f0e8e8e5f70eae6eb36c800ed094687da6067ad94c SHA512 d2f3f5c3039f2ee55292edc427da863b0dfb364c57f74aeebcb6c8a85664c58aedbc810f1daec08e905decc3037d373607b0cc40929347030c2d2fef504663ff
diff --git a/kde-frameworks/kholidays/kholidays-5.82.0.ebuild b/kde-frameworks/kholidays/kholidays-5.115.0.ebuild
index 989fcd276531..28cb7a379ef5 100644
--- a/kde-frameworks/kholidays/kholidays-5.82.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.115.0.ebuild
@@ -1,25 +1,22 @@
-# 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_QTHELP="false"
ECM_TEST="true"
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
-"
+DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:5"
RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
src_test() {
# bug 624214
diff --git a/kde-frameworks/kholidays/kholidays-5.84.0.ebuild b/kde-frameworks/kholidays/kholidays-5.84.0.ebuild
deleted file mode 100644
index fb3d3ebf8123..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.84.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="true"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
- # bug 624214
- mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
- cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
- ecm_src_test
-}
diff --git a/kde-frameworks/kholidays/kholidays-6.1.0.ebuild b/kde-frameworks/kholidays/kholidays-6.1.0.ebuild
new file mode 100644
index 000000000000..0c57cf515b63
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-6.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:6"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_test() {
+ # bug 624214
+ mkdir -p "${HOME}/.local/share/kf6/libkholidays" || die
+ cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf6/libkholidays/" || die
+ ecm_src_test
+}
diff --git a/kde-frameworks/kholidays/metadata.xml b/kde-frameworks/kholidays/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kholidays/metadata.xml
+++ b/kde-frameworks/kholidays/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 83ce0cea9315..5bf2bcc69881 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1 @@
-DIST khtml-5.82.0.tar.xz 2093168 BLAKE2B e4cbcd5e187d8ba563090097d362ed6138575da93ce3c25796e1112b3a39c135ffd53d4dbd7302a9482069111bdc01291027a9ea6253ace972b19983db5b6386 SHA512 8aa3c615cc13deee3e4859f84636fd1cd18190b0a99849a6782b0a106a1a8808061258e055158cbd3dc15d5842ce3cc82fca8eff2fbd1634807744a0f7288cc0
-DIST khtml-5.84.0.tar.xz 2093204 BLAKE2B a5dba85ebb522b5a995e2f23053300332abad6708576adb4338eb888ff85c8bd0cf8d2bcb779470cf7db3ed935bc6426828be7dece1fc17ee1d67919fce26877 SHA512 d70d8c95e10d817a03231396058c03f2c242deb4ec28478e6e94389e0167f38e3836500fbf58afa050d741e94f7043040550ca77bcb696b3c0c944d3c0e34017
+DIST khtml-5.115.0.tar.xz 4012440 BLAKE2B 490005551036e3b14cd036af07fed97e2109fa4c6c2782f4086bdf612688652d1992b19b2d83c26efa70d4ea0025f96e6398df9fe0f803f6fee6ae03311379d5 SHA512 0141aca1b04a779522fb7a7c93e6ec1795b09cebe7f2b079698b076556b78aff807b90462199784e3fdfcddeb97da23a68910c52542994b39f327c5b4a4f1ddc
diff --git a/kde-frameworks/khtml/khtml-5.82.0.ebuild b/kde-frameworks/khtml/khtml-5.115.0.ebuild
index 5b47c7524567..82be319b7559 100644
--- a/kde-frameworks/khtml/khtml-5.82.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.115.0.ebuild
@@ -1,23 +1,19 @@
-# 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_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm flag-o-matic frameworks.kde.org
DESCRIPTION="KHTML web rendering engine"
+
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="X"
-BDEPEND="
- dev-lang/perl
- dev-util/gperf
-"
RDEPEND="
dev-libs/openssl:0
>=dev-qt/qtdbus-${QTMIN}:5
@@ -44,14 +40,14 @@ RDEPEND="
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwallet-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/sonnet-${PVCUT}*:5
media-libs/giflib:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
- >=media-libs/phonon-4.11.0
+ >=media-libs/phonon-4.11.0[qt5(+)]
sys-libs/zlib
- virtual/jpeg:0
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
@@ -61,10 +57,16 @@ DEPEND="${RDEPEND}
test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
X? ( x11-base/xorg-proto )
"
+BDEPEND="
+ dev-lang/perl
+ dev-util/gperf
+"
src_configure() {
+ filter-lto # bug 921686
+
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
diff --git a/kde-frameworks/khtml/khtml-5.84.0.ebuild b/kde-frameworks/khtml/khtml-5.84.0.ebuild
deleted file mode 100644
index 59dac9b04cbd..000000000000
--- a/kde-frameworks/khtml/khtml-5.84.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-BDEPEND="
- dev-lang/perl
- dev-util/gperf
-"
-RDEPEND="
- dev-libs/openssl:0
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/kjs-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kparts-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwallet-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/sonnet-${PVCUT}*:5
- media-libs/giflib:=
- media-libs/libpng:0=
- >=media-libs/phonon-4.11.0
- sys-libs/zlib
- virtual/jpeg:0
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
- X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/khtml/metadata.xml b/kde-frameworks/khtml/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/khtml/metadata.xml
+++ b/kde-frameworks/khtml/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index a3c68d53b7b6..180d067ac281 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1,2 @@
-DIST ki18n-5.82.0.tar.xz 590552 BLAKE2B 628acb64959fa4b38ddc44c586218d1841b03dca2ed11d72ba235bd9868b50f63f95e46847783af14ff465f9f89fa8c63526631dc648b1f9baa6a02130ae9e28 SHA512 a0f84494897d5c614923581bb3df016ba8801b7404b933c7cf85b158be96baa0cc87199a4798a694654fa80ad8204085a2fb6da8e6f930156071261b213894eb
-DIST ki18n-5.84.0.tar.xz 590056 BLAKE2B 50206b4a890c24a0ec6928690e51e0838b559dedc291a841682f6a80b9ef2f01760b82e422020e278b338953400947b21f5c1a3578680a24dd9a1e0ceb552a23 SHA512 eb389524041871035c166d12992f84e0d1fb34c2bf0f8faf906c469126622026e9a233b60ec841584fe694d7606246c0628146dd00ccde238c8a016c81a74273
+DIST ki18n-5.115.1.tar.xz 3130088 BLAKE2B e6a256fd8ffc99dfd3e670b9a7cda089f8505748010a593b9151efe309e1beefb6692ce392bb8cec774e7022be4c42ed3f62649c893a540a7f7c137494c67035 SHA512 fb1b1cddc9fdf36bc0c1d9a1505265c7c7d72451d85d695d56aa24ff577ddeb7fafac0c911dfd2b173705ed810d613a180ffb1f293c0051c4051791dc164bd0a
+DIST ki18n-6.1.0.tar.xz 3125964 BLAKE2B 230411527978f0ec35f81e85403be08a05e7102afffbfeb5d1dc918605d307be902b153434a210c4d8da313effde8eb95f1438de7dc4ec1b9f706626e072277f SHA512 2f748d813a5b185b0f14932b589be6926b456c693d80e6f6dac1b15b91f5160001f426df833bac67147b9796874b723bf224206960d228561ff6bfd0a9b04cac
diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
deleted file mode 100644
index 8b863e4e0fca..000000000000
--- a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/KF5I18nMacros.cmake.in 2019-04-07 09:28:26.000000000 +0200
-+++ b/cmake/KF5I18nMacros.cmake.in 2019-04-20 20:56:41.628484762 +0200
-@@ -31,7 +31,7 @@
- # solution if it cannot be found in $PATH when building applications.
- set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
-
--find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
-+find_program(KI18N_PYTHON_EXECUTABLE NAMES python)
- if(NOT KI18N_PYTHON_EXECUTABLE)
- set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
- endif()
diff --git a/kde-frameworks/ki18n/ki18n-5.82.0.ebuild b/kde-frameworks/ki18n/ki18n-5.115.1.ebuild
index 022390944984..df8e2d76b599 100644
--- a/kde-frameworks/ki18n/ki18n-5.82.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.115.1.ebuild
@@ -1,29 +1,38 @@
-# 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
-PYTHON_COMPAT=( python3_{7..10} )
-QTMIN=5.15.2
-inherit ecm kde.org python-single-r1
+PYTHON_COMPAT=( python3_{10..12} )
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org python-single-r1
DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
>=dev-qt/qtdeclarative-${QTMIN}:5
sys-devel/gettext
virtual/libintl
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+"
-PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
+CMAKE_SKIP_TESTS=(
+ # bug 876496
+ kcatalogtest
+ # requires LANG fr_CH. bugs 823816
+ kcountrytest
+ kcountrysubdivisiontest
+)
pkg_setup() {
ecm_pkg_setup
@@ -32,7 +41,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-DPYTHON_EXECUTABLE="${PYTHON}"
)
ecm_src_configure
diff --git a/kde-frameworks/ki18n/ki18n-5.84.0.ebuild b/kde-frameworks/ki18n/ki18n-5.84.0.ebuild
deleted file mode 100644
index 54d5116bdbe9..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.84.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-QTMIN=5.15.2
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-qt/qtdeclarative-${QTMIN}:5
- sys-devel/gettext
- virtual/libintl
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
-
-pkg_setup() {
- ecm_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/ki18n/ki18n-6.1.0.ebuild b/kde-frameworks/ki18n/ki18n-6.1.0.ebuild
new file mode 100644
index 000000000000..9e4f4670a6a8
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-6.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ sys-devel/gettext
+ virtual/libintl
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+"
+
+CMAKE_SKIP_TESTS=(
+ # bug 876496
+ kcatalogtest
+ # requires LANG fr_CH. bugs 823816
+ kcountrytest
+ kcountrysubdivisiontest
+)
+
+pkg_setup() {
+ ecm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/ki18n/metadata.xml b/kde-frameworks/ki18n/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/ki18n/metadata.xml
+++ b/kde-frameworks/ki18n/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 0a626027e55b..8c1d075e31fa 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1,2 @@
-DIST kiconthemes-5.82.0.tar.xz 222884 BLAKE2B fd7404f50ec503e853d25fff6b61d55a133a26f7fec9a2a4b50da15d721ef9a2ca116b2307a6eeed7316693a68ca053f0d955d0417b19e0aa79bc6a6eaf64c25 SHA512 b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb
-DIST kiconthemes-5.84.0.tar.xz 222912 BLAKE2B 8f1a01d476475346ab2dddb2ecc8755b44696f66e84e01444d976a8dfb60014f14ef4f50c4775cf4321dbd6ec3d7d3418ff0abdc003c8295029dd30d33453791 SHA512 6bf175fd39dfda5b649a2f1a27553e035e0a3c1f4962ea589eccf468d7a573491e38df99b4f6231417f23beb1d80e104cf2ffffd83427399dff1c442f59c1edc
+DIST kiconthemes-5.115.0.tar.xz 1312068 BLAKE2B 6e40e89610031f5ed9cffbd4c847c1475ee8229810cb917e82837003db714854f96ceabc1e997e7a6c6197de00d84c946fcb51c4527fd203d9a917058160a871 SHA512 7cbfe721f45a9edda811fffdb2599452011b679fd5ffdc9088da009de4e712700a6b31cadf0ce24025fe3c264d5169eaae505a9080da123613dd47a8ffb43b6f
+DIST kiconthemes-6.1.0.tar.xz 1315904 BLAKE2B 8648cd1f7d921dd31d0509bbfd4f346041e64e119ad6e3b514c1decffcf20c7270b3544e780e1fdf1b10c799f0e6f4f6d66ebf228a731d5adc5da933993be0d0 SHA512 a0f0210be8e464518770762f99d072c688872d2b9f324fa12830bdee78c9cf9439514b83ce87a6e526815dd7fbeaa76b6027a0c5cff6119052ccbac8ec8635c2
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.115.0.ebuild
index 70c837abb197..d7ee4712379b 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.115.0.ebuild
@@ -1,22 +1,21 @@
-# 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_DESIGNERPLUGIN="true"
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 icon theming and configuration"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE=""
-RESTRICT+=" test" # bug 574770
+RESTRICT="test" # bug 574770
-DEPEND="
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
@@ -26,7 +25,8 @@ DEPEND="
=kde-frameworks/kconfigwidgets-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.84.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.84.0.ebuild
deleted file mode 100644
index c189858f25fa..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.84.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # bug 574770
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild
new file mode 100644
index 000000000000..ab3f30c4325c
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-6.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test" # bug 574770
+
+# slot op: Uses Qt6::GuiPrivate for qiconloader_p.h, qguiapplication_p.h
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kiconthemes/metadata.xml b/kde-frameworks/kiconthemes/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kiconthemes/metadata.xml
+++ b/kde-frameworks/kiconthemes/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 75511ba40fb5..edd336766d21 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1,2 @@
-DIST kidletime-5.82.0.tar.xz 26040 BLAKE2B b5e7ee686c9ffaefc0f321bfff15f0ee633b04ba07753702d2f76ebb069704fd9c5042904e726e617754432df6caacd305b0c4095178b71077801089a76f29dc SHA512 35cb528aeaf0d28ace354eff8f65812bbc8fc7f0b8b01ac93b8317de6267d93d1e1808ddb5b136c0ec9980544f27518cea2c3c577dd8252be05b8fdecb396f39
-DIST kidletime-5.84.0.tar.xz 26116 BLAKE2B 4b0f6328d36ce0c9f81d13c507f014dba801f07b09bfed29b63f5abfd454223fdc411b56e4018d2ac24b9a1ba21395cd536d9e1f79acf559f94c4893d7033e4b SHA512 f6438322b11880d848a51f7b9ce152c0a2e3a4bb38611a8d4bc878a9f8fd685ab909c8015adac946754b9675846e4a22390c891ce808291b87fb4700cccfc683
+DIST kidletime-5.115.0.tar.xz 30936 BLAKE2B 060cab0d4ca5ac4bd831015fc70829f4d5b2cc5f6c4404a08832f044f497fe50a9cee3f84926ac5ceba5b66043fd81b2e279a99d159a68bf412e759bf3114627 SHA512 63b7d62dbdb5b8eb8ff3337616984951ae233b859fe8724604058b3217de454957dcc17152d0ab8a4091c8360020962e3730b4ee7cec4532f86b8d0de79a1143
+DIST kidletime-6.1.0.tar.xz 30912 BLAKE2B 80f69554332cc74444497d2e3ac554400eed9c937aa066f16ae5331caf3f40a33836e583f42d759a161ef9b1348391dc1e6b5fd8f6cc5d7e6bdabb25f7712c50 SHA512 9a958ccfb6a0b4bb32b481279b9ca0f96ab84a9400ed68da7c3712fefec070983d9c00e29ed9f6a53409796f73db4e32c41ebe275dd51ece21b6b00044f94828
diff --git a/kde-frameworks/kidletime/kidletime-5.82.0.ebuild b/kde-frameworks/kidletime/kidletime-5.115.0.ebuild
index 92c08daf1e9a..b04194e6d91f 100644
--- a/kde-frameworks/kidletime/kidletime-5.82.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.115.0.ebuild
@@ -1,21 +1,27 @@
-# 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="false"
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for detection and notification of device idle time"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X xscreensaver"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="wayland X xscreensaver"
REQUIRED_USE="xscreensaver? ( X )"
-DEPEND="
+RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
+ wayland? (
+ dev-libs/wayland
+ >=dev-qt/qtgui-${QTMIN}:5=[wayland]
+ >=dev-qt/qtwayland-${QTMIN}:5
+ )
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
@@ -27,7 +33,13 @@ DEPEND="
x11-libs/libXScrnSaver
)
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ wayland? (
+ >=dev-libs/plasma-wayland-protocols-1.7.0
+ >=dev-libs/wayland-protocols-1.27:0
+ )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
src_prepare() {
ecm_src_prepare
@@ -38,6 +50,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ $(cmake_use_find_package wayland Qt5WaylandClient)
$(cmake_use_find_package X X11)
$(cmake_use_find_package X XCB)
)
diff --git a/kde-frameworks/kidletime/kidletime-5.84.0.ebuild b/kde-frameworks/kidletime/kidletime-5.84.0.ebuild
deleted file mode 100644
index d19acffec7cc..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.84.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXext
- )
- xscreensaver? (
- >=dev-qt/qtdbus-${QTMIN}:5
- x11-libs/libXScrnSaver
- )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- ecm_src_prepare
- if ! use xscreensaver; then
- sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kidletime/kidletime-6.1.0.ebuild b/kde-frameworks/kidletime/kidletime-6.1.0.ebuild
new file mode 100644
index 000000000000..a4213e68004d
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-6.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="wayland X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ wayland? (
+ dev-libs/wayland
+ >=dev-qt/qtbase-${QTMIN}:6=[wayland]
+ >=dev-qt/qtwayland-${QTMIN}:6
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXext
+ )
+ xscreensaver? (
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
+ x11-libs/libXScrnSaver
+ )
+"
+DEPEND="${RDEPEND}
+ wayland? (
+ >=dev-libs/plasma-wayland-protocols-1.11.1
+ >=dev-libs/wayland-protocols-1.27:0
+ )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+src_prepare() {
+ ecm_src_prepare
+ if ! use xscreensaver; then
+ sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kidletime/metadata.xml b/kde-frameworks/kidletime/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kidletime/metadata.xml
+++ b/kde-frameworks/kidletime/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index e21fecd08991..a75fefdc8390 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1,2 @@
-DIST kimageformats-5.82.0.tar.xz 590128 BLAKE2B 2136a68dd1c7a9dd6c07da180d228ceafdeeb6c7bc35af66e53709c33e9bef40c4bc37a78243c29ae8041d1f92b365c809de34fa134ba66494dd50fad1f4ae81 SHA512 7f24763602a47eb580685164ae0ca2d074859eabed449c41ec28385a5cc9d2dc0ef348809e98452a320268fde37e1569e324c75b3de3908b7070a78749cdf56a
-DIST kimageformats-5.84.0.tar.xz 590576 BLAKE2B 0143400e0e93ada1424778a4787073308711a3c1ee4949e725989dfc17a8cc2d5621b13f136ea0c40f3e1a2a731f3e8b8c6d58bcb0880982011c668568294a17 SHA512 b4b820465399c910530280705b650dfaffdc3c3862ca2f9630be466c3ddc78350ef1d10852cb2ec240ac798fa325249bf8cd61c54592d680f03fbf238ee63e41
+DIST kimageformats-5.115.0.tar.xz 15757728 BLAKE2B 911215f6271a367f61ba47531cd258ef3b8471d239550770d738ee3de28f1e5b7ca6a15f904c8080c8c11cb34b26627206d281fafc55b86daa5a3ea0096c1ab0 SHA512 826cd5670ff7064163aeda2097cc2cf95d1d997e67d6c7e9ac40e54f797246d0a527fe01b4d90a2d052e8de10d57ae5d2c1bf8f23a4444d030b242cfc481517f
+DIST kimageformats-6.1.0.tar.xz 15921424 BLAKE2B 71e21c9b839673b2d50ee69368ac595f7a1b6f1ec558ad42f231b6c27c8d1157d801b4ae46e8eeb68297f40a9b8ed269493be7925c7739ec08215708f3dbdfcd SHA512 99bf723b4a250d5d0c45cc5f77d2149e900f75a65fb70b2b2cd3cf61b60ba62ab7b17251a9a9f9c033681261f7ef4a5a4d5298d15a83d7327395884849ced157
diff --git a/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.115.0.ebuild
index d77bef9a633d..caba00cf9789 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.115.0.ebuild
@@ -1,41 +1,46 @@
-# 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_QTHELP="false"
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 providing additional format plugins for Qt's image I/O system"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="avif eps heif openexr"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="avif eps heif jpegxl openexr raw"
-DEPEND="
+RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
=kde-frameworks/karchive-${PVCUT}*:5
- avif? ( >=media-libs/libavif-0.8.2 )
+ avif? ( >=media-libs/libavif-0.8.2:= )
eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
heif? ( >=media-libs/libheif-1.10.0:= )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr:=
+ jpegxl? ( media-libs/libjxl:= )
+ openexr? ( >=media-libs/openexr-3:= )
+ raw? ( media-libs/libraw:= )
+"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-qt/qtimageformats-${QTMIN}:5
+ heif? ( media-libs/libheif[x265] )
)
"
-RDEPEND="${DEPEND}"
DOCS=( src/imageformats/AUTHORS )
src_configure() {
local mycmakeargs=(
+ -DKIMAGEFORMATS_JXL=$(usex jpegxl)
$(cmake_use_find_package avif libavif)
$(cmake_use_find_package eps Qt5PrintSupport)
-DKIMAGEFORMATS_HEIF=$(usex heif)
$(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package raw LibRaw)
)
-
ecm_src_configure
}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild b/kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild
deleted file mode 100644
index d289229e7c20..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.84.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="avif eps heif openexr"
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- avif? ( >=media-libs/libavif-0.8.2 )
- eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
- heif? ( >=media-libs/libheif-1.10.0:= )
- openexr? (
- || (
- (
- media-libs/ilmbase:0
- <media-libs/openexr-3.0.0:0
- )
- (
- dev-libs/imath:3
- media-libs/openexr:3
- )
- )
- )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package avif libavif)
- $(cmake_use_find_package eps Qt5PrintSupport)
- -DKIMAGEFORMATS_HEIF=$(usex heif)
- $(cmake_use_find_package openexr OpenEXR)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-6.1.0.ebuild b/kde-frameworks/kimageformats/kimageformats-6.1.0.ebuild
new file mode 100644
index 000000000000..3568b85e4894
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-6.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="avif eps heif jpegxl openexr raw"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ =kde-frameworks/karchive-${PVCUT}*:6
+ avif? ( >=media-libs/libavif-0.8.2:= )
+ eps? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+ heif? ( >=media-libs/libheif-1.10.0:= )
+ jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+ openexr? ( >=media-libs/openexr-3:= )
+ raw? ( media-libs/libraw:= )
+"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-qt/qtimageformats-${QTMIN}:6
+ heif? ( media-libs/libheif[x265] )
+ )
+"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIMAGEFORMATS_JXL=$(usex jpegxl)
+ $(cmake_use_find_package avif libavif)
+ $(cmake_use_find_package eps Qt6PrintSupport)
+ -DKIMAGEFORMATS_HEIF=$(usex heif)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package raw LibRaw)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml
index 4d43b5889861..bd72f24c838a 100644
--- a/kde-frameworks/kimageformats/metadata.xml
+++ b/kde-frameworks/kimageformats/metadata.xml
@@ -1,13 +1,20 @@
<?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>
+ <remote-id type="cpe">cpe:/a:kde:kimageformats</remote-id>
+ </upstream>
<use>
- <flag name="avif">Support the AVIF image file format</flag>
<flag name="eps">Support the EPS graphics file format</flag>
- <flag name="heif">Support for HEIF/HEIC images</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 14ff225cc3c0..e1dbbc2f2fe5 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1 @@
-DIST kinit-5.82.0.tar.xz 121448 BLAKE2B 1c38e31d9ab2231a808edbb713629d91d1068263a56426303428e20b066256381030278cebc30fb45234df92bcf30fef40ad2a3a2e4066f643ce172f6c701862 SHA512 7c6dc83d1ea10a8271fe23a45a7e5bfc7e67a7f9c25914386d65157f253c98fc518aba4a4cd7d724d1684097e3e94e866e18165debe0717e7917572436fe3af2
-DIST kinit-5.84.0.tar.xz 121616 BLAKE2B 6108c9dcf5b4ed490a4675a7baf42f47b61b9fcd4420d563dffc637f1ace47dc29cb9701c271f0d0809942e4e929aa86f2e217e9acdca0a2cc680903fd420d01 SHA512 0b60d0dc81636b8f0950ce1e12223660d11999ffcf580b76aaec793b08f98c38906c8bbd891e036a3106ae23d40057ca20ca6a66b5e6f3384f688cb8b1524807
+DIST kinit-5.115.0.tar.xz 2405120 BLAKE2B 92bb1ec3437b926942e1fea6133c36f1d7f930d862209b5849736f9d8cc375f6dc527fda13b17f88ee0a5de92a66edc4a3d5297cf6f644e5dfc38b6cbd037919 SHA512 bb8026aee90a2be5314ad941c31554f5f9e59ed387fc4cf393486485ad530bdb8a6cb8f020f90472c5241190404730ed0a70025ea24b9536bba5ba5bc123ea7f
diff --git a/kde-frameworks/kinit/kinit-5.82.0.ebuild b/kde-frameworks/kinit/kinit-5.115.0.ebuild
index c387cd4a13ba..c8a289d57e65 100644
--- a/kde-frameworks/kinit/kinit-5.82.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.115.0.ebuild
@@ -1,23 +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_QTHELP="false"
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+DESCRIPTION="Helper library to speed up start of applications on KDE workspaces"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="+caps +man X"
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -28,7 +25,7 @@ RDEPEND="
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
caps? ( sys-libs/libcap )
X? (
x11-libs/libX11
@@ -38,13 +35,13 @@ RDEPEND="
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package caps Libcap)
$(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
diff --git a/kde-frameworks/kinit/kinit-5.84.0.ebuild b/kde-frameworks/kinit/kinit-5.84.0.ebuild
deleted file mode 100644
index fa069ce12404..000000000000
--- a/kde-frameworks/kinit/kinit-5.84.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+caps +man X"
-
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- caps? ( sys-libs/libcap )
- X? (
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package caps Libcap)
- $(cmake_use_find_package man KF5DocTools)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kinit/metadata.xml b/kde-frameworks/kinit/metadata.xml
index 6282b0801fd3..96fc769daf4d 100644
--- a/kde-frameworks/kinit/metadata.xml
+++ b/kde-frameworks/kinit/metadata.xml
@@ -1,11 +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="caps">Capabilities support for improved security and better OOM handling</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 65814fb9a7c7..e66eeccc6fdd 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,2 @@
-DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
-DIST kio-5.84.0.tar.xz 3191612 BLAKE2B 1d1788f4c731d6802eff504f4cba5569847dfbd506d25685f5c9d2218a88eb8ffca3d01f9290567ef368f0104ed322586015e6536e2ef07120803a2adbba5e2d SHA512 4c041b33171014562469c8ee074f85595edd503c0cb4c66aa5a17bad24937b71094826df2f3734b3d244d93b812e933f6ddc095628f2b25d5fca34c793383af9
+DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7
+DIST kio-6.1.0.tar.xz 3358572 BLAKE2B 07ee9b8f64735989d51b463bd4eac26867ae12cb4df6153b158cad1eea4630d9904f3d3403b9d3d87de7db5010bccbd4f88141fdbdc76c0501d41acc96b9c2bc SHA512 dcdd0a13d7e44c75ddd19d6d03e6c57b90c2b47f1141b6dc23054dc029a11358bb9748b8bb2115129cc1ab3769034728b3dd35507772807542376b3ef7b47707
diff --git a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
deleted file mode 100644
index 42637cd6e1e7..000000000000
--- a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 23 Apr 2021 20:10:31 +0200
-Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from
- KF5KIOConfig.cmake.in
-
-This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can
-see it is only a KIO build time dependency with no Qt5Concurrent header being
-used in KIO headers.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- KF5KIOConfig.cmake.in | 1 -
- src/core/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in
-index 687ec512..749e9b9b 100644
---- a/KF5KIOConfig.cmake.in
-+++ b/KF5KIOConfig.cmake.in
-@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
- endif()
-
- find_dependency(Qt5Network "@REQUIRED_QT_VERSION@")
--find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@")
- find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
-
- include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 76c3061c..fe4be56b 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -188,9 +188,9 @@ PUBLIC
- KF5::CoreAddons # KJob
- KF5::Service # TODO KF6 move to PRIVATE
- Qt5::Network
-- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp
- Qt5::DBus
- PRIVATE
-+ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp
- Qt5::Xml # davjob.cpp uses QDom
- KF5::ConfigCore
- KF5::I18n
---
-2.31.1
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
deleted file mode 100644
index 08d72d754d70..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e79da836c34fce66231e396c7215314d0eba51b4 Mon Sep 17 00:00:00 2001
-From: Jonathan Marten <jjm@keelhaul.me.uk>
-Date: Sat, 8 May 2021 15:20:39 +0000
-Subject: [PATCH] MimeTypeFinderJob: Resolve symlinks for a local file
-
----
- autotests/mimetypefinderjobtest.cpp | 18 +++++++++++++++++-
- src/core/mimetypefinderjob.cpp | 2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/autotests/mimetypefinderjobtest.cpp b/autotests/mimetypefinderjobtest.cpp
-index 72296b9b8..f494ff3b6 100644
---- a/autotests/mimetypefinderjobtest.cpp
-+++ b/autotests/mimetypefinderjobtest.cpp
-@@ -48,6 +48,7 @@ void MimeTypeFinderJobTest::determineMimeType_data()
- QTest::newRow("text_file_no_extension") << "text/plain" << "srcfile";
- QTest::newRow("desktop_file") << "application/x-desktop" << "foo.desktop";
- QTest::newRow("script") << "application/x-shellscript" << "srcfile.sh";
-+ QTest::newRow("directory") << "inode/directory" << "srcdir";
- /* clang-format on */
- }
-
-@@ -60,7 +61,12 @@ void MimeTypeFinderJobTest::determineMimeType()
- QTemporaryDir tempDir;
- const QString srcDir = tempDir.path();
- const QString srcFile = srcDir + QLatin1Char('/') + fileName;
-- createSrcFile(srcFile);
-+ if (mimeType == "inode/directory") {
-+ QVERIFY(QDir(srcDir).mkdir(fileName));
-+ } else {
-+ createSrcFile(srcFile);
-+ }
-+
- QVERIFY(QFile::exists(srcFile));
- const QUrl url = QUrl::fromLocalFile(srcFile);
-
-@@ -68,6 +74,16 @@ void MimeTypeFinderJobTest::determineMimeType()
- KIO::MimeTypeFinderJob *job = new KIO::MimeTypeFinderJob(url, this);
- QVERIFY2(job->exec(), qPrintable(job->errorString()));
- QCOMPARE(job->mimeType(), mimeType);
-+
-+ // Check that the result is the same when accessing the source
-+ // file through a symbolic link (bug #436708)
-+ const QString srcLink = srcDir + QLatin1String("/link_") + fileName;
-+ QVERIFY(QFile::link(srcFile, srcLink));
-+ const QUrl linkUrl = QUrl::fromLocalFile(srcLink);
-+
-+ job = new KIO::MimeTypeFinderJob(linkUrl, this);
-+ QVERIFY2(job->exec(), qPrintable(job->errorString()));
-+ QCOMPARE(job->mimeType(), mimeType);
- }
-
- void MimeTypeFinderJobTest::invalidUrl()
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index f5e50cdc4..48fc8c289 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -122,7 +122,7 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
- {
- Q_ASSERT(m_mimeTypeName.isEmpty());
-
-- KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic, KIO::HideProgressInfo);
-+ KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
- if (!m_authPrompts) {
- job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
- }
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
deleted file mode 100644
index bf3ff50802f6..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c748d6987252fafc296cde9351b289ef734cf861 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 13 May 2021 23:03:57 +0200
-Subject: [PATCH] kio_file: pass the absolute path to
- QMimeDatabase::mimeTypeForFile()
-
-Otherwise detecting the mime type based on the file content may fail and
-return application/octet-stream.
-
-And pass the whole url to createUDSEntry(), less QFile::decodeName/encodeName()
-in the middle is better and less error prone.
-
-Note that without this change a MimeTypeFinderJob could end up failing to
-find the mime type of a local file based on the file contents.
----
- src/ioslaves/file/file_unix.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index 99d46c8f1..940e3cbc4 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
- }
- #endif
-
--static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details)
-+static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
- {
- assert(entry.count() == 0); // by contract :-)
- int entries = 0;
-@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
-
- if (details & KIO::StatMimeType) {
- QMimeDatabase db;
-- entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(filename).name());
-+ entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
- }
-
- return true;
-@@ -1186,7 +1186,7 @@ void FileProtocol::listDir(const QUrl &url)
- listEntry(entry);
-
- } else {
-- if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) {
-+ if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
- #if HAVE_SYS_XATTR_H
- if (isNtfsHidden(filename)) {
- bool ntfsHidden = true;
-@@ -1476,7 +1476,7 @@ void FileProtocol::stat(const QUrl &url)
- const KIO::StatDetails details = getStatDetails();
-
- UDSEntry entry;
-- if (!createUDSEntry(url.fileName(), _path, entry, details)) {
-+ if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
- error(KIO::ERR_DOES_NOT_EXIST, path);
- return;
- }
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
deleted file mode 100644
index a9c55e1f7f24..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c19876052ecec18a87a82f5950e8909e22e895ba Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 13 May 2021 17:02:52 +0200
-Subject: [PATCH] MimeTypeFinderJob: the StatJob details should include the
- mimetype
-
-Apparently we forgot to specify that we want the UDS_MIME_TYPE field in
-the statFile() method (both when it lived in OpenUrlJob and when it was moved
-to MimeTypeFinderJob). And now there is a dedicated StatJob flag, StatMimeType,
-that we can use.
-
-Not passing KIO::StatMimeType when creating the StatJob meant the code always
-used a get job to determine the mime type, which mean that e.g. opening an
-ISO file from Dolphin, which supposedly just needs to launch Ark, had the
-whole file read into memory, which means that opening a couple of ISO's and
-you're out of memory...
-
-Thanks to sitter for doing a big chunk of the investigative work in the bug
-report.
-
-CCBUG: 398908
----
- src/core/mimetypefinderjob.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index 48fc8c289..baca58695 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -122,7 +122,9 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
- {
- Q_ASSERT(m_mimeTypeName.isEmpty());
-
-- KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
-+ static constexpr auto statFlags = KIO::StatBasic | KIO::StatResolveSymlink | KIO::StatMimeType;
-+
-+ KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, statFlags, KIO::HideProgressInfo);
- if (!m_authPrompts) {
- job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
- }
-@@ -147,6 +149,8 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
-
- const KIO::UDSEntry entry = job->statResult();
-
-+ qCDebug(KIO_CORE) << "UDSEntry from StatJob in MimeTypeFinderJob" << entry;
-+
- const QString localPath = entry.stringValue(KIO::UDSEntry::UDS_LOCAL_PATH);
- if (!localPath.isEmpty()) {
- m_url = QUrl::fromLocalFile(localPath);
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
deleted file mode 100644
index 9e59a0eb16eb..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 71484c97dee0c977a00f141123d8ccd9b93c2e96 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 14 May 2021 21:19:31 +0200
-Subject: [PATCH] kio_file: fix how createUDSEntry() is called
-
-When calling createUDSEntry() from listDir(), we need to concatenate the full
-path to the item.
-
-This is an addendum to commit c748d6987252f.
----
- src/ioslaves/file/file_unix.cpp | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index 940e3cbc4..3573c200e 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
- }
- #endif
-
--static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
-+static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QString &fullPath)
- {
- assert(entry.count() == 0); // by contract :-)
- int entries = 0;
-@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
-
- if (details & KIO::StatMimeType) {
- QMimeDatabase db;
-- entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
-+ entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(fullPath).name());
- }
-
- return true;
-@@ -1186,7 +1186,13 @@ void FileProtocol::listDir(const QUrl &url)
- listEntry(entry);
-
- } else {
-- if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
-+ QString fullPath(path);
-+ if (!fullPath.endsWith(QLatin1Char('/'))) {
-+ fullPath += QLatin1Char('/');
-+ }
-+ fullPath += filename;
-+
-+ if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, fullPath)) {
- #if HAVE_SYS_XATTR_H
- if (isNtfsHidden(filename)) {
- bool ntfsHidden = true;
-@@ -1476,7 +1482,7 @@ void FileProtocol::stat(const QUrl &url)
- const KIO::StatDetails details = getStatDetails();
-
- UDSEntry entry;
-- if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
-+ if (!createUDSEntry(url.fileName(), _path, entry, details, path)) {
- error(KIO::ERR_DOES_NOT_EXIST, path);
- return;
- }
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
deleted file mode 100644
index b92139a51871..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a38fcf356de0cbba1ce97c8ef70979ed897a8094 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Tue, 18 May 2021 19:54:54 +0200
-Subject: [PATCH] [KCoreDirLister] Guard uiDelegate(), it might be null
-
-BUG: 437153
----
- src/core/kcoredirlister.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp
-index a836f0aa..58d8791c 100644
---- a/src/core/kcoredirlister.cpp
-+++ b/src/core/kcoredirlister.cpp
-@@ -1288,7 +1288,9 @@ void KCoreDirListerCache::slotResult(KJob *j)
- Q_EMIT kdl->jobError(job);
- if (kdl->d->m_autoErrorHandling && !errorShown) {
- errorShown = true; // do it only once
-- job->uiDelegate()->showErrorMessage();
-+ if (job->uiDelegate()) {
-+ job->uiDelegate()->showErrorMessage();
-+ }
- }
- #if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82)
- kdl->handleError(job);
---
-2.31.1
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
deleted file mode 100644
index 9cc0379b6998..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 581fab08ff4d5539e4684adcffc74ec3517ce29d Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 6 May 2021 21:26:31 +0200
-Subject: [PATCH] Remove the cache KCM
-
-Same reasoning as for
-https://invent.kde.org/frameworks/kio/-/merge_requests/438.
-
-It is very targeted towards KIO-based browsers which don't really exist
-any more.
-
-The setting is also global to everything that uses KIO and it's a bit
-questionable whether for example webdav browsing in Dolphin should
-automatically have the same cache settings as network access in Choqok.
-
-It being part of system settings is also confusing for users since it
-gives the false impression of true globality. They might expect it to
-affect Firefox or Webengine-based Konqueror which it does not.
----
- docs/kcontrol5/CMakeLists.txt | 1 -
- src/kcms/kio/CMakeLists.txt | 4 +-
- src/kcms/kio/main.cpp | 4 +-
- 3 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
-index 2dd1ae16a..6c2f21b07 100644
---- a/docs/kcontrol5/CMakeLists.txt
-+++ b/docs/kcontrol5/CMakeLists.txt
-@@ -1,4 +1,3 @@
--add_subdirectory(cache)
- add_subdirectory(cookies)
- add_subdirectory(netpref)
- add_subdirectory(proxy)
-diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
-index 11cd239f2..5281fc7dc 100644
---- a/src/kcms/kio/CMakeLists.txt
-+++ b/src/kcms/kio/CMakeLists.txt
-@@ -12,11 +12,9 @@ set(kcm_kio_PART_SRCS
- smbrodlg.cpp
- kproxydlg.cpp
- netpref.cpp
-- cache.cpp
- ksaveioconfig.cpp)
-
- ki18n_wrap_ui(kcm_kio_PART_SRCS
-- cache.ui
- kproxydlg.ui
- kcookiespolicies.ui
- kcookiesmanagement.ui
-@@ -41,5 +39,5 @@ install(TARGETS kcm_kio DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-
- ########### install files ###############
-
--install( FILES smb.desktop cookies.desktop cache.desktop
-+install( FILES smb.desktop cookies.desktop
- netpref.desktop proxy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
-index 8bacb10ca..2c0ebc29b 100644
---- a/src/kcms/kio/main.cpp
-+++ b/src/kcms/kio/main.cpp
-@@ -13,7 +13,6 @@
- #include <KPluginFactory>
-
- // Local
--#include "cache.h"
- #include "kcookiesmain.h"
- #include "kproxydlg.h"
- #include "netpref.h"
-@@ -21,7 +20,6 @@
-
- K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
- registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
-- registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
-- registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
-+ registerPlugin<KCookiesMain>(QStringLiteral("cookie"));)
-
- #include "main.moc"
---
-GitLab
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
deleted file mode 100644
index ce0e891e9164..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 1aa42558a0f539abfe4bc92cf2c8078ac4adb9a0 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Wed, 5 May 2021 22:27:25 +0200
-Subject: [PATCH] Remove the Browser Identification KCM
-
-It's purpose is to control the user agent used by kio-http.
-
-Very few things use kio-http these days, not even Konqueror with the
-webengine part.
-
-For the remaining use cases (kioclient, webdav kio worker, etc.) this
-kind of configurability is overkill.
-
-Moreover being part of systemsettings this gives a false impression of
-globality. A user might change something in there and wonder why it does
-not apply to Firefox or Falkon.
-
-Given the questionable usefulness and the potential for confusion I
-propose to remove it entirely.
----
- docs/kcontrol5/CMakeLists.txt | 1 -
- src/kcms/kio/CMakeLists.txt | 18 +-
- src/kcms/kio/main.cpp | 4 +-
- 3 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
-index 1b19e5e7b..2dd1ae16a 100644
---- a/docs/kcontrol5/CMakeLists.txt
-+++ b/docs/kcontrol5/CMakeLists.txt
-@@ -4,5 +4,4 @@ add_subdirectory(netpref)
- add_subdirectory(proxy)
- add_subdirectory(smb)
- add_subdirectory(trash)
--add_subdirectory(useragent)
- add_subdirectory(webshortcuts)
-diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
-index a354651b0..11cd239f2 100644
---- a/src/kcms/kio/CMakeLists.txt
-+++ b/src/kcms/kio/CMakeLists.txt
-@@ -1,6 +1,4 @@
-
--add_subdirectory( uasproviders )
--
- find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED)
-
- ########### next target ###############
-@@ -12,31 +10,18 @@ set(kcm_kio_PART_SRCS
- kcookiesmanagement.cpp
- kcookiespolicyselectiondlg.cpp
- smbrodlg.cpp
-- useragentdlg.cpp
- kproxydlg.cpp
-- useragentinfo.cpp
-- useragentselectordlg.cpp
- netpref.cpp
- cache.cpp
- ksaveioconfig.cpp)
-
- ki18n_wrap_ui(kcm_kio_PART_SRCS
- cache.ui
-- useragentselectordlg.ui
-- useragentdlg.ui
- kproxydlg.ui
- kcookiespolicies.ui
- kcookiesmanagement.ui
- kcookiespolicyselectiondlg.ui)
-
--ecm_qt_export_logging_category(
-- IDENTIFIER KIO_USERAGENTDLG
-- CATEGORY_NAME kf.configwidgets.cms.kf.kio.useragentdlg
-- OLD_CATEGORY_NAMES kf5.kio.useragentdlg
-- DESCRIPTION "kio useragentdialog (KIO)"
-- EXPORT KIO
--)
--
- add_library(kcm_kio MODULE ${kcm_kio_PART_SRCS})
-
- target_link_libraries(kcm_kio
-@@ -56,6 +41,5 @@ install(TARGETS kcm_kio DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-
- ########### install files ###############
-
--install( FILES smb.desktop cookies.desktop useragent.desktop cache.desktop
-+install( FILES smb.desktop cookies.desktop cache.desktop
- netpref.desktop proxy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
--install( FILES uasprovider.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
-diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
-index f1b065f46..8bacb10ca 100644
---- a/src/kcms/kio/main.cpp
-+++ b/src/kcms/kio/main.cpp
-@@ -18,10 +18,8 @@
- #include "kproxydlg.h"
- #include "netpref.h"
- #include "smbrodlg.h"
--#include "useragentdlg.h"
-
--K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<UserAgentDlg>(QStringLiteral("useragent")); registerPlugin<SMBRoOptions>(QStringLiteral("smb"));
-- registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
-+K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
- registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
- registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
- registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
deleted file mode 100644
index 26383b788a01..000000000000
--- a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 Mon Sep 17 00:00:00 2001
-From: Jan Paul Batrina <jpmbatrina01@gmail.com>
-Date: Mon, 12 Jul 2021 22:06:19 +0800
-Subject: [PATCH] Use std::mem_fn instead of the deprecated/removed
- std::mem_fun
-
-std::mem_fun was deprecated in C++11 and removed from
-the standard in C++17.
-
-BUG: 439780
-NO_CHANGELOG
----
- src/widgets/kpropertiesdialog.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 3f61e8ea3..1ed8bc7d8 100644
---- a/src/widgets/kpropertiesdialog.cpp
-+++ b/src/widgets/kpropertiesdialog.cpp
-@@ -2273,7 +2273,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions()
- d->fileSystemSupportsACLs = fileSystemSupportsACL(path);
- }
- if (d->fileSystemSupportsACLs) {
-- std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun(&QWidget::hide));
-+ std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn(&QWidget::hide));
- extendedACLs = new KACLEditWidget(&dlg);
- extendedACLs->setEnabled(d->canChangePermissions);
- vbox->addWidget(extendedACLs);
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
deleted file mode 100644
index cdccada57d97..000000000000
--- a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8ad6921524c92a0cf1b58336b3ce29e159e83b7d Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 14 Jul 2021 17:06:59 +0100
-Subject: [PATCH] Fix selecting binaries from component chooser KCM
-
-In the kcmshell for a component chooser we use the open with dialog to
-select services for various scheme handlers.
-
-If you select a binary instead of a .desktop file a temporary .desktop
-file is created in ~/.local/share/applications
-
-This is in the format
-Exec=someBinary
-MimeType=x-scheme-handler/http
-
-When we then use this application for launching KIO::DesktopExecParser
-then (sort of correctly) determines that that the chosen service cannot
-handle the http scheme because even though it is a scheme handler it
-does not have a "%u" in the exec line.
-
-This leads to us potentially loading websites via kioclient or kio-fuse.
-
-Testing done:
- - kcmshell5 component chooser
- - web browser -> other -> type "/usr/bin/firefox"
- - kde-open5 http://kde.org
- - Previously this gave a local URL, now it is correct
----
- src/widgets/kopenwithdialog.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/widgets/kopenwithdialog.cpp b/src/widgets/kopenwithdialog.cpp
-index 1831878ca..31295044d 100644
---- a/src/widgets/kopenwithdialog.cpp
-+++ b/src/widgets/kopenwithdialog.cpp
-@@ -1088,6 +1088,14 @@ bool KOpenWithDialogPrivate::checkAccept()
- KConfigGroup cg = desktopFile.desktopGroup();
- cg.writeEntry("Type", "Application");
- cg.writeEntry("Name", initialServiceName);
-+
-+ // if we select a binary for a scheme handler, then it's safe to assume it can handle URLs
-+ if (qMimeType.startsWith(QLatin1String("x-scheme-handler/"))) {
-+ if (!typedExec.contains(QLatin1String("%u"), Qt::CaseInsensitive) && !typedExec.contains(QLatin1String("%f"), Qt::CaseInsensitive)) {
-+ fullExec += QStringLiteral(" %u");
-+ }
-+ }
-+
- cg.writeEntry("Exec", fullExec);
- cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu
- if (terminal->isChecked()) {
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
deleted file mode 100644
index 033b75bb00b1..000000000000
--- a/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From fb9bbb6f1fbb4e6232221a851f55ca2dc43b012c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 23 Apr 2021 20:10:31 +0200
-Subject: [PATCH] Introduce KIO_NO_PUBLIC_QTCONCURRENT option
-
-If set, move Qt5Concurrent to private link interface, drop from
-KF5KIOConfig.cmake.in. Originally added in 2f83dde2, but only used
-in the implementation, not the API.
-
-Test-built various revdeps successfully against the patched KIO
-with/without Qt5Concurrent installed, fixing implicit deps while
-at it. KDE Gear packages fixed in >=21.04.2, Plasma in >=5.21.5.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 3 +++
- KF5KIOConfig.cmake.in | 2 ++
- src/core/CMakeLists.txt | 7 ++++++-
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0063c2c..63aef43c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,6 +49,9 @@ option(KIO_ASSERT_SLAVE_STATES
- "Used to control whether slave state assertions are enabled. When not enabled only warnings are generated."
- ${ASSERT_SLAVE_STATES_DEFAULT})
-
-+# TODO KF6: remove
-+option(KIO_NO_PUBLIC_QTCONCURRENT "Privatize QtConcurrent linking, so KIO does not provide the target to revdeps.")
-+
- option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
- add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
-
-diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in
-index 687ec512..69564b3d 100644
---- a/KF5KIOConfig.cmake.in
-+++ b/KF5KIOConfig.cmake.in
-@@ -21,7 +21,9 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
- endif()
-
- find_dependency(Qt5Network "@REQUIRED_QT_VERSION@")
-+if (NOT @KIO_NO_PUBLIC_QTCONCURRENT@)
- find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@")
-+endif()
- find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
-
- include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index c09d408a..f6efee23 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -201,7 +201,6 @@ PUBLIC
- KF5::CoreAddons # KJob
- KF5::Service # TODO KF6 move to PRIVATE
- Qt5::Network
-- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp # TODO KF6 move to PRIVATE
- Qt5::DBus
- PRIVATE
- Qt5::Xml # davjob.cpp uses QDom
-@@ -211,6 +210,12 @@ PRIVATE
- KF5::DBusAddons # KDEInitInterface
- )
-
-+if(KIO_NO_PUBLIC_QTCONCURRENT)
-+ target_link_libraries(KF5KIOCore PRIVATE Qt5::Concurrent) # QtConcurrentRun in hostinfo.cpp
-+else()
-+ target_link_libraries(KF5KIOCore PUBLIC Qt5::Concurrent) # TODO KF6: remove
-+endif()
-+
- if (UNIX)
- target_link_libraries(KF5KIOCore PRIVATE KF5::AuthCore) #SlaveBase uses KAuth::Action
- endif()
---
-2.32.0
-
diff --git a/kde-frameworks/kio/kio-5.84.0-r1.ebuild b/kde-frameworks/kio/kio-5.115.0.ebuild
index e4d40e939fa3..d3dab7d256f8 100644
--- a/kde-frameworks/kio/kio-5.84.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.115.0.ebuild
@@ -1,27 +1,26 @@
-# 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_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org xdg-utils
DESCRIPTION="Framework providing transparent file and data management"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="acl kerberos kf6compat +kwallet X"
# tests hang
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
- dev-libs/libxml2
- dev-libs/libxslt
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -47,43 +46,38 @@ RDEPEND="
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
+ sys-power/switcheroo-control
acl? (
sys-apps/attr
virtual/acl
)
- handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =kde-frameworks/kdoctools-${PVCUT}*:5
+ )
kerberos? ( virtual/krb5 )
+ kf6compat? ( kde-apps/kio-extras:6 )
kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
"
DEPEND="${RDEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
test? ( sys-libs/zlib )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-PATCHES=(
- "${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971
- "${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030
- "${FILESDIR}"/${P}-fix-open-url-w-binary.patch # KDE-bug 439477
-)
-
src_configure() {
local mycmakeargs=(
-DKIO_NO_PUBLIC_QTCONCURRENT=ON
$(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
$(cmake_use_find_package kerberos GSSAPI)
$(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
+ -DKF6_COMPAT_BUILD=$(usex kf6compat)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
deleted file mode 100644
index 74aef058f24f..000000000000
--- a/kde-frameworks/kio/kio-5.82.0-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT+=" test"
-
-RDEPEND="
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kauth-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kbookmarks-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/solid-${PVCUT}*:5
- acl? (
- sys-apps/attr
- virtual/acl
- )
- handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
- kerberos? ( virtual/krb5 )
- kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
- X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
- test? ( sys-libs/zlib )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
-"
-PDEPEND="
- >=kde-frameworks/kded-${PVCUT}:5
-"
-
-PATCHES=(
- # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
- "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
- # upstream backport request - see also KDE-bug 398908
- "${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch
- "${FILESDIR}"/${P}-fix-filenamesearch-crashes.patch # KDE-bug 437153
- # git master/KIO 5.83:
- "${FILESDIR}"/${P}-no-useragent-kcm.patch
- "${FILESDIR}"/${P}-no-cache-kcm.patch
-)
-
-src_prepare() {
- ecm_src_prepare
- rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kio/kio-6.1.0.ebuild b/kde-frameworks/kio/kio-6.1.0.ebuild
new file mode 100644
index 000000000000..1cc239e93018
--- /dev/null
+++ b/kde-frameworks/kio/kio-6.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="acl +kwallet wayland X"
+
+# tests hang
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kauth-${PVCUT}*:6
+ =kde-frameworks/kbookmarks-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kcrash-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/ktextwidgets-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+ =kde-frameworks/solid-${PVCUT}*:6
+ sys-power/switcheroo-control
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kdoctools-${PVCUT}*:6
+ )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
+ X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[libproxy]
+ sys-power/switcheroo-control
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package kwallet KF6Wallet)
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml
index a421f06e8ac5..01d1befe3457 100644
--- a/kde-frameworks/kio/metadata.xml
+++ b/kde-frameworks/kio/metadata.xml
@@ -1,12 +1,21 @@
<?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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
<flag name="kwallet">Enable permanent storage of passwords for kpasswdserver with <pkg>kde-frameworks/kwallet</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 9a92d38fb4e4..d31ff44fc0c2 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,2 +1,2 @@
-DIST kirigami2-5.82.0.tar.xz 315952 BLAKE2B 470199ae252029e7abf78b1d3853f72635bd0a68a306695d2ba2a88ed2114e129a1b496cbc6084da17e9d39f5bff7c44fe0a72636f22654aad582b658484aa8f SHA512 d2a72879bca7151dfe07e55089bf61c8f3157ed78357b894a7834a05c78ee790b55afc2633e491b358b8b6c86ba73a000f17c7b224c88e19711a065debf0102e
-DIST kirigami2-5.84.0.tar.xz 319404 BLAKE2B a219a336842a782f1f726c256352f6484f685ef26c5d0f87851246c437d33eeb2ad2742bb672b3ef5253ea343b4cc5259740a37bb98640892483f8142ad24299 SHA512 d2694cecd6d0f2a18acd6c3e909232800f486db2a4a9d1d4fca2d9a416c3f5d163a4cb70c40809253aca037f19f0bb0cf8bdec8f7d5192137d9bbd0620a72566
+DIST kirigami-6.1.0.tar.xz 472340 BLAKE2B 1e4ddbdd4dc74d03c5afa982e4769b1b0e104d3bd947018031f3c115afb8e06d7e6133cbadc0f41238524de9c1d4615422a923b4859cf3af61c2f5087864d62d SHA512 2a75af0bc010120913f092f14760817c197298da4f6fc4780f5ab222de8e385864f4c88b9907acf4b03fea53759f1e2a39a2b62bcd78b8c2c1bc52129c04d207
+DIST kirigami2-5.115.0.tar.xz 383944 BLAKE2B ce95794319ebbda40d384896da4e94dcf5137d176b0c3cab53bf5223ed48e0c95486002010c74008b42857ce7d27d4840c2af0395e957d0eade18bc2f5796f87 SHA512 b99d9829f864ae59b0ae4064e0b0b24a0f33ce2c35c60b4609fd9746bb322cab26d3f9afe6ba0893b486d4c546ead98c5ba42dc33271d2fdf47e34caef35ea90
diff --git a/kde-frameworks/kirigami/kirigami-5.82.0.ebuild b/kde-frameworks/kirigami/kirigami-5.115.0.ebuild
index 3ac8f14e2561..730b8a18bb13 100644
--- a/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.115.0.ebuild
@@ -1,29 +1,25 @@
-# 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_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.2
-inherit ecm kde.org
+KDE_ORG_TAR_PN="${PN}2"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org toolchain-funcs
DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="openmp"
# requires package to already be installed
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
-"
DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
@@ -36,10 +32,20 @@ DEPEND="
RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
src_configure() {
local mycmakeargs=(
-DBUILD_EXAMPLES=$(usex examples)
+ $(cmake_use_find_package openmp OpenMP)
)
ecm_src_configure
diff --git a/kde-frameworks/kirigami/kirigami-5.84.0.ebuild b/kde-frameworks/kirigami/kirigami-5.84.0.ebuild
deleted file mode 100644
index 22c5683da45e..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.84.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_EXAMPLES=$(usex examples)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-6.1.0.ebuild b/kde-frameworks/kirigami/kirigami-6.1.0.ebuild
new file mode 100644
index 000000000000..c782a7f01808
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-6.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org toolchain-funcs
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="openmp"
+
+# requires package to already be installed
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qguiapplication_p.h
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+"
+RDEPEND="${DEPEND}
+ examples? ( !${CATEGORY}/${PN}:5[examples] )
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ $(cmake_use_find_package openmp OpenMP)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/metadata.xml b/kde-frameworks/kirigami/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kirigami/metadata.xml
+++ b/kde-frameworks/kirigami/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 87c79bfd730f..a0ec6f52eda8 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1,2 @@
-DIST kitemmodels-5.82.0.tar.xz 403080 BLAKE2B 722bb9df4bc8743d1f64c99735b9b97a7326dd4fb8ed51d1e220f8b584cc211ee5f7d75c7735156e8223450acc1f78e5ef10b87f295947b7130fdd861510bf62 SHA512 a28862e46658be6d3f7b8115151088fc5febcb804e115d541a0514f12cfe0019ce4b5108643290db817a06b19e613c99ce68cbc32ee7ea90c906dcac8b392d6c
-DIST kitemmodels-5.84.0.tar.xz 403028 BLAKE2B cf307774354c028347279eb183df59c3180395b1ef0fbd7b65c12a934f8fa1c855d05d9d7d28ed506de8f840446534ad5e162a45b3ab45010fd46e8e76f52fdb SHA512 bdf281a07558be44939a08651b272fecb18614a44ff68442195d192fa81d40c425044e626151a2fbc6c9642ea33cbef26754373cf1870c300373ec70a53dcac5
+DIST kitemmodels-5.115.0.tar.xz 407312 BLAKE2B 101c2dc57fe2616fa1918343840422885f8f3ca4cb924ef4331b618cdb081b1777164442a2b905e1c0b419ddb5909b2ccb9418cd087a6b1dec53f8939b9822b2 SHA512 fdd0c98e27dcacef57a6224c17bdb17f7074514414542653b3211ffe787c1cc84499773ec7b1ab3ee0d6ee1dfa598ef61b7c0f97bffc1555c060c487f884a3bb
+DIST kitemmodels-6.1.0.tar.xz 398808 BLAKE2B bfe00c72dd40f63959a7c0ee8c4abeebb8b3cf378e7cbb150d4361663e7efd4041a93986664f5ba30f900b125a8ea05b282ec1e7c17b96ef74e7e215f44a67d1 SHA512 d256ed99a6d1e7780650f4720da0b25f46b0caa7c42600e9eb62e91b4ba03a5baaaf28cfe9aa0f76e33bc248567065ebd874d16b41f7a0930c6e0985b932225c
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.115.0.ebuild
index 95dab1f51e88..b4ed5bc62fd8 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.115.0.ebuild
@@ -1,16 +1,15 @@
-# 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
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="qml"
RDEPEND="
@@ -22,7 +21,6 @@ DEPEND="${RDEPEND}
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package qml Qt5Qml)
)
ecm_src_configure
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.84.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.84.0.ebuild
deleted file mode 100644
index 94e4faaea807..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.84.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="qml"
-
-RDEPEND="
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package qml Qt5Qml)
- )
- ecm_src_configure
-}
-
-src_test() {
- LC_NUMERIC="C" ecm_src_test # bug 708820
-}
diff --git a/kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild
new file mode 100644
index 000000000000..dd2bea8de8db
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-6.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+"
+
+src_test() {
+ LC_NUMERIC="C" ecm_src_test # bug 708820
+}
diff --git a/kde-frameworks/kitemmodels/metadata.xml b/kde-frameworks/kitemmodels/metadata.xml
index 5bd216b18309..9491687bc349 100644
--- a/kde-frameworks/kitemmodels/metadata.xml
+++ b/kde-frameworks/kitemmodels/metadata.xml
@@ -1,11 +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="qml">Enable QML support via <pkg>dev-qt/qtdeclarative</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 5bb5df47c288..2cf436ff5201 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1,2 @@
-DIST kitemviews-5.82.0.tar.xz 74908 BLAKE2B 0419be4239e07260606a8592a55bb16d4477d2a4f7b53aed5c50a872c6e32c35d62a550de5664cbd332f2d3be7b7f11dc6f50d983294b50649c8d5c9704e0054 SHA512 5b2d343331a99418e3f6030d5732d998149670c7d7075de3c0c7431b1855ef75ecd192838a8d2d5d10119eb4cfc397b0bcefff48dd11974cbd332d05bbb5799b
-DIST kitemviews-5.84.0.tar.xz 74896 BLAKE2B 26bea3d730dbb53bc3ab44d7d48c349f0c3d5158bd67f94ba2596d60b56e92060731830d1a2638cf6dd20ab1d131be3aa49026816cdd0bd11d5d9eab7b3dd36d SHA512 34f479ace7478dfd14914cbf4b39e3940194cb65b44427c4e62039ddd01aed2055705cdb87413a094d4c41cf86a8952380193aed34ba6520920c95969c32f5e4
+DIST kitemviews-5.115.0.tar.xz 2264972 BLAKE2B d9d60db19815471a269ee7d1ade03794c5b7877cecb917836cce53056787ab81e2caa7fab3b3cbab85f5908df297242fed6c31cfe0ce1ce7dad364a15c465046 SHA512 47150f92d74e709b7fc6aa98efd929af1753bd31f605aef16a52f5922235085d0e76676334fda3af3b764d770c3f2482ea8ca4b3eb416ad0cb35770784fb413e
+DIST kitemviews-6.1.0.tar.xz 2262100 BLAKE2B c83711e641584e31d99e90cf3cdf9a0d7947d3ae291d8d179fd34b51915b05919252f13ed18f5b7601fb180b808f86f27a936f3b04b241aa331dac7319c3ca51 SHA512 f663f3bb11d062ce1847ce74d05934278dfd380eeed98fb890d7b9563894dffd4f11c8a1a80ed8e03cd7ecf19014d88b79cb436c8409c376e7f039d1e3f20d17
diff --git a/kde-frameworks/kitemviews/kitemviews-5.115.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.115.0.ebuild
new file mode 100644
index 000000000000..21ddd2aa8461
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.115.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
diff --git a/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
deleted file mode 100644
index 8a74f854b712..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kitemviews/kitemviews-5.84.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.84.0.ebuild
deleted file mode 100644
index b8205a752558..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.84.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild b/kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild
new file mode 100644
index 000000000000..e97c12e1ab8c
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-6.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kitemviews/metadata.xml b/kde-frameworks/kitemviews/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kitemviews/metadata.xml
+++ b/kde-frameworks/kitemviews/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index d7f43ac49b9e..d8577dc07120 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST kjobwidgets-5.82.0.tar.xz 95628 BLAKE2B dc4cc0332f54c3f44034ac0534dfb60c655e4a089cac9cba97472cb3c345bd0617b13ebe0f152ecfdcd438965088fe45cbbe8e83d2c6017c90fca0181e052e96 SHA512 9fb0d2ababee7824772748e6755641910fe0fcbf0ab91ceb5cc326af12b0b9a5d853c84ca226ca0ce476132acaaf5cacc626ffa820ed04fc1a05ea4f68f0f454
-DIST kjobwidgets-5.84.0.tar.xz 99040 BLAKE2B c622559bcc702076ada8ea95d167e1fa8178dd87d59ce26cddaac40789f1c8a003cff3c0f33d887e5c1eb8de641e3b9e969dc171cdc008dbe71a716e4b6c04dd SHA512 ba47870362028ea0dd77891d06915878605c617a285eeab06a7d9a7105b55faa078426125c2937370b54b8117a8b5e1568d84bd6512940602708696f7ca96750
+DIST kjobwidgets-5.115.0.tar.xz 2301320 BLAKE2B 52bbc7fc8cf26494a865400f4dd852e6779558e05c05cdbd589df983a7d431147ff65608b945f2786d6f81445df0b0e145d5f81bd0c9013f9e3dcb9e77a6387c SHA512 8364d7dc63fe7777dcf053aa627e8e8182cb56e4d93b4ed2e366f327cae60fbcfa93dac35ca37bc86a2352297a745a93d38c4123bccf73b57d19f987414f8fd0
+DIST kjobwidgets-6.1.0.tar.xz 2265188 BLAKE2B a853729ce73f8c1eb97b6f06329647a74dd13b3c89eaa6be13e089221cd66a75306e735772a1411f040767cebb0a838af4763518d44297508e18a7a42468cf67 SHA512 914be906818c54a4a4bd7932131f609f7eb4869c574908c39c212f11c793b978ec7dc7886a582d87e67bca154bc0efbd33f8af0b4922194374bf5050f0429f80
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.115.0.ebuild
index 8066922646a1..fe96e7b2fb44 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.115.0.ebuild
@@ -1,20 +1,18 @@
-# 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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls X"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="X"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -29,10 +27,10 @@ DEPEND="${RDEPEND}
x11-libs/libX11
)
"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
$(cmake_use_find_package X X11)
)
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.84.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.84.0.ebuild
deleted file mode 100644
index 1dc58354abcb..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.84.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls X"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild
new file mode 100644
index 000000000000..dd258bd6badd
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# ...by automagic: #if __has_include(<private/qtx11extras_p.h>)
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kjobwidgets/metadata.xml b/kde-frameworks/kjobwidgets/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kjobwidgets/metadata.xml
+++ b/kde-frameworks/kjobwidgets/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index d9db36fe3609..5e3916a209aa 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1 @@
-DIST kjs-5.82.0.tar.xz 337880 BLAKE2B 304acd60f22c3ee3cacabe1794369540dd43473464fe42c7cb3c2e498a3ed6780eab1f75823393efbc9658a06d3b19e718e0ea3d39463acec9b778162c56d214 SHA512 9ac3f70b09d309fe11026964607aa102d1b6264ad19c8618993fc533ad13dd367772886c56da26d980cef1aa1b80d228a8822340be582cb2a150352d64efaef8
-DIST kjs-5.84.0.tar.xz 337844 BLAKE2B 0deaa5035d2a8ae07fa7cbb3be502dfbae3a17bae21b12c5a5001e0c13a25b38ac51e62305e6fd12f49268bc1a0d9dbc1fd19d6507e02142c946c7dee12f93d1 SHA512 a766b6eac0c6abd69867cd137ea2c5cb87f1a93a89711d2ed3882c762425d56aea740fb6384850218806334684141f98aaf2fb54a587ccc3fce1d9fe8f865aef
+DIST kjs-5.115.0.tar.xz 339808 BLAKE2B f6a33af1d334e985d05bf9440d04d270149da2fa155eed4b9de404cc0f55afe65ded9f106d933d6a238cf22921e5f90890887e9a76877abf862a80042f706899 SHA512 0b95025edf0b3aa3a9f550aeaffe8a43a8a8a265f556aeea80ee9becb50a93aef7c99def609e82db4802771a63474610eabd65b5cbd0965d59a5dd4d30a716fd
diff --git a/kde-frameworks/kjs/kjs-5.84.0.ebuild b/kde-frameworks/kjs/kjs-5.115.0.ebuild
index 103b7d178deb..a85e824459dd 100644
--- a/kde-frameworks/kjs/kjs-5.84.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.115.0.ebuild
@@ -1,15 +1,15 @@
-# 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_HANDBOOK="optional"
ECM_QTHELP="false"
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="ECMAScipt compatible parser and engine"
LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
BDEPEND="
diff --git a/kde-frameworks/kjs/kjs-5.82.0.ebuild b/kde-frameworks/kjs/kjs-5.82.0.ebuild
deleted file mode 100644
index 71b10b8c004a..000000000000
--- a/kde-frameworks/kjs/kjs-5.82.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="false"
-inherit ecm kde.org
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
- dev-lang/perl
-"
-DEPEND="
- dev-libs/libpcre
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/metadata.xml b/kde-frameworks/kjs/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kjs/metadata.xml
+++ b/kde-frameworks/kjs/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index f467239497e7..04054ca8c19e 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1,2 @@
-DIST knewstuff-5.82.0.tar.xz 1167420 BLAKE2B d35ad76c4780b79cb40b7920febfcab665bb071e26fde98710435ff7cac92454c0f07a76d7b42d2c786aa793be97ecb3f92954052a1f3e43e34d316c021d6b10 SHA512 50377c16447dac2f55e025a320c51b86142dec7109c33a9e46415c5acc4d8d234ad49f7cc25f3f29f65d37408a6a780df1dfe279b151d109d601f9504d9f7408
-DIST knewstuff-5.84.0.tar.xz 1190892 BLAKE2B 370cafbaedb1478ea8d4b476aa4c8b35383380c5b8fbd2c541895939cf25abb6cb0781787aed96def29b9dca6b71942cf77ee6cdb1bc6fb18849f4c62eec27d1 SHA512 a7c308fc0c6652ef5f66ace0afa3e4145639f5345f677ae3c927b4993edaf188092d641952f7051e44de33a2b68d587f2c7626d2802798bc8cfd191b5728c1b2
+DIST knewstuff-5.115.0.tar.xz 3389164 BLAKE2B 663e8695f6f5b2f470926737d36fd2117d19661bfcd4e46e2b7a9ea22a2da1b9ddeb7e15d323d13dd1fe2e37ca8bc81f57782d0c9f8fafe4c145752cf34e7182 SHA512 32b9d833d20932b7d6b20cc77812db1a3b01db4e581600c145dafc24becf27b7b72efb4c5f20a1b83b598346696198378095bc28efbfaa24f9944a62d5be29e4
+DIST knewstuff-6.1.0.tar.xz 3102052 BLAKE2B c2f4936dc91bf91d5cfc48eb769e44b37745b05984ccc673369c6e3f1c078b3ee7f9afc193d522cd53c79a5a8fb6a0c890dbfebeb62828c3b8587ca7831fdd8c SHA512 1ec44c82f156da74b9db64840908b472a81a9bdaac1f47d4fb76e3749306f21668791582e6a8c9190af6f621f3e3fa2e461c0d3321e3dde10960c891d6c8709b
diff --git a/kde-frameworks/knewstuff/knewstuff-5.84.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.115.0.ebuild
index 569b0c3b1604..bcac74b88590 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.84.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.115.0.ebuild
@@ -1,17 +1,18 @@
-# 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_DESIGNERPLUGIN="true"
ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for downloading and sharing additional application data"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="opds"
DEPEND="
@@ -31,7 +32,6 @@ DEPEND="
=kde-frameworks/kitemviews-${PVCUT}*:5
=kde-frameworks/kpackage-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
=kde-frameworks/kxmlgui-${PVCUT}*:5
opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
diff --git a/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
deleted file mode 100644
index 17a45a1c2f2f..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/attica-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${PVCUT}:5
-"
diff --git a/kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild
new file mode 100644
index 000000000000..8c48819cbbc5
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-6.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="opds"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ =kde-frameworks/attica-${PVCUT}*:6
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kpackage-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ opds? ( =kde-frameworks/syndication-${PVCUT}*:6 )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:6
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package opds KF6Syndication)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/knewstuff/metadata.xml b/kde-frameworks/knewstuff/metadata.xml
index f70c63446222..b0a054a1a103 100644
--- a/kde-frameworks/knewstuff/metadata.xml
+++ b/kde-frameworks/knewstuff/metadata.xml
@@ -1,11 +1,20 @@
<?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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
<flag name="opds">Enable support for the Open Publication Distribution System via <pkg>kde-frameworks/syndication</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index add051b4a0a4..9fd2a831e2cf 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1,2 @@
-DIST knotifications-5.82.0.tar.xz 123864 BLAKE2B b798fcd8c7f493b518a2a5d405c18ae028fa187e4a744de087bc3087e2491007e93c1e814b2e0491e0d0996aa06e3fcb239b1646baa77d3a5003afe9ba33594d SHA512 5b90e641adbadfd31ee44344361d964cb35deb93cccd2de1199c633986c08ce7e8321cfb73a50d99a954c2652a9a78c9c07d0026fcea115bc5dbe4e5898aaa12
-DIST knotifications-5.84.0.tar.xz 124308 BLAKE2B 2395a57879843b1b16dddd0bd22a8a8822a0cac513e65841475988aacb50a25ea9916a78cfb41f754faebececd57a958c11e9af234ce7aff2f7d14ed4f6e7858 SHA512 7b880c9e093725590d5ee7e8697196df575a14ebbf6d2a3b915ffbc5ac53b61969a302519e22e494b60e35a405a07640f814f8583bd845ff54c2c6c5f0474bde
+DIST knotifications-5.115.0.tar.xz 2372832 BLAKE2B e5a58830214dc6cf812ca13d217d954da2386e4ef3deb95d8727b1ef39b973656a338cc89b7ebe9e9e095ee8169c25eb0c57064a21ca2cd36373d0b6533c79ea SHA512 5254cf3064fa2ee03332b37651d5fef1aded852c0f8474365bfe20f225d7f59e39c11952793a3a8aefb75206ae09080396e5fc5f2ace528eee5d8df1bda983d3
+DIST knotifications-6.1.0.tar.xz 2343596 BLAKE2B ab012336d4cebba6b4f7b77d0ad5a79ad11ca2a02677d649ab4909cefc55695b5f16c963f21e034b2f4157169684f29b94cf8121a9dca6439a7cf16807675b23 SHA512 158706e38320b620153f048cf1075063fb46692e165663222631ca05fbb99953f679bb4a888d06d61ce2671134605b88a767c875eee9c85a042b46a7820b3df1
diff --git a/kde-frameworks/knotifications/knotifications-5.82.0.ebuild b/kde-frameworks/knotifications/knotifications-5.115.0.ebuild
index 4dcb31da40d9..8c2223511933 100644
--- a/kde-frameworks/knotifications/knotifications-5.82.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.115.0.ebuild
@@ -1,31 +1,30 @@
-# 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="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for notifying the user of an event"
+
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="dbus nls phonon speech X"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="dbus phonon qml speech X"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
=kde-frameworks/kconfig-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
!phonon? ( media-libs/libcanberra )
- phonon? ( >=media-libs/phonon-4.11.0 )
+ phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -36,13 +35,15 @@ RDEPEND="
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package dbus dbusmenu-qt5)
$(cmake_use_find_package !phonon Canberra)
+ $(cmake_use_find_package qml Qt5Qml)
$(cmake_use_find_package speech Qt5TextToSpeech)
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
diff --git a/kde-frameworks/knotifications/knotifications-5.84.0.ebuild b/kde-frameworks/knotifications/knotifications-5.84.0.ebuild
deleted file mode 100644
index 09e8bd9e45f8..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.84.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dbus nls phonon speech X"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
- !phonon? ( media-libs/libcanberra )
- phonon? ( >=media-libs/phonon-4.11.0 )
- speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXtst
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package dbus dbusmenu-qt5)
- $(cmake_use_find_package !phonon Canberra)
- $(cmake_use_find_package speech Qt5TextToSpeech)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-6.1.0.ebuild b/kde-frameworks/knotifications/knotifications-6.1.0.ebuild
new file mode 100644
index 000000000000..0711aa0a9817
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-6.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for notifying the user of an event"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ media-libs/libcanberra
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/knotifications/metadata.xml b/kde-frameworks/knotifications/metadata.xml
index 68ff6fccee87..ee650b347b68 100644
--- a/kde-frameworks/knotifications/metadata.xml
+++ b/kde-frameworks/knotifications/metadata.xml
@@ -1,12 +1,21 @@
<?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="phonon">Play notification sounds via <pkg>media-libs/phonon</pkg> instead of <pkg>media-libs/libcanberra</pkg></flag>
+ <flag name="qml">Enable QML support via <pkg>dev-qt/qtdeclarative</pkg></flag>
<flag name="speech">Enable text-to-speech notification support</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 00a794ef987d..480b9703bcab 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1,2 @@
-DIST knotifyconfig-5.82.0.tar.xz 84692 BLAKE2B 44d8cc0bb1caa2115fc54af5f8a042d29baebf4ca595576a81e01e24a2141b6077ca938a6d00252701d813f10b2aaa4ccbd9e4600ed9448e8a18a628cce84966 SHA512 d214d8019179c079a22f4076bb985f1528292c467cce36a18e2457a4051264f915f48a35ea2b508b900fded020bf20c8d3e784149e9be7993a80a027a70871e3
-DIST knotifyconfig-5.84.0.tar.xz 84868 BLAKE2B 441797322b59c30c0cd7aef0d8667e87b4318f2945eacef7c1dda67ed59e6cac6d208cf3ad54f2b38b81a05b6ae8cc57c2070bd3e479b0e6f7604d538fcb7c90 SHA512 cbf2d09c2e58551cfb2752d90a5280fddc821dbf49a0543e64a39f6af54d17de50a9e061d5e238ff206b525fc01ab58872ed962b248efd13eba37f9f51d13a3d
+DIST knotifyconfig-5.115.0.tar.xz 2401888 BLAKE2B 7f3ed295a93216f0cb8f7b915a915ee9052c6cbc0c20207898f6d53c39a1951b56d0da94c9a758535f0967297a4f3f6e8359e91aa9f9edf9814255265ad4b38c SHA512 75ca1341a1ec17f28d5e0651d14ca4b17c42d3bc7593d4976920ce8df96c1e9eddc9fd2eeb7564bf5094551729ac29e73c4d0712fc74a09695790c6d206f8500
+DIST knotifyconfig-6.1.0.tar.xz 2396612 BLAKE2B fa3dd95aed89ce7f6663da8a2cba598836d5d63e21574eb63890fa77a853c6b9773920e1c232a327f6226056699b9f5c2b3dac3c01a4c056bd533ab7ee44f3a9 SHA512 4ea2164ae7da248a8f50a43b6593227286a52ed3b20937d3b911ddd1b6f72cbda85a638635fcd0e33b80a729ea5a29b02d031aa5e1047f638bf48197ec23c44e
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.115.0.ebuild
index f510d52b1527..ae3baf83a807 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.115.0.ebuild
@@ -1,16 +1,16 @@
-# 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="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for configuring desktop notifications"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="phonon"
DEPEND="
@@ -22,7 +22,7 @@ DEPEND="
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kio-${PVCUT}*:5
!phonon? ( media-libs/libcanberra )
- phonon? ( >=media-libs/phonon-4.11.0 )
+ phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
"
RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.84.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.84.0.ebuild
deleted file mode 100644
index 80cca1ceeaad..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.84.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="phonon"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- !phonon? ( media-libs/libcanberra )
- phonon? ( >=media-libs/phonon-4.11.0 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !phonon Canberra)
- )
- ecm_src_configure
-}
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-6.1.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-6.1.0.ebuild
new file mode 100644
index 000000000000..3cf100a4ed9e
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-6.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for configuring desktop notifications"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="phonon"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ !phonon? ( media-libs/libcanberra )
+ phonon? ( >=media-libs/phonon-4.12.0[qt6] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !phonon Canberra)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/metadata.xml b/kde-frameworks/knotifyconfig/metadata.xml
index d8e3327b193f..b7605814b7ea 100644
--- a/kde-frameworks/knotifyconfig/metadata.xml
+++ b/kde-frameworks/knotifyconfig/metadata.xml
@@ -1,11 +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="phonon">Add sound support via <pkg>media-libs/phonon</pkg></flag>
+ <flag name="phonon">Play notification sounds via <pkg>media-libs/phonon</pkg> instead of <pkg>media-libs/libcanberra</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 005ccd4b7b54..02b1c941d5b4 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1,2 @@
-DIST kpackage-5.82.0.tar.xz 137892 BLAKE2B 292ffdaa8271f63b178304e85ce53f8dd35ff2f46bd5c2b9828a6610c2939918d51d02d29cd2dd799c7fd77c02c3ac23ce7015c2d41b63cc3ed23833958643c8 SHA512 9d8a168b48903d4b5c68ffa0709fd0cfea1e08376c1c0b1ef820ad13f6399a1792be724eeef18a27402f18c62494c864fe4dac17e9932a1ee3a5bb4de50f5fed
-DIST kpackage-5.84.0.tar.xz 137752 BLAKE2B ed79a20899ad26d569a3016456b4b9425f9d4cce23895af06225b940ec51acb319b5fd5b77f2f4140bd810b9f3ddb5c46ab7c0de4535c44491aea04cdfaaf295 SHA512 f3869e236d28e3a3950b36097a087ebf23feed95f0d289fc31cbb86ec50bcabbf1df41ccef5bdb15ab1bd8faeeffc87afe30a2e0d97af366bcde1e2042d10250
+DIST kpackage-5.115.0.tar.xz 188928 BLAKE2B fe9674e02c9e65f934d2d3080da015476a8a76e77c0bee7eab2785724b59a4e396f246acc099da495fad50b1909d24cdee129657ddcdff3ec372648ace50a3a0 SHA512 f393863bde9a3ed6d21a980b3e53e5be37826ae8d520334dc5239f88a6ab2bfc26ea2c1345d362e5e499e1d786e83a705b520436277eaf6f65d9192a5ea9a241
+DIST kpackage-6.1.0.tar.xz 179348 BLAKE2B 68ffc34cdd7e3d4639620630169aabec0b1a7993535730b3422c4e4d5d254dc18ad5b6766a9ca57e99469d6f958795fbf0612b5acb6e640b22fe5a9d1b4b343d SHA512 b000774c559f9fa961687fdde59c74e8b8a2c357ad1710c75018e03d33ee91fae582f17e7090712d2aba4c61aa968dedbb52b502a1aa67da745df4913bde591b
diff --git a/kde-frameworks/kpackage/kpackage-5.82.0.ebuild b/kde-frameworks/kpackage/kpackage-5.115.0.ebuild
index 9125d296dcf9..2ecc5e42ca6b 100644
--- a/kde-frameworks/kpackage/kpackage-5.82.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.115.0.ebuild
@@ -1,16 +1,16 @@
-# 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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework to install and load packages of non binary content"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="man"
BDEPEND="
@@ -24,6 +24,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+CMAKE_SKIP_TESTS=(
+ # bug 650214
+ plasma-plasmoidpackagetest
+ # requires network access
+ testpackage-appstream
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package man KF5DocTools)
@@ -31,9 +38,3 @@ src_configure() {
ecm_src_configure
}
-
-src_test() {
- #bug 650214
- local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
- ecm_src_test
-}
diff --git a/kde-frameworks/kpackage/kpackage-5.84.0.ebuild b/kde-frameworks/kpackage/kpackage-5.84.0.ebuild
deleted file mode 100644
index aad1329598d7..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.84.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="man"
-
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package man KF5DocTools)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- #bug 650214
- local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
- ecm_src_test
-}
diff --git a/kde-frameworks/kpackage/kpackage-6.1.0.ebuild b/kde-frameworks/kpackage/kpackage-6.1.0.ebuild
new file mode 100644
index 000000000000..5997d40d92f6
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-6.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="man"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )"
+
+CMAKE_SKIP_TESTS=(
+ # bug 650214
+ plasma-plasmoidpackagetest
+ # requires network access
+ testpackage-appstream
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF6DocTools)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kpackage/metadata.xml b/kde-frameworks/kpackage/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kpackage/metadata.xml
+++ b/kde-frameworks/kpackage/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 987e8b4d13da..a6b328fd0e11 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1,2 @@
-DIST kparts-5.82.0.tar.xz 192240 BLAKE2B d46b407479c4e3a11a91bf990da14e914008ee6cd51d9fc3f67a89a33811af6201226a1f8971129cf0d3fa5189a8bf45810c2e24bdb6cca3c261465afc0380b7 SHA512 865cb26623b8e3dbf2fff7bff7e7dd0334d5cac487635a4aa88a69fbbb1a4eda2fa67208f6cd4bd3496188af4fe256558b737604202fe30a749a06671c078eba
-DIST kparts-5.84.0.tar.xz 192408 BLAKE2B 6c7890a6395d0795e9dd3cc6acd5cc0a3afa14239e17a10c9f6f8b099b7bc91d24de337935fb0b96db7d2f65e1e326442511501e56f3f6125257b9c1c91b0dca SHA512 b56291d88872e237cdc52cc5e9f084619b93f6e62360be4f9c70797554aad7ac264c21fb4dde42de61244d38e733cfe26297837b9f51597cf54d165cb9603393
+DIST kparts-5.115.0.tar.xz 2473780 BLAKE2B cca29730261ce176958a7aab432df61579ab4ae54d1cb49e7e18cb41b4e60771fce7c6840a89f71939958af3a530260a2615692ed24e60745c5806faabf724b4 SHA512 3afdc39d75e8f4f6bd43e40c3d23178f1be2cae3606d797bcd544e43e3f105038b587c6c1b0898fc40728c7742ba11f92592c9ce1531225d02dbabfc27e10aad
+DIST kparts-6.1.0.tar.xz 2433364 BLAKE2B ada97949c1829213e40796889487c009fc52ea8128c4d390494620b91a10927dd4069c2f1bab8929c907dc476388e09f5fa0bd31f10ffb1ed30454a240afe37e SHA512 178f919af09d1e8219eefcd1ab6583e788fb6b09f4ef022721d4856b84c772571ebb0b66b45d3a8191b30ba781040e49a97740035b0441dcba5a7af895b87106
diff --git a/kde-frameworks/kparts/kparts-5.82.0.ebuild b/kde-frameworks/kparts/kparts-5.115.0.ebuild
index 86a80033b9ab..2afee89d7614 100644
--- a/kde-frameworks/kparts/kparts-5.82.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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
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 providing elaborate user-interface components"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/kparts/kparts-5.84.0.ebuild b/kde-frameworks/kparts/kparts-5.84.0.ebuild
deleted file mode 100644
index e8709a311e1d..000000000000
--- a/kde-frameworks/kparts/kparts-5.84.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- >=kde-frameworks/ktextwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kparts/kparts-6.1.0.ebuild b/kde-frameworks/kparts/kparts-6.1.0.ebuild
new file mode 100644
index 000000000000..ec9fac34769c
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-6.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kparts/metadata.xml b/kde-frameworks/kparts/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kparts/metadata.xml
+++ b/kde-frameworks/kparts/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 80e51035643e..eb5e05bb85ec 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,2 @@
-DIST kpeople-5.82.0.tar.xz 61728 BLAKE2B 5e5abc67b4d918696ce274327b23674d018958cf9eea0e2489918c052891aacc9265172bfb18a88ebb34f6a0b653f6659ba4bf4c27548e1ccf6b99d9c63c2b49 SHA512 3437ae1685427f5b9ca98f75fa2822b68d1ce5cc902810530844e5cdc01fcf3a027d495a5457f31d8b3838622c425fd835df1b4293fdf53ebc0fc34f869bc44a
-DIST kpeople-5.84.0.tar.xz 56704 BLAKE2B fa260e1d88e9e3fd6305411f7588c0c5719110c5b03ac61d2e4a4fdc7151504486043558db5f8e190bbe76fe9715c303d173bc7218052afc2395e1938db2467d SHA512 e21a2c2082afdf7436982d25c26316aa93060ff3e127d6c1bc27097b18e402658e8e548dac0c7100b077de86b8f99ff52fd5c788dea509da7c028060652736c4
+DIST kpeople-5.115.0.tar.xz 63352 BLAKE2B eb82340c51331c7033d2310980921bd8d6289c696b5ccc0fc5c00b641ce34940ff1424cb563fc8f85e83a23a4dcb291a19031948e02328e9592a1aa8cc387dfb SHA512 cc1a8c40e83c0fc2a2185cd515023413c67f21c7adf9ca2870840ac1fddde22ee0ffe6b64819a9b451901ef91748ef7e7df9312a0dc7274b579b8daba286455d
+DIST kpeople-6.1.0.tar.xz 66936 BLAKE2B 346695f4f27a15936188d97fd533b98f9025b63ae9a55b3aca5ef19cae787a58369984d35318b148de7aa5221394c85599dc382ba8f73cc98f59e543de10e3fb SHA512 de745c3d9dcd80dfdb16eeb12dacdad5d77252f3de2ae7957c0635bd39359c39b17d12bb69812a152cfa4ec9e801c0199b1b81cef5ffc3a2586953adf9f56028
diff --git a/kde-frameworks/kpeople/kpeople-5.84.0.ebuild b/kde-frameworks/kpeople/kpeople-5.115.0.ebuild
index e90e2cd8501a..629343001822 100644
--- a/kde-frameworks/kpeople/kpeople-5.84.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.115.0.ebuild
@@ -1,18 +1,18 @@
-# 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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+VIRTUALX_REQUIRED="test" # bug 816588 (test fails)
+inherit ecm frameworks.kde.org
DESCRIPTION="KDE contact person abstraction library"
HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
@@ -30,11 +30,10 @@ DEPEND="
RDEPEND="${DEPEND}"
src_test() {
- # personsmodeltest segfaults, bug 668192
- local myctestargs=(
- -j1
- -E "(persondatatest)"
+ local CMAKE_SKIP_TESTS=(
+ # bug 668192, segfaults
+ persondatatest
)
- ecm_src_test
+ ecm_src_test -j1
}
diff --git a/kde-frameworks/kpeople/kpeople-5.82.0.ebuild b/kde-frameworks/kpeople/kpeople-5.82.0.ebuild
deleted file mode 100644
index 411cd9654dbc..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.82.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
- # personsmodeltest segfaults, bug 668192
- local myctestargs=(
- -j1
- -E "(persondatatest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-6.1.0.ebuild b/kde-frameworks/kpeople/kpeople-6.1.0.ebuild
new file mode 100644
index 000000000000..1b5609fd93f3
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-6.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+VIRTUALX_REQUIRED="test" # bug 816588 (test fails)
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcontacts-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 668192, segfaults
+ persondatatest
+ )
+
+ ecm_src_test -j1
+}
diff --git a/kde-frameworks/kpeople/metadata.xml b/kde-frameworks/kpeople/metadata.xml
index 2fdbf33d963d..37046107d1bf 100644
--- a/kde-frameworks/kpeople/metadata.xml
+++ b/kde-frameworks/kpeople/metadata.xml
@@ -1,8 +1,17 @@
<?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>
+ <remote-id type="kde-invent">frameworks/kpeople</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 8c02b6d6e65a..df7fc0d6eada 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1,2 @@
-DIST kplotting-5.82.0.tar.xz 31220 BLAKE2B c7eb39d8a8846c6c230a98cba83613d4468b9a62fe1014fa240fb56021d6cef0122d1bf7df5cfd727f5693f495d0942d04ca0e43bc609283a9da1ca94cb63d55 SHA512 8e33b37e61708e637d4064187ab4acf7f8dda846eaf970efc78138590c600c0a7fa320110138e396dc91c6134ce4a1675aa6d4b199a2a385596fb1185d428a75
-DIST kplotting-5.84.0.tar.xz 31192 BLAKE2B b8fcbb253353d5a525279a8a1bae7b8cfcd060068e9380e7404a5e139adbe6098f7d7cee297e536cd6e55766856045616ed0e3e7329a5d9c2f94d93a027af8e8 SHA512 b8f3c93375415d5b689c6871242fd323ac8854b2866c459252c5d623369ebf0c6017bfd64921f6a0c99c81c032dcfd426bf01fa7dcc2d79e6031efa1517e3c58
+DIST kplotting-5.115.0.tar.xz 33740 BLAKE2B c1e3543ef61bf764d35ad9025a5d7d19d99d9c13fa95e0ab1084c94f0d0fa527294d87afbc16a46d4ebeac82d4e001b2c7a7f285435e77d3c03e606a5fc5756d SHA512 cbe3ec13f9282024ddecedd4de03b877fedecdcf71d49a023cd7aded999017f6c373ebc4b4edbb80bbf4f4d6df891b03542241b706a61c97419358e91916cf1c
+DIST kplotting-6.1.0.tar.xz 33792 BLAKE2B 09c83d601364c86d06c281b9343eeed1a618d1f8de4d76679f1c2d037db85881b171cc45165086029611ed35fe0da3820b98456d75da301eb466a31305b37926 SHA512 10af7aa2397185fcdc7a4f7c6eb2c2a8925f3da15fa6878501d1f3100c3e30849fd227e6412eb419f7382add97dad59115ca72e00f69d8cdc2fc00d76bece00d
diff --git a/kde-frameworks/kplotting/kplotting-5.82.0.ebuild b/kde-frameworks/kplotting/kplotting-5.115.0.ebuild
index 0345005da1ac..8179967b3931 100644
--- a/kde-frameworks/kplotting/kplotting-5.82.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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_DESIGNERPLUGIN="true"
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 providing easy data-plotting functions"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-frameworks/kplotting/kplotting-5.84.0.ebuild b/kde-frameworks/kplotting/kplotting-5.84.0.ebuild
deleted file mode 100644
index 71388c7ee73d..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.84.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kplotting/kplotting-6.1.0.ebuild b/kde-frameworks/kplotting/kplotting-6.1.0.ebuild
new file mode 100644
index 000000000000..5b5b563b1940
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-6.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kplotting/metadata.xml b/kde-frameworks/kplotting/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kplotting/metadata.xml
+++ b/kde-frameworks/kplotting/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 777e816d7fb9..483ef7083d35 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1,2 @@
-DIST kpty-5.82.0.tar.xz 56348 BLAKE2B 954dbb443c9f7eb43abb9aa414c77867dbb831b767eb2c8d985cdd4eb0dc003ab3338282bca5ce547e2b84e5a714cb27aa8771653b27111cc303bada78bebcc8 SHA512 9515443671c2030646dfa628555b3e131ad8ff018aa73fe7e0168e352968cbab6111f8e00a47cb7c26ca3807da2e502de19505d44da84750ca46a834bb7a3193
-DIST kpty-5.84.0.tar.xz 56284 BLAKE2B 20a14a95aa0b835a02d3c79cde72a0ccafed33e94c52babf985a22e561419d131641c0aa08fa99c6a5ccabd7961d4c6038dad752553b88cb290dc9fa35259bc3 SHA512 8252e3a25e9d8015563ccdc394d31e89949827fa332c2fbf95af5f86b349f1536c20835cb5859ac5e5f92d533276f7411ecf42d2b742ce92dc36e6fa2b0b726d
+DIST kpty-5.115.0.tar.xz 2416644 BLAKE2B a92e2bcec10f475c886da7db9dc7ef6e4026486e76d2c891e45564fa1ef70ba4d81c1460b6b71bbb5a0c090c3dbf1dcb01bab8b3ebcbc386b943bf4fb47bf308 SHA512 79d3d593397d357f3ec71f357e5fceb1c0678d9bb60b927df237d52a122f32a2945008faa43a356c1f4f65c4d14d71ebbfd2dd90c287247fd3b3ab68d43d2f6d
+DIST kpty-6.1.0.tar.xz 2417868 BLAKE2B d111691bcdebcb0e51a569db6406711f8f5c9d0a6c22a79ab5e379f6f481bcced3e2f0b1f587192f5cb225988c4251278007583c8549337170c7f81c866de890 SHA512 bf369464be4d7d4391a48d5880752a36bf74f885678557d435f29749a7135c1bf47a5e97390436da4d44d78a65632be6cd34f50ce0c8c6c6a9cc68c8be02f958
diff --git a/kde-frameworks/kpty/kpty-5.84.0.ebuild b/kde-frameworks/kpty/kpty-5.115.0.ebuild
index 57656f492184..ce82340bab26 100644
--- a/kde-frameworks/kpty/kpty-5.84.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.115.0.ebuild
@@ -1,14 +1,14 @@
-# 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
PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for pseudo terminal devices and running child processes"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-frameworks/kpty/kpty-5.82.0.ebuild b/kde-frameworks/kpty/kpty-6.1.0.ebuild
index 99a462280456..74489deaadab 100644
--- a/kde-frameworks/kpty/kpty-5.82.0.ebuild
+++ b/kde-frameworks/kpty/kpty-6.1.0.ebuild
@@ -1,19 +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
PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64"
IUSE=""
DEPEND="
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
sys-libs/libutempter
"
RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/metadata.xml b/kde-frameworks/kpty/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kpty/metadata.xml
+++ b/kde-frameworks/kpty/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index e001b593e9da..a0a7b5284030 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,2 +1,2 @@
-DIST kquickcharts-5.82.0.tar.xz 105832 BLAKE2B 00bd1f5ff89e11758607a9b6c2705d4c670107b18eb5ac67522b1f5a6ba5f4b5897b86582ad6ea5f2a1e9245efdf52614a6ee418ff0c2ff8a0499de5211bfe49 SHA512 978e9644d62a3bc7c9e5fddbc7ce67551941a2429804d93a5745584c28555a748f7804287162e31217082bb9e9391d2d86bb50eda209f93da15cb4b5c93ed583
-DIST kquickcharts-5.84.0.tar.xz 105904 BLAKE2B c152ce8a6006dd7b10af7480a83317ce867a0a851d5aa7bc6a1c4efc5452fa17b76087cb749f5e0413d08c5f2e0432d9753b309abc436d3ee65f70460a1ede66 SHA512 3ab10af399893e41ecf90eec24cd1135e35e850cfa14b621734018fc4bfae71bfa231d13e4296edb10809f6b10b1cd67cbaa0c3e9476e2e3ebd8a023bb85006f
+DIST kquickcharts-5.115.0.tar.xz 113372 BLAKE2B a4e7ff48ec578f3c0dab414d8971fe83ffc20521778e10ee9cd154adb1a845be59be53689790dccab3edf546b060d2331997f1e5d27860207c106db0bf0713ca SHA512 570527d88b668050bfca24796a2b4f2deff3fe022a268aee051ed8d44a28b8eade0f19ba4eeeb8458f9840a516bd7ebff12b68b4dab4da4a94fd34cc47afb74d
+DIST kquickcharts-6.1.0.tar.xz 109892 BLAKE2B 4b5ab5adaf0e69b87f6b8d65027c9e865ad1265b33537c2a3832ee43b86fd1ee1f82868cc8923280e7e19fc5685a0db4ae71a74de3eb296c48212c82c3e92827 SHA512 a3f25ff4ad0324b04d5bd2496e3bb3dc6cfcebdab52ccb1dcf52d0e36ae2d699c6c19651d2f399bac54236cceb696c0b64cca4f697582a75e7cc3b572c02df48
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.115.0.ebuild
index ad2c6d999f5c..248d9a26c981 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.115.0.ebuild
@@ -1,21 +1,21 @@
-# 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_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+VIRTUALX_REQUIRED="test" # bug 910062 (tests fail)
+inherit ecm frameworks.kde.org
DESCRIPTION="QtQuick plugin providing high-performance charts"
HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.84.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.1.0.ebuild
index 6d75dca5d2aa..b0ff5d9ede1f 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.84.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-6.1.0.ebuild
@@ -1,32 +1,30 @@
-# 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_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
DESCRIPTION="QtQuick plugin providing high-performance charts"
HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
IUSE=""
+# PVCUT=$(ver_cut 1-2)
+# examples? (
+# >=dev-qt/qtwidgets-${QTMIN}:6
+# =kde-frameworks/kdeclarative-${PVCUT}*:5
+# =kde-frameworks/kirigami-${PVCUT}*:5
+# )
DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- examples? (
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- )
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
"
RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kquickcharts/metadata.xml b/kde-frameworks/kquickcharts/metadata.xml
index 2fdbf33d963d..d75c4e131bff 100644
--- a/kde-frameworks/kquickcharts/metadata.xml
+++ b/kde-frameworks/kquickcharts/metadata.xml
@@ -1,8 +1,17 @@
<?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>
+ <remote-id type="kde-invent">frameworks/kquickcharts</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index af466ad513c5..d91238a04b60 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1 @@
-DIST kross-5.82.0.tar.xz 128940 BLAKE2B 38006266d918ea9800c91e3a5149d97850d3b7d2b3b31f272c88400b8973442db3a84f0637fda13dd4086df9b7abaf5e3443c6dcc1da31d23e5ecbec7ec55e41 SHA512 ac3b30bc49e4be321c2171dc8229df7df2f7980d4eb47af11141bf51ced4602c1ab81a8150612f02d09c33226bb98cc278451b5c1d4c10f465035f1fceb12ebe
-DIST kross-5.84.0.tar.xz 128988 BLAKE2B e356a2cd22033180b9889766d7127ded9a7670bb8bea5b27f212f8dc3a3db6905a8397830d13495e5271c088596d48fb9195257d7f42e2547be11e446d484c32 SHA512 a957c01f7e9878c2d5df1630759e332666cf6d8197113609cd403aedfea62857cbb9aa8017a9dbf8a0bd395dc38ccb065e6182546fff853bda0a3a1a9775af6e
+DIST kross-5.115.0.tar.xz 2440248 BLAKE2B b115cc50eb57f4d418b344360f4547ee0cb692bcac9222f420db4a0a9f0162d44be446e5c34026b4334d763b0bf7d78029ca05f5ded33b39aee80f9a7e4e7ccb SHA512 19c1cbd94cec88df149ddec45ba2c436dae5debce5a126c19f3292a3f1a7724ef04bede63a907e387606d163ae3c2ec7a880df851f5d9db976902303045322bb
diff --git a/kde-frameworks/kross/kross-5.82.0.ebuild b/kde-frameworks/kross/kross-5.115.0.ebuild
index b8cc49f551c6..95be2cf4ba6d 100644
--- a/kde-frameworks/kross/kross-5.82.0.ebuild
+++ b/kde-frameworks/kross/kross-5.115.0.ebuild
@@ -1,18 +1,17 @@
-# 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_HANDBOOK="forceoptional"
ECM_QTHELP="false"
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 embedding scripting into applications"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/kross/kross-5.84.0.ebuild b/kde-frameworks/kross/kross-5.84.0.ebuild
deleted file mode 100644
index 91bc4177afa8..000000000000
--- a/kde-frameworks/kross/kross-5.84.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtscript-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kparts-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- >=dev-qt/designer-${QTMIN}:5
-"
diff --git a/kde-frameworks/kross/metadata.xml b/kde-frameworks/kross/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kross/metadata.xml
+++ b/kde-frameworks/kross/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index adf6b955a21a..feffa596c607 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,2 @@
-DIST krunner-5.82.0.tar.xz 76916 BLAKE2B f846383458b46bf655a2a2b08fea099eff910aceac90306bea1f3af1b1370d2d59169ee4ff0e68c6ab0186c35b336b4a807f56cd8374f89b16c5319ddba459f9 SHA512 a4430196d32d850f9498027df251a65dcf3fcb161a7005926a9ec3de429bd03487e72fda342a6a588c4e5972ee55baf21e53433d68408ccab1b0b99b5c2980da
-DIST krunner-5.84.0.tar.xz 76836 BLAKE2B cb5d6d3d0454b346862c0ee9bb2fa5e2b6d844fa17704a06fa80fd35027bc95652c790714a7ae181d0d6f3e17c1c5e850f864e2b07d4b9ca0283f8f4452f1f99 SHA512 a8113c35c6943bc48f8720396560bb35a17afabc18587506e552ec3ce189e5e620c5f1576dbad96f993ea9b1b1456c8e4e3d0461de2e67f80f22097eb1c72da3
+DIST krunner-5.115.0.tar.xz 88964 BLAKE2B bc50f60c87ea4b583702f76f7ab38065ffae34da454b999ccac82f197dd047e00bd7973bea7991b5f02740f0c88aa272fa111382448114ed03aff23e5a413bbb SHA512 b0eeed6d7145585a55c29a60618a2be73fc3c9cb3e2167ccf064528994270f628a6d8bc5ef3147e332bff398005ee70d8c3870b076dc90a71d6368c0f9a7c676
+DIST krunner-6.1.0.tar.xz 130964 BLAKE2B 7c750f9249e9b41d6fb7461491383652358bd4401f3e0a8e86c3c9020abf8654b5a7222a742f0620be6918559819b9a332973e9fc0efcba83a00b8943ed7a4b8 SHA512 f9009333f860dd00fa5b67ab0f2bd6411828177ba6e8fd537eda6d21ee540dc0b6c3e15b543f260011e21c5f6092a84e2fe9349f3a0d6e88901abe18714e0fb5
diff --git a/kde-frameworks/krunner/krunner-5.82.0.ebuild b/kde-frameworks/krunner/krunner-5.115.0.ebuild
index d41a223d9e66..a0bd7ef3c133 100644
--- a/kde-frameworks/krunner/krunner-5.82.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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
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 providing different actions given a string query"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="activities"
DEPEND="
@@ -24,24 +23,24 @@ DEPEND="
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/plasma-${PVCUT}*:5
- =kde-frameworks/solid-${PVCUT}*:5
=kde-frameworks/threadweaver-${PVCUT}*:5
- activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
+ =kde-plasma/libplasma-${PVCUT}*:5
+ activities? ( =kde-plasma/plasma-activities-${PVCUT}*:5 )
"
RDEPEND="${DEPEND}"
+CMAKE_SKIP_TESTS=(
+ # requires virtual dbus, otherwise hangs; bugs #630672
+ dbusrunnertest
+ # bug 789351
+ runnermanagersinglerunnermodetest
+ # bug 838502
+ runnermanagertest
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
)
ecm_src_configure
}
-
-src_test() {
- # requires virtual dbus, otherwise hangs; bugs #630672, #789351
- local myctestargs=(
- -E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
- )
- ecm_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-5.84.0.ebuild b/kde-frameworks/krunner/krunner-5.84.0.ebuild
deleted file mode 100644
index 9b94a1daf9ae..000000000000
--- a/kde-frameworks/krunner/krunner-5.84.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing different actions given a string query"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="activities"
-
-DEPEND="
- >=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/ki18n-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/plasma-${PVCUT}*:5
- =kde-frameworks/solid-${PVCUT}*:5
- =kde-frameworks/threadweaver-${PVCUT}*:5
- activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- )
- ecm_src_configure
-}
-
-src_test() {
- # requires virtual dbus, otherwise hangs; bugs #630672, #789351
- local myctestargs=(
- -E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
- )
- ecm_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-6.1.0.ebuild b/kde-frameworks/krunner/krunner-6.1.0.ebuild
new file mode 100644
index 000000000000..f1ba957a1150
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-6.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kitemmodels-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+ # requires virtual dbus, otherwise hangs; bugs #630672
+ dbusrunnertest
+ # bug 789351
+ runnermanagersinglerunnermodetest
+ # bug 838502
+ runnermanagertest
+)
diff --git a/kde-frameworks/krunner/metadata.xml b/kde-frameworks/krunner/metadata.xml
index 185ce0bebb1d..7ad6158865dc 100644
--- a/kde-frameworks/krunner/metadata.xml
+++ b/kde-frameworks/krunner/metadata.xml
@@ -1,11 +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="activities">Enable search runner for KDE Activities history</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 0924e133cb43..428e673e204f 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1,2 @@
-DIST kservice-5.82.0.tar.xz 261932 BLAKE2B 42b95ecca3c5a4f14578491fb1460dbeab4b866b94ab6b26d53aadd059b9190642e5914a926d2faa559a95a50e03751c5717be813254e839a27b4310adff63fd SHA512 6294beeb19773d7b58a23f01e9c9c281c4b2cf8eade19d0de6537ea295ad595ec79a22cb1d3049cb79bfa5eb43fc1e80037227217a6dae212b9e5234b3c9aa5f
-DIST kservice-5.84.0.tar.xz 263252 BLAKE2B 642d9c3d5055c872eea39deefa0af8f667597eb23ef0f8b07afea75a6b7b9f805c58c0acc8e0d064a51e3141020c058a098ee060b010ef3221c3b3eb57828ad7 SHA512 f10ca807c9012fe7e4cf33d8c3336f82691b4ecb090df3fc30daa69e99ec2ac45fb5d5197018f44f0c34e428bbc8d582a441048d74a7ecc00a0c057cd690ea00
+DIST kservice-5.115.0.tar.xz 2539084 BLAKE2B d37ff649ad8d8f4b675922be74e8e037dbf1fb0bc1194705e6787905e382c4f7d4026014be8a5c821b100179ef633e59757047b3d1bb68312eefb23088e5a256 SHA512 c7a88ee7e36b4f8d8c19259c72402ac573ab3d3e7e536d039d6501c255aa501bc756143f6aee07bfe792c908b802d35c76eae032d95a20e5272770dba64d55d1
+DIST kservice-6.1.0.tar.xz 2449116 BLAKE2B 0dbb529a5cdd8471ae7d56db000ac71534c44347f455145668954d8c61bb8640f860c19a4cf5ccfd15675cdb133340695322a47c3a6ea04f31b19ac12d243acb SHA512 cba417080332f7eb5c5b1cc69ef0414a9885624085d7313f2b703d7c7cee992ceea80fe107a0903f5674763565e5ed6eb7a2007edb84e1180670d438251e0115
diff --git a/kde-frameworks/kservice/kservice-5.82.0.ebuild b/kde-frameworks/kservice/kservice-5.115.0.ebuild
index 2791759ea341..fd7c9c58b1fb 100644
--- a/kde-frameworks/kservice/kservice-5.82.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.115.0.ebuild
@@ -1,38 +1,37 @@
-# 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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Advanced plugin and service introspection"
LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="+man"
# requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
=kde-frameworks/kconfig-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
=kde-frameworks/kdbusaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
"
DEPEND="${RDEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
"
+BDEPEND="
+ app-alternatives/lex
+ app-alternatives/yacc
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
src_configure() {
local mycmakeargs=(
diff --git a/kde-frameworks/kservice/kservice-5.84.0.ebuild b/kde-frameworks/kservice/kservice-5.84.0.ebuild
deleted file mode 100644
index b70e6261a0bd..000000000000
--- a/kde-frameworks/kservice/kservice-5.84.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Advanced plugin and service introspection"
-
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DAPPLICATIONS_MENU_NAME=kf5-applications.menu
- $(cmake_use_find_package man KF5DocTools)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # bug 596316
- dosym kf5-applications.menu /etc/xdg/menus/applications.menu
-}
diff --git a/kde-frameworks/kservice/kservice-6.1.0.ebuild b/kde-frameworks/kservice/kservice-6.1.0.ebuild
new file mode 100644
index 000000000000..a7d69b9f24b7
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-6.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Advanced plugin and service introspection"
+
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="+man"
+
+# requires running kde environment
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,xml]
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF6DocTools)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kservice/metadata.xml b/kde-frameworks/kservice/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kservice/metadata.xml
+++ b/kde-frameworks/kservice/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kstatusnotifieritem/Manifest b/kde-frameworks/kstatusnotifieritem/Manifest
new file mode 100644
index 000000000000..90961ea2e1b8
--- /dev/null
+++ b/kde-frameworks/kstatusnotifieritem/Manifest
@@ -0,0 +1 @@
+DIST kstatusnotifieritem-6.1.0.tar.xz 47916 BLAKE2B d0bdc1fb0643b984cdf26f228c7857eef344c1914b0c4a267eb7daf1b996980f92f59d449b6ad6ccd18bfc1d860f4873e5c2e19d46aaf5271cb5c439422adc7c SHA512 453933b9a62dcb6150567162c3afb4a5384d827179c8a0b65e8cfceba309a699ade35c28d910251edfa913a230a3e70415f4a4838f1021da206c25e00f19891a
diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild
new file mode 100644
index 000000000000..1784438f2858
--- /dev/null
+++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Implementation of Status Notifier Items"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# slot op: Qt6::WidgetsPrivate use
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6[X?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITHOUT_X11=$(usex !X)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kstatusnotifieritem/metadata.xml b/kde-frameworks/kstatusnotifieritem/metadata.xml
new file mode 100644
index 000000000000..cc6cdbccaeb4
--- /dev/null
+++ b/kde-frameworks/kstatusnotifieritem/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+ <remote-id type="kde-invent">frameworks/kstatusnotifieritem</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+</pkgmetadata>
diff --git a/kde-frameworks/ksvg/Manifest b/kde-frameworks/ksvg/Manifest
new file mode 100644
index 000000000000..738a72615ccf
--- /dev/null
+++ b/kde-frameworks/ksvg/Manifest
@@ -0,0 +1 @@
+DIST ksvg-6.1.0.tar.xz 89204 BLAKE2B eaf5deef2322ed8d174f8e10d2d09dfae3b1be50c6f32b04a8b21b41949a9dabe8a5257d13d962df7dfb895b63c9b87750adc0f7b7602a49d6c6c0f5cbcf75ba SHA512 7000c407875682df8d847222ce0fc0ef87425562e844da98f0954829db53547f1a84382c5119446bf973aa71c841f58a40b478236413f5c3a04b45841563d05f
diff --git a/kde-frameworks/ksvg/ksvg-6.1.0.ebuild b/kde-frameworks/ksvg/ksvg-6.1.0.ebuild
new file mode 100644
index 000000000000..51c5021b4d0c
--- /dev/null
+++ b/kde-frameworks/ksvg/ksvg-6.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Components for handling SVGs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/kirigami-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/ksvg/metadata.xml b/kde-frameworks/ksvg/metadata.xml
new file mode 100644
index 000000000000..8034b408892e
--- /dev/null
+++ b/kde-frameworks/ksvg/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+ <remote-id type="kde-invent">plasma/ksvg</remote-id>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+</pkgmetadata>
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 68938938343e..81075bdf55e2 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1,2 @@
-DIST ktexteditor-5.82.0.tar.xz 2341712 BLAKE2B cab63977dd8d2e8e9c2b766a9b0563cc98f0b25e2f39f2b598f9b8162ce2e12a3ac41cb74cd6f9cd9509f5987d47d27c9ee3114579ce260837d84bb06b7ae683 SHA512 1459ba61ed4a4b603cd984449a217230914818e32c318a92232957cc83d5e70f2a55bf150ca946252c696e019c24dee5b852ca5046c9914f3fff1c6906487bdf
-DIST ktexteditor-5.84.0.tar.xz 2326520 BLAKE2B d235fa3fb6baacceb8d1fa06821e201c649d2d77bb36f5bd7dd7a2ed51b2285c34bd1cc4416361b4f3c453a50ce7edc1db5fd8677cb9a3f9df5b7ce1b8dc20d8 SHA512 428991b92923d402a963a3bf0a1f86a3fc02cb8b3b5a58285380ddb201e4d9b97798e834872ec27eeeaa21fef8a3f0b180b91e0d970d763fc2e290f98eb79c99
+DIST ktexteditor-5.115.0.tar.xz 2791160 BLAKE2B 8f529cec46d32985cdfe4243390a78ffb7bccc2ac4eb9466fef307160794fce08a53c7c137248c36d4a2e35d7afe092b61b073af88afb8d64dc0fffbd31a73f7 SHA512 ce30c8e43d453e02c8f2f36087d145bf29e6f7740340868ce6740670856bb3c5dc10e310934facfcdbeef447a54d11faa96f1ff08b0173283c25f604760607a8
+DIST ktexteditor-6.1.0.tar.xz 2816964 BLAKE2B 5e3aac164569d0bb435b0a48c047f0405b97570664602f17793b30df8b5dda37a73e62fd7af16c646ea3812ae67830c7d13376076d8cd928dfa2c42ac90bca99 SHA512 c178822fdbce8738c41853b3ee2b5ee961c29efbc486ee4f3f9f073110c1c77abf9fd0310c4d68461f09e9b3d0ca47662b4e950be8d358e0be7d2141836fafd2
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.115.0.ebuild
index d359a855ff24..7eaae20a84a1 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.115.0.ebuild
@@ -1,24 +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
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 providing a full text editor component"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+editorconfig git"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="+editorconfig"
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -39,20 +35,19 @@ DEPEND="
=kde-frameworks/kitemviews-${PVCUT}*:5
=kde-frameworks/kjobwidgets-${PVCUT}*:5
=kde-frameworks/kparts-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/sonnet-${PVCUT}*:5
=kde-frameworks/syntax-highlighting-${PVCUT}*:5
editorconfig? ( app-text/editorconfig-core-c )
- git? ( dev-libs/libgit2:= )
"
RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package editorconfig EditorConfig)
- $(cmake_use_find_package git LibGit2)
)
ecm_src_configure
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.84.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.84.0.ebuild
deleted file mode 100644
index 9212f04f8f4b..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.84.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing a full text editor component"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+editorconfig git"
-
-RESTRICT+=" test"
-
-BDEPEND="
- test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kauth-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/kparts-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/sonnet-${PVCUT}*:5
- =kde-frameworks/syntax-highlighting-${PVCUT}*:5
- editorconfig? ( app-text/editorconfig-core-c )
- git? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package editorconfig EditorConfig)
- $(cmake_use_find_package git LibGit2)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild
new file mode 100644
index 000000000000..4c382ee16261
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-6.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="+editorconfig"
+
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtspeech-${QTMIN}:6
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kauth-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/kparts-${PVCUT}*:6
+ =kde-frameworks/ktextwidgets-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+ =kde-frameworks/sonnet-${PVCUT}*:6
+ =kde-frameworks/syntax-highlighting-${PVCUT}*:6
+ editorconfig? ( app-text/editorconfig-core-c )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package editorconfig EditorConfig)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/ktexteditor/metadata.xml b/kde-frameworks/ktexteditor/metadata.xml
index af58874c86d6..45f4b96ce4ea 100644
--- a/kde-frameworks/ktexteditor/metadata.xml
+++ b/kde-frameworks/ktexteditor/metadata.xml
@@ -1,11 +1,20 @@
<?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>
+ <remote-id type="cpe">cpe:/a:kde:ktexteditor</remote-id>
+ </upstream>
<use>
<flag name="editorconfig">Enable support for EditorConfig configuration files</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/ktexttemplate/Manifest b/kde-frameworks/ktexttemplate/Manifest
new file mode 100644
index 000000000000..9973b26cedd4
--- /dev/null
+++ b/kde-frameworks/ktexttemplate/Manifest
@@ -0,0 +1 @@
+DIST ktexttemplate-6.1.0.tar.xz 847272 BLAKE2B 26859dd9dce8d6a39ae06af5006e36d218b9f8ac081323862241d8f75e0d8a13e54e1b9d15651f9aabc31845d0aede9b125d70780d17df1d804b98e9e4f81491 SHA512 6d0ffd3437f2f427a23719fca752687e7ab781cfac935ed7957d553883485a33ebeedc067ba874f713f475482e83dae2927c88554fec3a5ed9e3d1650782dd5f
diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild
new file mode 100644
index 000000000000..d43eb717c085
--- /dev/null
+++ b/kde-frameworks/ktexttemplate/ktexttemplate-6.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library to allow separating the structure of documents from data they contain"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ dev-qt/qtdeclarative:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-qt/qttools:6[linguist] )"
diff --git a/kde-frameworks/kactivities-stats/metadata.xml b/kde-frameworks/ktexttemplate/metadata.xml
index 2fdbf33d963d..11bde0988c06 100644
--- a/kde-frameworks/kactivities-stats/metadata.xml
+++ b/kde-frameworks/ktexttemplate/metadata.xml
@@ -1,8 +1,11 @@
<?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>
+ <remote-id type="github">steveire/grantlee</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 14eba9d536eb..5322362553da 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1,2 @@
-DIST ktextwidgets-5.82.0.tar.xz 326288 BLAKE2B 917b1c91a29462dce779b1ae569731ba1c9f810d01009608f71149e13523ec0f1d94582a03cd9fbdaeb159be8abc002193240bba34ee67614e9572578cfa69b9 SHA512 7156ef721c9d9eadd66aa72a2f0da4538a009e14f0058169a95c1ad1c9c19f4120975e2cefc2fb0e20e435ee46dc59cbeb83231fd29bbc7bb815aa59a929e9bb
-DIST ktextwidgets-5.84.0.tar.xz 326268 BLAKE2B 1ac2baf21d865d3d7bd7011b548bc3c6b38a99ba5975753380a4b174b9de638e13e5a0a4d41b2a433e22c4944a54f6e43a314aea575bb6275cbad0b98db2c39f SHA512 92d9dbede47fae6650da3150b81316c46b441d816b4cd23dec128fad32bac07c0bf2c1533c0b5ae2d2ffef469470a751bd8d943596f43950ebeeb446cf8dd49a
+DIST ktextwidgets-5.115.0.tar.xz 2552660 BLAKE2B 197cad28792c09ad98244c7dd48abf1017b57cebd0ce2763065bced78676a34bf57b8bb2ddb58c95b6114ab50960677de833cfeff192d6522d78c2ded65e5dcd SHA512 ed6091a72b1e2e242652a9dc47a17651a02be642faa96155fe4d602e6b1ed6ea3cb48a5922eece146bb38a570e20fafd550ba4dab161b5eec60f57e980027977
+DIST ktextwidgets-6.1.0.tar.xz 2549212 BLAKE2B 0620b8e8271bd674f3d0014b3116bf68c4d9d0f92665ec2d56000a3e63d3e505d99c65e7e8c152eb72dda2c7a690c203f1c15f8d1147c0d742fb0fec16aea0dc SHA512 9c032a6f1f186381594c1843414d02fba8eb69df417aae49e3abb6e005a7504664419531f1e7ac41dfd04f4c64429dba11eeca96d5b9370453575609b2d20489
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.115.0.ebuild
index 69b72fe6fefb..4b8c211eedd4 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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_DESIGNERPLUGIN="true"
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 providing an assortment of widgets for displaying and editing text"
LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
IUSE="speech"
DEPEND="
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.84.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.84.0.ebuild
deleted file mode 100644
index 0fdd8d60135b..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.84.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="speech"
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/sonnet-${PVCUT}*:5
- speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package speech Qt5TextToSpeech)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild
new file mode 100644
index 000000000000..8ff7cfd797dc
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-6.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="speech"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/sonnet-${PVCUT}*:6
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_TEXT_TO_SPEECH=$(usex speech)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/metadata.xml b/kde-frameworks/ktextwidgets/metadata.xml
index 4e0233b193b1..3ace511214fd 100644
--- a/kde-frameworks/ktextwidgets/metadata.xml
+++ b/kde-frameworks/ktextwidgets/metadata.xml
@@ -1,12 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
- <flag name="speech">Enable text-to-speech support</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index d75f6c2a9997..94fbcfdff140 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1,2 @@
-DIST kunitconversion-5.82.0.tar.xz 869936 BLAKE2B 7812dac12f9e854c1178ff72efd13cba0d36d55c0046898ceebb4dbbce6a8244824bf4453a240661cda83e87e60630268c723abc57d6e86b960eea8ceda83255 SHA512 735684240372b9dc7a37205af92172be164a71537b96c810bf64dd46123748901a079202aef394b2624ccfe5aff2ac69e9380e5715c57089739eb59fbd48a527
-DIST kunitconversion-5.84.0.tar.xz 887688 BLAKE2B 2fe75e7febb404864f18ebae306747e5df15821647ff7456b577477d82ab1b3be547bd5e6c24824fb971fde023ca3b4b79e09fe299461347101b45ffa1cdd65c SHA512 8db9ab10c1ad195e70680f5a3c8c65f261784385eb8c88e6e8f847cb204267fa735cd94482e844b4496a2c9a6b0ac65728f93e4d5caddbc0e3a4e1f116990f97
+DIST kunitconversion-5.115.0.tar.xz 931704 BLAKE2B 176170fa12437502686eccde6cabbc13638980d12d762e71c57af5e5270ceab55c42596e1edcfa76dbc1ddfa6c51c65cc56511a5c7184bce3bbea87bca4a58d4 SHA512 6ad5f3995ef6953f36e092643b47eed6145fda811a6463030b88c342a843f1893af1775193e7c37810e371ccf135cd2840d50c8b4f582921e23cb963e4e1fa95
+DIST kunitconversion-6.1.0.tar.xz 909724 BLAKE2B 3189becb1e0857333c3079f3dd5a3223543d8593fe9e76f2173bad11f6dabd73e1daac4fdc37da26b2d4d5ba847b9905ae815c6c873737e21778efa3746c33a6 SHA512 160904d00ebe4db5f672fe425f356c2589cf1da2b141a750c3d1c576a71b0bce0d414f72fa7559e13bc159d20ed4f4dc050552f88eba61df10f5ecaa9da2ff59
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.115.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.115.0.ebuild
new file mode 100644
index 000000000000..492176ca988a
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.115.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for converting units"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 623938 - needs internet connection
+ convertertest
+ # bug 808216 - needs internet connection
+ categorytest
+ # bug 808216 - unknown, reported upstream
+ currencytableinittest
+ )
+
+ LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
deleted file mode 100644
index 486447ddd799..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtnetwork-${QTMIN}:5
- =kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
- # bug 623938 - needs internet connection
- local myctestargs=(
- -E "(convertertest)"
- )
-
- LC_NUMERIC="C" ecm_src_test # bug 694804
-}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.84.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.84.0.ebuild
deleted file mode 100644
index 75a1cfd68b78..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.84.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtnetwork-${QTMIN}:5
- =kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
- # bug 623938 - needs internet connection
- local myctestargs=(
- -E "(convertertest)"
- )
-
- LC_NUMERIC="C" ecm_src_test # bug 694804
-}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild
new file mode 100644
index 000000000000..1d13f31138eb
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-6.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for converting units"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[network]
+ =kde-frameworks/ki18n-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ # bug 623938 - needs internet connection
+ convertertest
+ # bug 808216 - needs internet connection
+ categorytest
+ # bug 808216 - unknown, reported upstream
+ currencytableinittest
+ )
+
+ LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-frameworks/kunitconversion/metadata.xml b/kde-frameworks/kunitconversion/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kunitconversion/metadata.xml
+++ b/kde-frameworks/kunitconversion/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kuserfeedback/Manifest b/kde-frameworks/kuserfeedback/Manifest
new file mode 100644
index 000000000000..201b8c08b9bb
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/Manifest
@@ -0,0 +1,2 @@
+DIST kuserfeedback-1.3.0.tar.xz 230644 BLAKE2B b7305be09a5e62c980273766ec16f624eab4312ababbb8ebb3e24983ffad7ac19445bb848088331c0b4b02da37ee646c9cf91b8965455d018f9b45084c62d17c SHA512 16fc7fa850e7ac1dc772ab25f81f75fe28454680ce9ddf68da0f14c6d5e9b8201f69d168b1ee32bdf9f0ee517b0cac34eb09fd3dbfa697c0a8d3b23c6ac790cb
+DIST kuserfeedback-6.1.0.tar.xz 254136 BLAKE2B 94b0484cc5283c6329d728a16ed366d4fcb94bf8c5f81ec18ba578011c864b2bdb32e2ffc69a8eada96ad40e703bad01f88e90f9a471161f42f4c0775075ee88 SHA512 144b1576dccb9334405c6b92c58f0748f67f36b967aacdee9a15d0b758789133fe0dfccb2b4686b234ff167408ca68bc7961fa37fd8ca9cde6a59db95e00d5a0
diff --git a/kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch b/kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch
new file mode 100644
index 000000000000..141e022169e0
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/files/kuserfeedback-1.3.0-missing-include.patch
@@ -0,0 +1,27 @@
+From 9a23019d49513acba5128c5173e622ae2f53ced6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 19 Dec 2023 20:57:04 +0100
+Subject: [PATCH] Add missing QDebug include
+
+Downstream report: https://bugs.gentoo.org/920311
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/console/jobs/securityscanjob.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/console/jobs/securityscanjob.cpp b/src/console/jobs/securityscanjob.cpp
+index 698db22..fcb8bbf 100644
+--- a/src/console/jobs/securityscanjob.cpp
++++ b/src/console/jobs/securityscanjob.cpp
+@@ -10,6 +10,7 @@
+
+ #include <rest/restclient.h>
+
++#include <QDebug>
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+ #include <QNetworkRequest>
+--
+GitLab
+
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..3b0e5e460f08
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="doc kf6compat"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ !kf6compat? (
+ >=dev-qt/qtcharts-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ )
+"
+RDEPEND="${DEPEND}
+ kf6compat? ( kde-frameworks/kuserfeedback:6 )
+"
+BDEPEND="
+ app-alternatives/yacc
+ app-alternatives/lex
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ doc? (
+ >=dev-qt/qdoc-${QTMIN}:5
+ >=dev-qt/qthelp-${QTMIN}:5
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ # disable server application
+ -DENABLE_PHP=NO
+ -DENABLE_PHP_UNIT=NO
+ -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+ -DENABLE_DOCS=$(usex doc)
+ -DENABLE_CLI=$(usex !kf6compat)
+ -DENABLE_CONSOLE=$(usex !kf6compat)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild
new file mode 100644
index 000000000000..83bea7219b96
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-6.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+# FIXME: Qt_6_PRIVATE_API matches UserFeedbackConsole, but where is it coming from?
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+ >=dev-qt/qtcharts-${QTMIN}:6
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="
+ app-alternatives/lex
+ app-alternatives/yacc
+ doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc,linguist] )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ # disable server application
+ -DENABLE_PHP=NO
+ -DENABLE_PHP_UNIT=NO
+ -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+ -DENABLE_DOCS=$(usex doc)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kuserfeedback/metadata.xml b/kde-frameworks/kuserfeedback/metadata.xml
new file mode 100644
index 000000000000..6e6a28916521
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+ <remote-id type="kde-invent">frameworks/kuserfeedback</remote-id>
+ </upstream>
+ <use>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+ </use>
+</pkgmetadata>
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 7186624f45fe..b7c2b7049d94 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-5.82.0.tar.xz 300944 BLAKE2B d15119772389a2b422bdc5564d5dd14012eab47ea1767dab0f439db842debd26632a6eb764a33ceb68f0851bbd3ff8bf5101729b8fea1eba6be675608b9cd769 SHA512 b23d0d9229df9060dd71d9ac81247f70bf246f00f6bc0026074be4964532f5e0986c49414d11affbcd88d89de761486e2f3ea2fcb6d023723285e14af85a06cb
-DIST kwallet-5.84.0.tar.xz 301012 BLAKE2B ced83ea3ea33315d361c1306f24ca02e6de91ec88e883ff84293dd3a7f0ff4dcd7d608a74630467151c2c4e06a16d2f08e0a2c267d287b336ac4b5f8965de55b SHA512 5b7fc27043f624237191f61055c027c75b129ceac8780caa772610d428122af6c356c490472abcdb47448ba8d827f91ac604fe1c3f01e6856c8ea3ce85e02524
+DIST kwallet-5.115.0.tar.xz 353124 BLAKE2B 18f9d51c52e60e20d44c3bbbb385cdd4d2b696d1a2b3a36700f44577d04d3ea652f848a6c680db4626d9516ff0848181a098efcaa0b6e4bbf282f9831c576096 SHA512 8870af27ab6dfe5a7f9c60a8199b917e3f0ad81e48524c5ea383c39d6e3ca6a2fbe7bbce9b645a190c33a58bc7e63347e1737b6f55783fefa2a46bf7bab598fe
+DIST kwallet-6.1.0.tar.xz 351404 BLAKE2B 62e6fb78d4fb5772a0a03a87d60c0a9a3c2d2ab5fceafb1ab0a7def3a53039e1e95a2081819b24c51a533dfe26dceaddfdd416881595c823cc642bf28d6a8071 SHA512 fb0428a76788d556ffc6c18a649f5e4de96b57234931e2e878ea660c612384c9778367db26089d73f0499b0d5d5cffcc9b193ca97a03aa3504180b483170c88b
diff --git a/kde-frameworks/kwallet/kwallet-5.82.0.ebuild b/kde-frameworks/kwallet/kwallet-5.115.0.ebuild
index 81aad34ddefb..02dd26354ef1 100644
--- a/kde-frameworks/kwallet/kwallet-5.82.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.115.0.ebuild
@@ -1,22 +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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org optfeature
DESCRIPTION="Framework providing desktop-wide storage for passwords"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gpg +man"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="gpg kf6compat +man"
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
DEPEND="
+ >=app-crypt/qca-2.3.1:2[qt5(+)]
dev-libs/libgcrypt:0=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -29,24 +27,33 @@ DEPEND="
=kde-frameworks/knotifications-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+ !kf6compat? ( gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) )
+"
+RDEPEND="${DEPEND}
+ kf6compat? ( kde-frameworks/kwallet:6 )
"
-RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package gpg Gpgmepp)
+ -DBUILD_KWALLETD=$(usex !kf6compat)
+ -DBUILD_KWALLET_QUERY=$(usex !kf6compat)
$(cmake_use_find_package man KF5DocTools)
)
+ if ! use kf6compat; then
+ mycmakeargs+=(
+ $(cmake_use_find_package gpg Gpgmepp)
+ )
+ fi
ecm_src_configure
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
- optfeature "KWallet management" kde-apps/kwalletmanager:5
+ optfeature "Auto-unlocking after account login" "kde-plasma/kwallet-pam:5"
+ optfeature "KWallet management" "kde-apps/kwalletmanager:5"
elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
fi
ecm_pkg_postinst
diff --git a/kde-frameworks/kwallet/kwallet-5.84.0.ebuild b/kde-frameworks/kwallet/kwallet-5.84.0.ebuild
deleted file mode 100644
index 6958775bab35..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.84.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gpg +man"
-
-BDEPEND="
- man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
- dev-libs/libgcrypt:0=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package gpg Gpgmepp)
- $(cmake_use_find_package man KF5DocTools)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
- optfeature "KWallet management" kde-apps/kwalletmanager:5
- elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
- fi
- ecm_pkg_postinst
-}
diff --git a/kde-frameworks/kwallet/kwallet-6.1.0.ebuild b/kde-frameworks/kwallet/kwallet-6.1.0.ebuild
new file mode 100644
index 000000000000..e323d4c64db2
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-6.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="gpg +man"
+
+DEPEND="
+ >=app-crypt/qca-2.3.1:2[qt6(-)]
+ dev-libs/libgcrypt:0=
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6[X]
+ gpg? ( app-crypt/gpgme:=[qt6(-)] )
+"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package gpg Gpgmepp)
+ $(cmake_use_find_package man KF6DocTools)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Auto-unlocking after account login" "kde-plasma/kwallet-pam:6"
+ optfeature "KWallet management" "kde-apps/kwalletmanager:6"
+ elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kwallet/metadata.xml b/kde-frameworks/kwallet/metadata.xml
index af757a5a25e0..c3a09b264fe1 100644
--- a/kde-frameworks/kwallet/metadata.xml
+++ b/kde-frameworks/kwallet/metadata.xml
@@ -1,11 +1,20 @@
<?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="gpg">Support wallets with GnuPG encryption in addition to the default blowfish-encrypted file</flag>
+ <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>
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
deleted file mode 100644
index 29e929d37b08..000000000000
--- a/kde-frameworks/kwayland/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kwayland-5.82.0.tar.xz 346464 BLAKE2B 59b0e28b2a9984c923c211cd169b4abf9d7c969ae1de31db3e08c0bd2a127b19e652c6666b20ee49d73c9d2736929a45a2124353fd19b320be9256e2f87a6252 SHA512 80cddfdcef545315987d27167ab2ed35b76b9b02e2310913b7c27cbcf27671b1f1f66b8dbb8dee82d42bd2e4fdbd5853109783e76da7ec794f6eebfbef9cf020
-DIST kwayland-5.84.0.tar.xz 331172 BLAKE2B 952c7b1b183281dcd6d3bc37b28a0650636e5278a72dc1985b3e3f56fd3a97634479d99267bfac51eee3d76391f3a1301caeb2a7405a48eb4a21913a8312f5c4 SHA512 e777a1713a6b95054b1361653fb6818d6aa7a4dd1d9d75ac389d4884f812f1436937ceecbc3327296d4902a85aa54a885d92728b3573b212722204da03bf7797
diff --git a/kde-frameworks/kwayland/kwayland-5.82.0.ebuild b/kde-frameworks/kwayland/kwayland-5.82.0.ebuild
deleted file mode 100644
index b4573abfa084..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.82.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
-
-RDEPEND="
- >=dev-libs/wayland-1.15.0
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[egl]
- >=dev-qt/qtwayland-${QTMIN}:5
- media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.2.1
- >=dev-libs/wayland-protocols-1.15
-"
-BDEPEND="
- >=dev-util/wayland-scanner-1.19.0
-"
diff --git a/kde-frameworks/kwayland/kwayland-5.84.0.ebuild b/kde-frameworks/kwayland/kwayland-5.84.0.ebuild
deleted file mode 100644
index 91bcfd2281fb..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.84.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
-
-RDEPEND="
- >=dev-libs/wayland-1.15.0
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[egl]
- >=dev-qt/qtwayland-${QTMIN}:5
- media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.3.0
- >=dev-libs/wayland-protocols-1.15
-"
-BDEPEND="
- >=dev-util/wayland-scanner-1.19.0
-"
diff --git a/kde-frameworks/kwayland/metadata.xml b/kde-frameworks/kwayland/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-frameworks/kwayland/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 81ea6fc4eba8..99a61c1445a9 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1,2 @@
-DIST kwidgetsaddons-5.82.0.tar.xz 2375140 BLAKE2B 044a1af35ce5f756c49b849f0b56e024e709643967142f1d9634ccaed882e1973c5f41c2794470563cbaceae8f7b6a72fb9c89a85005dc723e09a668af0c2fa9 SHA512 6535353c931edd6b0d8bae70fb67e3f6b2bf365d143424a7df4b63de9e174e9b9da705ed17e64f497923909a9d7eba0282d934a9c7abe2b80675b3652d1bf9fd
-DIST kwidgetsaddons-5.84.0.tar.xz 2375508 BLAKE2B ba623f6fb71135685fe5d2a3ed231438e8d26fe37601009f6b50f9ec3427143517a45d14684c15ebab6639d52d4b6e6200353f736f1eeb6709f52fa5cec11973 SHA512 665c22bf744c75083c594016c938b6e0094bf3931d88d384cc917fd16f8f05bcfd3f07d213bccaa178a28b336f87f4ef9ab9a2fa05daf0ddef5fc1a188851c53
+DIST kwidgetsaddons-5.115.0.tar.xz 4270052 BLAKE2B 210a7b266b8158807db9fda8a4a018f41b62b4d9ba784032c6bb67ec71e69b3a9d1922ce3a26d8922fad6ba001e0301a7fa0ee8148958cba5a387173275e65e5 SHA512 fba4e669f6747f5823d45e80e5afa9f5057366bd964156cc2505a4ffcbd4a834144bb2a3fa717f3e7b9805991649d6108bd0cfbea2ea4e77d924bbe8b8dfee9c
+DIST kwidgetsaddons-6.1.0.tar.xz 4264584 BLAKE2B 71f730b0da4f61e9ed39e70fefc78f039c8625bcdf611b88141caaffe0f411d514323fcb287731d568c7615724269e935a8852af2ca417250d758c9433397d76 SHA512 60281acbd06c6652ac8e35784f5e372335f91b991449550a35756ca736cfbcad0abf1d69139e242ffe03c93b901b0b7be801ce606ff3584a2dc8fed472b0db1a
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild
new file mode 100644
index 000000000000..5e2640cfb203
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.115.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+CMAKE_SKIP_TESTS=(
+ # bug 650216
+ kdatecomboboxtest
+ # bug 697866
+ ksqueezedtextlabelautotest
+ # bug 808216
+ ktwofingertaptest
+ ktwofingerswipetest
+)
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
deleted file mode 100644
index eae453dc0ed0..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
-
-src_test() {
- # bug 650216, 653186, 697866
- local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
- ecm_src_test
-}
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.84.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.84.0.ebuild
deleted file mode 100644
index e5034aa3abcc..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.84.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
- )
- ecm_src_configure
-}
-
-src_test() {
- # bug 650216, 653186, 697866
- local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest)" )
- ecm_src_test
-}
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild
new file mode 100644
index 000000000000..df9dda032f07
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+ # bug 650216
+ kdatecomboboxtest
+ # bug 697866
+ ksqueezedtextlabelautotest
+ # bug 808216
+ ktwofingertaptest
+ ktwofingerswipetest
+)
diff --git a/kde-frameworks/kwidgetsaddons/metadata.xml b/kde-frameworks/kwidgetsaddons/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kwidgetsaddons/metadata.xml
+++ b/kde-frameworks/kwidgetsaddons/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 9bc54cb61e21..89f3b53a6b30 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1,2 @@
-DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
-DIST kwindowsystem-5.84.0.tar.xz 178280 BLAKE2B 963b108d34999457e90cf969baca9aec9a9f7d2644c2c6acb0052df07f503466104c1bc1c94ba3a9a98e11bbbe31e8c6148e81c62139ada1a0fd0d54ba787b26 SHA512 9a849049e7480f6d3f6e1fdbfa540b6c99c9a225afff71ba31152cf4dd79b2c56eadf68b2992c3258f76568f89ab595c494d0baec4a5efff672f92983ec534bd
+DIST kwindowsystem-5.115.0.tar.xz 2406616 BLAKE2B 1ce5be2069b592664875f0714213dfa3aaa28f0309f04800d55a35c815ff1b4481859bf92305092ea46f48981650cdd9da5aecd7c9cd77924164581ed10ca32f SHA512 37380c8a523220cece2b9867e9801b79b848c55b0808fa472834050bbbd23ecd18db48d3ef3a17fcf8cf9ee6dbf8a5988a5c562c29c876065a3fda96913f78c7
+DIST kwindowsystem-6.1.0.tar.xz 2392976 BLAKE2B 67daa5b0788e7163bac4fa94a1f20cbe8d3ca8f2767ea6472256bcf116f272bf45b58a9ec17b18869f754d738350cc1bebb03ab5427143f60ed83707af25b9ba SHA512 b538c39c14a5bc11b599e9297cf553830f7eec832cb42c77ab2008f3a9f02fc7ccc18ea0d5d0de9f31d38d900367e1518f2dbc8fc85957458cddee6c9c191071
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
deleted file mode 100644
index cfa7ab9a7988..000000000000
--- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 374a29075694f530d2d0673e33a166c836d02a84 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 2 May 2021 12:38:58 +0200
-Subject: [PATCH] Drop Qt5Widgets dependency if KWINDOWSYSTEM_NO_WIDGETS=ON
-
-Use existing option to do that. Dependency remains for autotests/tests.
----
- CMakeLists.txt | 5 ++++-
- KF5WindowSystemConfig.cmake.in | 5 ++++-
- autotests/CMakeLists.txt | 2 +-
- tests/CMakeLists.txt | 2 +-
- 4 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 49eb05a..ecf98a1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,10 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWINDOWSYSTEM
-
- # Dependencies
- set(REQUIRED_QT_VERSION 5.15.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets)
-+find_package(Qt5Gui ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
-+if(NOT KWINDOWSYSTEM_NO_WIDGETS)
-+ find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
-+endif()
-
- if (APPLE)
- cmake_find_frameworks(Carbon)
-diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in
-index 8267ef4..6c1b4c0 100644
---- a/KF5WindowSystemConfig.cmake.in
-+++ b/KF5WindowSystemConfig.cmake.in
-@@ -1,8 +1,11 @@
- @PACKAGE_INIT@
-
- include(CMakeFindDependencyMacro)
--find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
-+find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
-
-+if(NOT @KWINDOWSYSTEM_NO_WIDGETS@)
-+find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
-+endif()
-
- include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake")
- @PACKAGE_INCLUDE_QCHTARGETS@
-diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
-index c1121a7..c964947 100644
---- a/autotests/CMakeLists.txt
-+++ b/autotests/CMakeLists.txt
-@@ -6,7 +6,7 @@ add_definitions(-DAUTOTEST_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
- include(ECMMarkAsTest)
- include(ECMAddTests)
-
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
-
- add_subdirectory(helper)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index c0865d9..c72eb1f 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -3,7 +3,7 @@ remove_definitions(-DQT_NO_CAST_TO_ASCII)
-
- include(ECMMarkAsTest)
-
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
-
- macro(kwindowsystem_executable_tests)
- foreach(_testname ${ARGN})
---
-GitLab
-
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.84.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.115.0.ebuild
index 27d95f86a264..1e5b646c6991 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.84.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.115.0.ebuild
@@ -1,18 +1,18 @@
-# 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
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework providing access to properties and features of the window manager"
+
LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls X"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="wayland X"
-RESTRICT+=" test"
+RESTRICT="test"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
@@ -28,9 +28,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+PDEPEND="wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )"
DOCS=( docs/README.kstartupinfo )
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
deleted file mode 100644
index 06682e5d7cd8..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls X"
-
-RESTRICT+=" test"
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
- test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-DOCS=( docs/README.kstartupinfo )
-
-PATCHES=( "${FILESDIR}/${P}-no-qtwidgets.patch" ) # git master/5.83.0
-
-src_configure() {
- local mycmakeargs=(
- -DKWINDOWSYSTEM_NO_WIDGETS=ON
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild
new file mode 100644
index 000000000000..28c792b12620
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64"
+IUSE="wayland X"
+
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# slot op: Uses private/qwayland*_p.h headers
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ wayland? ( >=dev-qt/qtwayland-${QTMIN}:6= )
+ X? (
+ >=dev-qt/qtbase-${QTMIN}:6=[gui]
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+ wayland? (
+ dev-libs/plasma-wayland-protocols
+ >=dev-libs/wayland-protocols-1.21
+ )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+DOCS=( docs/README.kstartupinfo )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKWINDOWSYSTEM_WAYLAND=$(usex wayland)
+ -DKWINDOWSYSTEM_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kwindowsystem/metadata.xml b/kde-frameworks/kwindowsystem/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/kwindowsystem/metadata.xml
+++ b/kde-frameworks/kwindowsystem/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 2a914b8cb202..3e1b6736ad61 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1,2 @@
-DIST kxmlgui-5.82.0.tar.xz 863880 BLAKE2B 045ed589d52ac901aa128d4f3e8eb2bd2f9b09ce22e6a7e28dbc34d208a6c00167c94e5514f47acce640d18f86f37adeeac79a25dc148eb58c038fddc9fcd59a SHA512 2ed59fa53876005f326e323e153d44d3144c9d49bcccf5aea68f5d743a79b505526286b6307e193878541c5cc8260220ca0a9a169b18d0b0df4720aa8541d0f4
-DIST kxmlgui-5.84.0.tar.xz 869456 BLAKE2B 2dbf8a65a3a27722a28f24f75addafb3920c004e0be070185f03b7037368f12cea39d8b404832705d6dda75267633f637d558b20604fb57e61aeb535eaa17090 SHA512 5a5df64492d0886fcd7e3e29df6dbbd493636135f6de9f88f2b62bbc99c99eca72425251ca894be1e622ef043b057f1cfcd04d6ddd916edb5536599bd1a4f339
+DIST kxmlgui-5.115.0.tar.xz 2953252 BLAKE2B 9ed52b405714abe5e78530d4b71a582ce92151bcbbfd563c92d44cfede58d379f99e387d25c41deb4a70eceead904503af3fca55fbbd7634518f0edc689dbaeb SHA512 4e06d72f509701d969eb77e608bd5a703a80fcd18d4d42a70d26b01b6889ca41b573b8be0a06b98b799e2dc62ff5d0111577e76f363c6f4c3d24828339274236
+DIST kxmlgui-6.1.0.tar.xz 2934480 BLAKE2B e617fec7678033a40d158dff740e5649d9725d38db8b75c1f7c7e11e3c750986f05aba6a8b9a13cd0878f9aa73d6f9f95c2c1541afe302aead2bd676f80e20ec SHA512 a646db1858d39596a9171c9976972a02f31f02cf656806534436960c4771a082a80ea9d47422e313a0f4e93ed53756f441af3c092ebdc5f8f84004329332a0fc
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.84.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.115.0.ebuild
index 735cf883479f..2955a04263a1 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.84.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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_DESIGNERPLUGIN="true"
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 managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
LICENSE="LGPL-2+"
IUSE=""
@@ -36,11 +35,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-src_test() {
- # Files are missing; whatever. Bugs 650290, 668198
- local myctestargs=(
- -E "(ktoolbar_unittest|kxmlgui_unittest)"
- )
-
- ecm_src_test
-}
+CMAKE_SKIP_TESTS=(
+ # bug 668198: files are missing; whatever.
+ ktoolbar_unittest
+ # bug 650290
+ kxmlgui_unittest
+ # bug 808216
+ ktooltiphelper_unittest
+)
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
deleted file mode 100644
index 76de3d89245b..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-LICENSE="LGPL-2+"
-IUSE=""
-
-# slot op: includes QtCore/private/qlocale_p.h
-DEPEND="
- >=dev-qt/qtcore-${QTMIN}:5=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # Files are missing; whatever. Bugs 650290, 668198
- local myctestargs=(
- -E "(ktoolbar_unittest|kxmlgui_unittest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild
new file mode 100644
index 000000000000..aec2d0cf1a69
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-6.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,ssl,widgets,xml]
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kglobalaccel-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+ # bug 668198: files are missing; whatever.
+ ktoolbar_unittest
+ # bug 650290
+ kxmlgui_unittest
+ # bug 808216
+ ktooltiphelper_unittest
+)
diff --git a/kde-frameworks/kxmlgui/metadata.xml b/kde-frameworks/kxmlgui/metadata.xml
index a50ada50ef0e..3ace511214fd 100644
--- a/kde-frameworks/kxmlgui/metadata.xml
+++ b/kde-frameworks/kxmlgui/metadata.xml
@@ -1,11 +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="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/metadata.xml b/kde-frameworks/metadata.xml
index afde21dfac6f..1fe782f45924 100644
--- a/kde-frameworks/metadata.xml
+++ b/kde-frameworks/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
- The kde-frameworks category contains KDE Frameworks -
- the next generation of KDE libraries modularized for
- easy integration in Qt applications.
+ The kde-frameworks category contains KDE Frameworks –
+ add-on libraries for programming with Qt.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie kde-frameworks enthält die KDE Frameworks –
+ Erweiterungen für Qt.
</longdescription>
</catmetadata>
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 23501ef83471..0f20d8a9415c 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,2 @@
-DIST modemmanager-qt-5.82.0.tar.xz 112524 BLAKE2B 1569dd2defb8b99b41d3ce8c94e010a8274e04012dc72b442e13761d287a1ed6f3e281ab0f03659f1d034fe6e79c70bd6ff3c07c7a4189fbc4d154fea122a1ae SHA512 129b1618f9bb5a59c79a7a202e297c3dc6f90829c2e4841a0cd2ac15440fed19ea78ce16d2ae3b012fe02db568d337210bafcda183db9cb8a1dba0d087f16ee2
-DIST modemmanager-qt-5.84.0.tar.xz 112448 BLAKE2B 0c9677356e7ea1d1e5cb971a15e691cd28cd487d3d25d62aa60e9cf905c6b8bc005f2bed7164ca7765ba18788ad29f2173f73c8da4afd3a0828b1f07bb37cfcf SHA512 61dd3c5c0dd319fee86163e4e39356d551d49ce000c58b13e2e605be5132511c6c6464f6010ad70ab9dc3a3f28746a3d69df03746b7b9b0d170ed3bcb1b17056
+DIST modemmanager-qt-5.115.0.tar.xz 121292 BLAKE2B c7a22c7dd2761e3b330896204ad0f828dadab8baf4572ca58cd3f3f85be8cea0a8f2063d8a2f31b16191b977f7fc9ad390a78161d63f2d575f6bc7278bea18c4 SHA512 0726dbda809e94fea966f54d5adfa8d03e51e5fed5a4b5471516c39e23dd0fd652d5ce9822aa3ddd8e9197b842067040e87e5d369c8cfeccdc8d5965df935f64
+DIST modemmanager-qt-6.1.0.tar.xz 123140 BLAKE2B 2ff4741b2aa2848c02ca47eba99e94829dac46d8482f7aa3230cdca923acc09472cad838db2d4b835a86e9719ca19e42d1ded98043a1c0b7c55389917839d979 SHA512 d31d97802ad2f9068509e15430113c8e98803592ce801360222377b39a808055929292eaf76773253e5894813851fe0957fdd5c35743d481fc7caea1acd59648
diff --git a/kde-frameworks/modemmanager-qt/metadata.xml b/kde-frameworks/modemmanager-qt/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/modemmanager-qt/metadata.xml
+++ b/kde-frameworks/modemmanager-qt/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.115.0.ebuild
index 263e589dad7d..27a43aa63777 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.115.0.ebuild
@@ -1,19 +1,19 @@
-# 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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="ModemManager bindings for Qt"
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
# requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
BDEPEND="
virtual/pkgconfig
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.84.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.1.0.ebuild
index 921f6471f11b..4b797a0c02b3 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.84.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.1.0.ebuild
@@ -1,26 +1,24 @@
-# 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
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
DESCRIPTION="ModemManager bindings for Qt"
+
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
IUSE=""
# requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
-BDEPEND="
- virtual/pkgconfig
-"
DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,xml]
net-misc/modemmanager
"
RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index a7f39d999a61..2aa9b1fb1a1b 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,2 @@
-DIST networkmanager-qt-5.82.0.tar.xz 195688 BLAKE2B fbda99af246ed652f39c48bed432b934ba3aeeda7c7009c238464e2f0c586a226343dac3bdc1612c970766b3801ae0e03492dad7c73325d0254437f27d428cf3 SHA512 07d3d0e5a9f526ecea5942f5d16aa97c3ee8ab3f2481cabc01a9132e85c92a3dd1a3da744accf413d8239dbca1fce3d1ae022ffafea620f9212bda2a8fce00fe
-DIST networkmanager-qt-5.84.0.tar.xz 195708 BLAKE2B e6d6e25020fa835afd89087c068d6c62c389172e7d970705430c9d0f86b53f489e6cab4d01bd9e362d2f37ba3713da25bfa25e7b00c3f1cdb9d310bf4a16739c SHA512 06a925c242d2bc0690822a792d0f346602f154193403db367059f21ce9b9c4799e4b50d0de76894152553aed3ff0c153246cf132ff383483e37794efb8b66e02
+DIST networkmanager-qt-5.115.0.tar.xz 198888 BLAKE2B 41f4bff229f0c1cb3c327a54f428889a6fe5f413c76ca45def2eff33311a6ab5633b3c1aac2cb57e97443f7fe2303a88c3b93075eb0872bc763798815e901743 SHA512 a21522f447dabd98cae2535c41f6a08748f96c2b76ac63264615f2610b74527522edc4539598c30d1166bac8b4f1cc40729afcca36057968a781b6ce07f25e8f
+DIST networkmanager-qt-6.1.0.tar.xz 200516 BLAKE2B 2a39fd2f9a5368a2cce09263067c59c2de610b5d3499792203d492c3dbbb726fbf75667049169b29dc3a047fb11b040e60422cc1f3c4300d925584d6cbfc4e0a SHA512 a07f0c301ba1f4a21aa82b3ae91c6f49252346512d75a60a71710452bada24d082de57666d8164f42a92ca3944eeb3a7800379162bb260ecb922f0720b7128d2
diff --git a/kde-frameworks/networkmanager-qt/metadata.xml b/kde-frameworks/networkmanager-qt/metadata.xml
index 162d119899ad..aeaffa36dfdb 100644
--- a/kde-frameworks/networkmanager-qt/metadata.xml
+++ b/kde-frameworks/networkmanager-qt/metadata.xml
@@ -1,11 +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="teamd">Enable Teamd control support</flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.115.0.ebuild
index e976e0530640..6dc7083a09f6 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.115.0.ebuild
@@ -1,20 +1,19 @@
-# 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
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="NetworkManager bindings for Qt"
+
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="teamd"
-BDEPEND="
- virtual/pkgconfig
-"
DEPEND="
+ dev-libs/glib:2
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=net-misc/networkmanager-1.4.0-r1[teamd=]
@@ -25,10 +24,11 @@ RDEPEND="${DEPEND}
>=net-misc/networkmanager-1.4.0-r1[systemd]
)
"
+BDEPEND="virtual/pkgconfig"
-src_test() {
+CMAKE_SKIP_TESTS=(
# bug: 625276
- local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
- ecm_src_test
-}
+ managertest
+ settingstest
+ activeconnectiontest
+)
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.84.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.1.0.ebuild
index 23b69f5bf65c..3d59b2462fad 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.84.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.1.0.ebuild
@@ -1,22 +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
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
DESCRIPTION="NetworkManager bindings for Qt"
+
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64"
IUSE="teamd"
-BDEPEND="
- virtual/pkgconfig
-"
DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
+ dev-libs/glib:2
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,network]
>=net-misc/networkmanager-1.4.0-r1[teamd=]
"
RDEPEND="${DEPEND}
@@ -25,10 +23,11 @@ RDEPEND="${DEPEND}
>=net-misc/networkmanager-1.4.0-r1[systemd]
)
"
+BDEPEND="virtual/pkgconfig"
-src_test() {
+CMAKE_SKIP_TESTS=(
# bug: 625276
- local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
- ecm_src_test
-}
+ managertest
+ settingstest
+ activeconnectiontest
+)
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 9f1fc6a2fdfa..c6f30fe254ce 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-icons5-5.82.0.tar.xz 234613000 BLAKE2B 49c25988ccfa1a00a68c55a51b20d3052f1206a74f9ea12534243d106326471ce8219a7bb1c7abb30f1c8994bbd098753107570beb8e7f1f058eba91fabfb609 SHA512 b35ba0bea0fe88f8ef65b7ed7e56157ff4d34ebc516e0009a2bd9969bfe477a6150484f5a8987a9ee5866d27c21f92efd0eaf9673b537a6b92732b3af8133bb9
-DIST oxygen-icons5-5.84.0.tar.xz 239717996 BLAKE2B f7fdcbbba8ea019cb84d3000f4e837094fc8a60ce5aa9690e37ed12e006fd6f9dd8226332dadf77a85ba48f00fefedce9840ef17d4b5b313c4cfb453642eff26 SHA512 b8b890152d352a9ea0efe828e66d4101be435c9efac3a677eebba4b977da2efaed4f14fdefc6443621cce5a0e7ecad59bb3d8b464f4835af30e70d72aa44c379
+DIST oxygen-icons-5.115.0.tar.xz 238640536 BLAKE2B 0b8e165da8ca8cd60e12d8eb7d0f63aa4553b77382d447f5b2b0a4810652819d2ba8504d352c1f5a1109b55ba6f353ec5eb3b153535d6748aeeee03d1512fce7 SHA512 2b830e9230c3ffed4d780e1d1768dfefcbbd94307be6d19339605cb31971497c0b0b896266ad53d8c687726eea07ead0d84a432bd54916052799bf2268e22804
+DIST oxygen-icons-6.0.0.tar.xz 242619736 BLAKE2B 4af5715bcf6e190e6c6f9bd1c0f6d68d58b0ceede1f6c2d59ebfb7261904a1f82f94b91c9f7d9b4d8dea911a7f29f650ebf8de9025cfd8412fe8eaf311e9afe0 SHA512 56a165a44612936b6d8e71100806eb29ab70e1fdc36b7d53173159e86f7c2957dfefd7e52b9c108117bc6cf558ec0416bc491ae977ec75bbc3e7d37eab36b378
diff --git a/kde-frameworks/oxygen-icons/metadata.xml b/kde-frameworks/oxygen-icons/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/oxygen-icons/metadata.xml
+++ b/kde-frameworks/oxygen-icons/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.115.0.ebuild
index 08d9f3a5e249..e2882448cfd2 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.115.0.ebuild
@@ -1,27 +1,30 @@
-# 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
-KDE_ORG_NAME="oxygen-icons5"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit cmake kde.org xdg-utils
+QTMIN=5.15.9
+inherit cmake frameworks.kde.org xdg-utils
DESCRIPTION="Oxygen SVG icon theme"
LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
IUSE="test"
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
+DEPEND="
+ test? (
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qttest-${QTMIN}:5
+ )
+"
BDEPEND="
- >=dev-qt/qtcore-${QTMIN}:5
- >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:0
test? ( app-misc/fdupes )
"
-DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
src_prepare() {
cmake_src_prepare
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.84.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.84.0.ebuild
deleted file mode 100644
index 3012b2e566af..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.84.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="oxygen-icons5"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Oxygen SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="
- >=dev-qt/qtcore-${QTMIN}:5
- >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
- test? ( app-misc/fdupes )
-"
-DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
-
-src_prepare() {
- cmake_src_prepare
- use test || cmake_comment_add_subdirectory autotests
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild
new file mode 100644
index 000000000000..5205a05feae7
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.0.0
+QTMIN=6.6.2
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Oxygen SVG icon theme"
+HOMEPAGE="https://develop.kde.org/frameworks/oxygen-icons/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="6"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="!kde-frameworks/${PN}:5"
+DEPEND="test? ( >=dev-qt/qtbase-${QTMIN}:6 )"
+BDEPEND="
+ >=kde-frameworks/extra-cmake-modules-${KFMIN}:0
+ test? ( app-misc/fdupes )
+"
+
+src_prepare() {
+ cmake_src_prepare
+ use test || cmake_comment_add_subdirectory autotests
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
deleted file mode 100644
index 1d0e960cddc0..000000000000
--- a/kde-frameworks/plasma/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623ff8f31d5de0ae812ffc1666badf388fa711887afd9479d718cd50f9bdea42d725f30fbae8d32d87cd071b30b1ba49768377a8d07e9bbc3 SHA512 3e8608f7c7d6da150a30fd48e2ac5115f95f6346056ef2f12134ba8e93617c7b067b8ccb1bab5e1586f3ef1af7f010b8ddd9fe0a9a7ee0def01bc991be8e546c
-DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
-DIST plasma-framework-5.84.0.tar.xz 3145140 BLAKE2B c5f4a9e2c0121cca55ec55ea821f16b5433039fa70f485c0e049dcf7940703a937e01dee7361ba0df50284b5693fc6661ed7c8ec4ceb5d45591d61e72cdfc4c6 SHA512 e8032f80ec91d56d0f72faca27e1878e7e2e581943746214a359faee45f85dc125b02198a1623ec8cc5a74fbcd38f93bf2faf5e17f73ab410805adbf71579577
diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/plasma/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-frameworks/plasma/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/kde-frameworks/plasma/plasma-5.82.0.ebuild b/kde-frameworks/plasma/plasma-5.82.0.ebuild
deleted file mode 100644
index 56c3d574ac5e..000000000000
--- a/kde-frameworks/plasma/plasma-5.82.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-${PN}-transparency.patch.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only wayland X"
-
-RESTRICT+=" test"
-
-BDEPEND="
- >=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( virtual/opengl )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/mesa[egl]
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${WORKDIR}/${P}-plasma-transparency.patch" ) # KDE-bug 434202
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.84.0.ebuild b/kde-frameworks/plasma/plasma-5.84.0.ebuild
deleted file mode 100644
index 30849cdadab1..000000000000
--- a/kde-frameworks/plasma/plasma-5.84.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only wayland X"
-
-RESTRICT+=" test"
-
-BDEPEND="
- >=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kactivities-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kdeclarative-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kpackage-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2-only? ( virtual/opengl )
- wayland? (
- =kde-frameworks/kwayland-${PVCUT}*:5
- media-libs/mesa[egl]
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package !gles2-only OpenGL)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X XCB)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index ddd0a732819c..c00339e6522c 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,2 +1,2 @@
-DIST prison-5.82.0.tar.xz 41044 BLAKE2B 869d41631f1c41260144cf43d043bb868f3c9cf1443e544ad2a084852fa58d2a2b08a1abcd8182ba1bc2cadec229fd870ff10f483f3a9a92bc3e8b49c4138d87 SHA512 bfed4293bc3bc0c39d8cecf37a33693af59831ccb9aefc32ea717d363cfe6e0769f0f90296dd09ce5ea24016e25f352c0be400e9eacb80f813221ffce02bbb82
-DIST prison-5.84.0.tar.xz 40984 BLAKE2B b870186386e4319e6b1e8fb7f8a7805b513f8d170c3e4fd1c69c288c455e9826122f15860e79b2ae88eed278b98c64b76eb813ef0dce78c901d87829626915c2 SHA512 2507c9edd20c2e6f9ea1d7b8ab64c74876dd20af29fd631420ac83ea837007db9737acccb1a127e88cdc1b728c4465bdff85ddac4087b13b08c59fa93ab57a0e
+DIST prison-5.115.0.tar.xz 55264 BLAKE2B 26987983a64538d73eb0cd951d1b2ea6b0c63f5fc2f433136a23dba06cc36bc7cd26d6ebea02e0fe90e9113479780f6b5d43f0762b05e35399a4d67eb684edd9 SHA512 48145ee4c1fd7eb177e58b3cd676eb7e50452897b335093eb1d65ac1f6cada83ab5e43d16d26387c1f4c5b992367a91a03d07ac26ae96b253f8f03660f7b226b
+DIST prison-6.1.0.tar.xz 55444 BLAKE2B f677f51519b05958a752f2c41034eccd1a5bccddc872ebf0c69db77acb260274987ea8f54d9873194ec6b0ef3a6cad21a3bb97f3d6c9c51dce06ad7c5afd722a SHA512 4111b286b4d61b37c2a2127b2a78fea7c44a9282db17c4635c13f61217782485b919519fd50a82314f33c6a155897c6a238278bba09797fa03eb54da4e4c3887
diff --git a/kde-frameworks/prison/metadata.xml b/kde-frameworks/prison/metadata.xml
index d39a5d2d2369..8035cf6f1b4c 100644
--- a/kde-frameworks/prison/metadata.xml
+++ b/kde-frameworks/prison/metadata.xml
@@ -1,11 +1,20 @@
<?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>
+ <remote-id type="kde-invent">frameworks/prison</remote-id>
+ </upstream>
<use>
<flag name="qml">Enable QML/QtQuick support via <pkg>dev-qt/qtdeclarative</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/prison/prison-5.84.0.ebuild b/kde-frameworks/prison/prison-5.115.0.ebuild
index 6e96700d651f..dc6affb61e6b 100644
--- a/kde-frameworks/prison/prison-5.84.0.ebuild
+++ b/kde-frameworks/prison/prison-5.115.0.ebuild
@@ -1,22 +1,24 @@
-# 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
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="QRCode and data matrix barcode library"
HOMEPAGE="https://invent.kde.org/frameworks/prison"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="qml"
RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtmultimedia-${QTMIN}:5
media-gfx/qrencode:=
media-libs/libdmtx
+ media-libs/zxing-cpp:=
qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
"
DEPEND="${RDEPEND}
diff --git a/kde-frameworks/prison/prison-5.82.0.ebuild b/kde-frameworks/prison/prison-6.1.0.ebuild
index 4b4cf5db23fa..e3d7a41cad3f 100644
--- a/kde-frameworks/prison/prison-5.82.0.ebuild
+++ b/kde-frameworks/prison/prison-6.1.0.ebuild
@@ -1,31 +1,33 @@
-# 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
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
DESCRIPTION="QRCode and data matrix barcode library"
HOMEPAGE="https://invent.kde.org/frameworks/prison"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64"
IUSE="qml"
RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=dev-qt/qtmultimedia-${QTMIN}:6
media-gfx/qrencode:=
media-libs/libdmtx
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+ media-libs/zxing-cpp:=
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
"
DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
"
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package qml Qt5Quick)
+ $(cmake_use_find_package qml Qt6Quick)
)
ecm_src_configure
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 74d872d5b348..0695c546af1b 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,2 +1,2 @@
-DIST purpose-5.82.0.tar.xz 159860 BLAKE2B f29c436239b13c5c025b990a0bdda00107f947dda44b56546049a6e1341f5ca35592c5a4626d62c9ce15b914e566b9a4c96852f0ff9b22d6a22b07b744e1e5f6 SHA512 bccb2cb1ceec619eb61d27cfd027ed20e824a2ba627120581dd928bb331cc1dfc416b5f8067aa31b2a9166dca937a180efc094107a4585e590a5bd9eceec21a5
-DIST purpose-5.84.0.tar.xz 159972 BLAKE2B 034270e38474dbace3e556e86e1649aee590bf847b2a40fd1e82be9ef3da270f86f8e6bef3d4ffdb56bfafd719a28f316b3c3749fd1e540e5bd52e9335ba9e3b SHA512 1323ad30d7cddd04ada06c1bbee5ca8217173710d93a989b952c8ce4790aa7c6f3fbaf04b75cf56834d0e2867674c6296adeeb21c0b5c172c06eb257908000fd
+DIST purpose-5.115.0.tar.xz 180012 BLAKE2B 2e5a2805b19384f5e8ce0fdb94fa5cc3a7dbfeaaac027e45d95cc16091ea94e2a626ebb8be34f67838ea48049496005588ee6055f745b332676a64a35450c30e SHA512 b17cd780ed7947582fbc71430de67ebeaf33432113bbb77fba3736bd608d05fb132d40f7783cba4fdfd7ab3eec60f00676d48be0ce9c601c37f8eccc04d4db31
+DIST purpose-6.1.0.tar.xz 175584 BLAKE2B 02cabc4ff679560bad0bc77d853f97ac5b4a27e2e20c5ac0ca86ce932aa2c8ed1d8e2d24d1ff5c39513903baefea772289fd99307bcbb13282d3499205712b24 SHA512 a52b365c3e33966e2557529d63a9cab8af66d1ea976a47e9aeee62755897bada371ad16f758abefb47201728e371f050c40fd88d29b9584445b4c816e954ff78
diff --git a/kde-frameworks/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml
index 69186b245f38..6b0d501b777f 100644
--- a/kde-frameworks/purpose/metadata.xml
+++ b/kde-frameworks/purpose/metadata.xml
@@ -1,11 +1,20 @@
<?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="kaccounts">Enable support for system-wide defined KAccounts</flag>
+ <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>
diff --git a/kde-frameworks/purpose/purpose-5.82.0.ebuild b/kde-frameworks/purpose/purpose-5.115.0.ebuild
index 287308369695..608b515dc68e 100644
--- a/kde-frameworks/purpose/purpose-5.82.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.115.0.ebuild
@@ -1,44 +1,53 @@
-# 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_QTHELP="false"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature xdg-utils
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org optfeature xdg-utils
DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +kaccounts"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="bluetooth kaccounts kf6compat"
# requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
=kde-frameworks/kcoreaddons-${PVCUT}*:5
=kde-frameworks/ki18n-${PVCUT}*:5
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/kirigami-${PVCUT}*:5
=kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/prison-${PVCUT}*:5
kaccounts? (
- >=kde-apps/kaccounts-integration-19.04.3:5
- net-libs/accounts-qt
+ || (
+ kde-apps/kaccounts-integration:6[qt5]
+ kde-apps/kaccounts-integration:5
+ )
+ net-libs/accounts-qt[qt5(+)]
)
"
RDEPEND="${DEPEND}
+ kf6compat? ( kde-frameworks/purpose:6[kaccounts?] )
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kdeclarative-${PVCUT}:5
bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
- kaccounts? ( net-libs/accounts-qml )
+ kaccounts? ( net-libs/accounts-qml[qt5(+)] )
"
+BDEPEND="kaccounts? ( dev-util/intltool )"
src_prepare() {
ecm_src_prepare
@@ -55,6 +64,20 @@ src_configure() {
ecm_src_configure
}
+src_install() {
+ ecm_src_install
+
+ if use kf6compat; then
+ rm "${D}"/usr/share/icons/hicolor/128x128/apps/{reviewboard,phabricator}-purpose.png \
+ "${D}"/usr/share/icons/hicolor/16x16/apps/{reviewboard,phabricator}-purpose.png \
+ || die
+ if use kaccounts; then
+ rm "${D}"/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service \
+ || die
+ fi
+ fi
+}
+
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
optfeature "Send through KDE Connect" kde-misc/kdeconnect
diff --git a/kde-frameworks/purpose/purpose-5.84.0.ebuild b/kde-frameworks/purpose/purpose-5.84.0.ebuild
deleted file mode 100644
index 0dc933045ffd..000000000000
--- a/kde-frameworks/purpose/purpose-5.84.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature xdg-utils
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="bluetooth +kaccounts"
-
-# requires running environment
-RESTRICT+=" test"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- kaccounts? (
- >=kde-apps/kaccounts-integration-19.04.3:5
- net-libs/accounts-qt
- )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kdeclarative-${PVCUT}:5
- bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
- kaccounts? ( net-libs/accounts-qml )
-"
-
-src_prepare() {
- ecm_src_prepare
-
- use bluetooth ||
- cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package kaccounts KAccounts)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "Send through KDE Connect" kde-misc/kdeconnect
- fi
- ecm_pkg_postinst
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/kde-frameworks/purpose/purpose-6.1.0.ebuild b/kde-frameworks/purpose/purpose-6.1.0.ebuild
new file mode 100644
index 000000000000..644569f4d542
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-6.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="bluetooth kaccounts"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ =kde-frameworks/kirigami-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/prison-${PVCUT}*:6
+ kaccounts? (
+ kde-apps/kaccounts-integration:6
+ >=net-libs/accounts-qt-1.16_p20220803[qt6]
+ )
+"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ >=kde-frameworks/kdeclarative-${PVCUT}:6
+ bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 )
+ kaccounts? ( >=net-libs/accounts-qml-0.7_p20231028[qt6] )
+"
+BDEPEND="kaccounts? ( dev-util/intltool )"
+
+src_prepare() {
+ ecm_src_prepare
+
+ use bluetooth ||
+ cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package kaccounts KAccounts6)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Send through KDE Connect" kde-misc/kdeconnect
+ fi
+ ecm_pkg_postinst
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index c305d2927b49..1e4c4a6af101 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,2 +1,2 @@
-DIST qqc2-desktop-style-5.82.0.tar.xz 60076 BLAKE2B 1d743ff60c5862740bd2ef9c0dcadacca3f63f239a78dbd12e459f929f323b695ddd9c03323146b7ac34772ff76f2137e8dad826e04abef6a1f4ed514163e305 SHA512 ce4db38f835971d6f63dced360db8a320e06e3a6f808bd017d56548041f6d0332b119dc0f6d4e160c7847d9d47e6818d2a867e0f243e58fd6c56843643d55a52
-DIST qqc2-desktop-style-5.84.0.tar.xz 59960 BLAKE2B 6787aae84a9fd6657801ae2b90dedc8736f98b6b3fc0a769c6f269dc29f7e46dbe2f826c6a38725d3c25d3c9fb405221d1c1179e706e3efe4101d9bcebcb4bd8 SHA512 9cb24d5013dea87fe96c4de464e8c72934e578385fe371880b6e599e46b45631c677f8b98c367bc60252cfadff2142da0652010d734c4f57d7ac46599bcb029a
+DIST qqc2-desktop-style-5.115.0.tar.xz 69448 BLAKE2B 1164f0a3a3868de02e82d94beaf65c13aab6b28a1945f5b8d539cd2bc7a2a692d96762f007bacb8e542275d7f049d38956a440a6fed1ad07040b19d9cd298a17 SHA512 79d3395e687f7e5117997639f05a5358a13dc9f343ce3a007b3d64d1a5a470caa03a8e3d0e11b66ec394d8e1cc1817aea1d337477d741295dac48fec83a9914b
+DIST qqc2-desktop-style-6.1.0.tar.xz 84260 BLAKE2B 21a7757134fb20c5bc8eca84a3b368887bfc2746b408fe62ce189054bb6e75be28e353c642ea0525b6edbbeb0b558b1a30dd28e8c4716d7bd14c192c9f81ad40 SHA512 befb9c9ee024fcf73a04be9495800172d2049f9a0c14d21fe8e5c7d889a1411702de2297e1a27ca11154f7471b541ab1b02b182d38622a81eabd6b3a8aca1530
diff --git a/kde-frameworks/qqc2-desktop-style/metadata.xml b/kde-frameworks/qqc2-desktop-style/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/qqc2-desktop-style/metadata.xml
+++ b/kde-frameworks/qqc2-desktop-style/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.115.0.ebuild
index 0d1060b73b9c..e6b354dbd922 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.115.0.ebuild
@@ -1,26 +1,29 @@
-# 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_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
+ >=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/kconfigwidgets-${PVCUT}*:5
=kde-frameworks/kiconthemes-${PVCUT}*:5
=kde-frameworks/kirigami-${PVCUT}*:5
+ =kde-frameworks/sonnet-${PVCUT}*:5[qml]
"
RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.84.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.84.0.ebuild
deleted file mode 100644
index ac284e1bcdf5..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.84.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5=
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kirigami-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild
new file mode 100644
index 000000000000..f16eae109fb7
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
+# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6=
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kirigami-${PVCUT}*:6
+ =kde-frameworks/sonnet-${PVCUT}*:6[qml]
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qt5compat-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 313c229d2745..67b5e9ebf2be 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1,2 @@
-DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
-DIST solid-5.84.0.tar.xz 275876 BLAKE2B beec229d68b57c450f9fa209af0038e060a1c16b7966cc3fec8ec0cf3eff9970162ea2f7febcc5dcac48ea2591d1a9ee5ec075926e3561868e48c017b216043b SHA512 2c646c1347312cb3cc716cd35b90da8057d09546c3e90cb0dab823c6cc07495efa04fe980503ed201e5cbcb763e130a8f0444b46139dbdf2e6749a445821616e
+DIST solid-5.115.0.tar.xz 306312 BLAKE2B 866476310d2a2b477f01edb5ca2206cebd5c1d5ea7d1907b9c2915b3be2e86a38bab7405af0680d086611cd46fc292da7fc9b9b623bc6573f7a00fb1fc625b2f SHA512 727fe483124edcfbc56aad2f3988c1499b1d100173279a0da3477a12857e0381b845a9efa1d1827ad24a96557d3a2d0ce67b09e53571c37637dbb4aac4dff4d1
+DIST solid-6.1.1.tar.xz 305916 BLAKE2B 7e134f72ba879c1f7fac04a3f638a9ba19dc254da04b3e4ea8a3a73324fef927f2dffd1e393be08cf62417ed5ad42083b822e84190cb094c360ad059778e1bdb SHA512 d30e6426e418791f0cab72fb5ab54ed2d8ff98212959fee5a4e661db2165a0b920f3a1c36ebc518b4659b36640429e31925200946a45999d874424f4756158d5
diff --git a/kde-frameworks/solid/metadata.xml b/kde-frameworks/solid/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/solid/metadata.xml
+++ b/kde-frameworks/solid/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/solid/solid-5.84.0.ebuild b/kde-frameworks/solid/solid-5.115.0.ebuild
index ee0d8d0d9790..f3d77112cc05 100644
--- a/kde-frameworks/solid/solid-5.84.0.ebuild
+++ b/kde-frameworks/solid/solid-5.115.0.ebuild
@@ -1,17 +1,16 @@
-# 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
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org optfeature
DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ios nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="ios"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -30,9 +29,9 @@ DEPEND="${RDEPEND}
test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
"
BDEPEND="
- sys-devel/bison
- sys-devel/flex
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+ app-alternatives/lex
+ app-alternatives/yacc
+ >=dev-qt/linguist-tools-${QTMIN}:5
"
src_configure() {
diff --git a/kde-frameworks/solid/solid-5.82.0.ebuild b/kde-frameworks/solid/solid-6.1.1.ebuild
index e8640aea1b0a..deef27fe5a5c 100644
--- a/kde-frameworks/solid/solid-5.82.0.ebuild
+++ b/kde-frameworks/solid/solid-6.1.1.ebuild
@@ -1,27 +1,21 @@
-# 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
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org optfeature
DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="ios nls"
+KEYWORDS="~amd64"
+IUSE="ios"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ sys-apps/util-linux
sys-fs/udisks:2
virtual/libudev:=
ios? (
@@ -30,7 +24,12 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND="
+ app-alternatives/lex
+ app-alternatives/yacc
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
"
src_configure() {
@@ -43,7 +42,7 @@ src_configure() {
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "Media player devices support" app-misc/media-player-info
+ optfeature "media player devices support" app-misc/media-player-info
fi
ecm_pkg_postinst
}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 28959ba4b308..fb7a30dfca08 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1,2 @@
-DIST sonnet-5.82.0.tar.xz 293844 BLAKE2B 6e2c4558957d845a281955c63de7dd87fc21634a4cb3e89af47345da070b1dc15e91c558a865e0c7ac5e2adb2454d36b6b8f2f521112b4fd07ad1b2ad02f6c04 SHA512 3bc876b1e06ba5c08c05ce74530a2584b9853e8c9742f66b19529e7f78f3aad89d3a72e0a615e912d1cfd7a24b3de3a9068d0f72dce3c51ca03b896eeedde817
-DIST sonnet-5.84.0.tar.xz 295300 BLAKE2B bafd06d4b57841c4fa39e55235f12dbe447316f4e2af3b1b2dde3f9f6eb817a97a2298320447fbc0a2186ba50e5cd6bd62e77a5828087b65b6097961babaa7af SHA512 49021de3684d899b20b2ba8f980a701e3f467b0a9f76935fc38c347881a371bb0c51f924d44fc819f86119589df1391427365aabd92c1eebbd66f8d46bdf901d
+DIST sonnet-5.115.0.tar.xz 2438396 BLAKE2B f0cd760a8b873502f517836d36904b83b5cde11383264827879048d7f02b2a2f26d9682f7f2b46b4c7c723cb1f35f1be4a221e5d56d87ae5a97f8c2b7489a727 SHA512 ee95bd4be8fb97eb284f9f7f6dedbf4b8eb9d105cc95f0a489c2acbc52b447e138ce70a4dc8aca4ebb8f90f328ab7c87dda4ce66b9026cf303479f1455b55c7c
+DIST sonnet-6.1.0.tar.xz 2441692 BLAKE2B f352ddfa548ee4748bb378883ca71de0bf04dd6c562302c2d30a404d2438bb695d9ccdd769add50fd7f2599aab189ef8c343f8a41fe2f29c4a44d059cfbdde27 SHA512 af609e0f978d287073c5ca338ddb221fb8fc3c27a5165bda5f639a3f532f0d02672575287f71be368e0399beac99dc8bdb8f8977df69072e58d8c5f040458635
diff --git a/kde-frameworks/sonnet/metadata.xml b/kde-frameworks/sonnet/metadata.xml
index 0d422498d83c..fc26a6a5cb5b 100644
--- a/kde-frameworks/sonnet/metadata.xml
+++ b/kde-frameworks/sonnet/metadata.xml
@@ -1,13 +1,22 @@
<?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="aspell">Enable the app-text/aspell spell-checking backend</flag>
+ <flag name="aspell">Enable the <pkg>app-text/aspell</pkg> spell-checking backend</flag>
<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
- <flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
+ <flag name="hunspell">Enable the <pkg>app-text/hunspell</pkg> spell-checking backend</flag>
+ <flag name="qml">Enable QML/QtQuick support via <pkg>dev-qt/qtdeclarative</pkg></flag>
</use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/sonnet/sonnet-5.82.0.ebuild b/kde-frameworks/sonnet/sonnet-5.115.0.ebuild
index 2c3caa333964..4ab9949af1dc 100644
--- a/kde-frameworks/sonnet/sonnet-5.82.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.115.0.ebuild
@@ -1,44 +1,42 @@
-# 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_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+
LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="aspell +hunspell nls"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+IUSE="aspell +hunspell qml"
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
aspell? ( app-text/aspell )
hunspell? ( app-text/hunspell:= )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
"
RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+CMAKE_SKIP_TESTS=(
+ # bug 779994
+ sonnet-test_autodetect
+ # bug 680032
+ sonnet-test_settings
+ sonnet-test_highlighter
+)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package aspell ASPELL)
$(cmake_use_find_package hunspell HUNSPELL)
+ -DSONNET_USE_QML=$(usex qml)
)
ecm_src_configure
}
-
-src_test() {
- # sonnet-test_settings: bug 680032
- # sonnet-test_autodetect: bug 779994
- local myctestargs=(
- -E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/sonnet/sonnet-5.84.0.ebuild b/kde-frameworks/sonnet/sonnet-5.84.0.ebuild
deleted file mode 100644
index c2df24e9d697..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.84.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="aspell +hunspell nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- aspell? ( app-text/aspell )
- hunspell? ( app-text/hunspell:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package aspell ASPELL)
- $(cmake_use_find_package hunspell HUNSPELL)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # sonnet-test_settings: bug 680032
- # sonnet-test_autodetect: bug 779994
- local myctestargs=(
- -E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)"
- )
-
- ecm_src_test
-}
diff --git a/kde-frameworks/sonnet/sonnet-6.1.0.ebuild b/kde-frameworks/sonnet/sonnet-6.1.0.ebuild
new file mode 100644
index 000000000000..59dafac959a3
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-6.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="aspell +hunspell qml"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell:= )
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+ # bug 779994
+ sonnet-test_autodetect
+ # bug 680032
+ sonnet-test_settings
+ sonnet-test_highlighter
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package aspell ASPELL)
+ $(cmake_use_find_package hunspell HUNSPELL)
+ -DSONNET_USE_QML=$(usex qml)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index c710afa4979f..338f647e2e36 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,2 +1,2 @@
-DIST syndication-5.82.0.tar.xz 508368 BLAKE2B 5bae3d80f818670cad1a08f3e085fff45116067f811b34390e4cb64c2f4aaf6c171abdc462e7075ce43b1208ad25cf15f088d8d06f3e922222cac94eb9108d80 SHA512 59e8f88138d6d18d7b4c4f2e5596606bdd13aa7425e55dadf24cf4a1592cda0c547b077d303dce514a0e20d5cca0740e6e6879ffda6470c0fa9302cd11eedbc0
-DIST syndication-5.84.0.tar.xz 508232 BLAKE2B c8ee359992b8eb86790841420256805b96acdd6e2242a3502d581da78633696a12a916131372d9dfb858d45e0427b85bdeeb6fcebbd2ed32328c5a78e610956e SHA512 cdab7872f31c6d19d590c9318618f92ac5cab532944320223183fe957030745c1dc170dedbbc0dfcb33d5119974f9c8731090fbda1dce56e78e28a4fa53fbc85
+DIST syndication-5.115.0.tar.xz 510504 BLAKE2B f8080c800710170fdbb8756502a33d8788f0d23a557be7cffe7ee7cb1b2c903fb8c69537ce5f99344487c72866e3d458890b89e9c8a58142d854d4a2038002fb SHA512 477d50ac097f63ecdfce009a2c52cae58d08213f06c1ae806956c0b6d6d6a4253d9cc77c4ed5e44f39a7d10ff539e24243cbe45f43db3a1720bd83479ff783cd
+DIST syndication-6.1.0.tar.xz 569560 BLAKE2B fa29327e96feeeb6ddd46933fd213fcff64ff17a5c02c6f7748ccd56209dfce8f91c984629bdc6d817398a427f71b7eb5892e9f62fc2f9863c65f9574cb67c83 SHA512 40d5e8b40a53ce4e86a48cafc9c1f7a3e92872a366ab381412eb29331126e4e0e89ec76a15c8c4c0be9d2425dd5e1c78f8d9cc36077f169609f245b5b4168e53
diff --git a/kde-frameworks/syndication/metadata.xml b/kde-frameworks/syndication/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/syndication/metadata.xml
+++ b/kde-frameworks/syndication/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/syndication/syndication-5.84.0.ebuild b/kde-frameworks/syndication/syndication-5.115.0.ebuild
index 4efba838ce84..ca33c20c9b63 100644
--- a/kde-frameworks/syndication/syndication-5.84.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.115.0.ebuild
@@ -1,17 +1,17 @@
-# 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="true"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
DESCRIPTION="Library for parsing RSS and Atom feeds"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/syndication/syndication-5.82.0.ebuild b/kde-frameworks/syndication/syndication-5.82.0.ebuild
deleted file mode 100644
index c3867c004d48..000000000000
--- a/kde-frameworks/syndication/syndication-5.82.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/syndication/syndication-6.1.0.ebuild b/kde-frameworks/syndication/syndication-6.1.0.ebuild
new file mode 100644
index 000000000000..eec507e0f8a0
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-6.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[xml]
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 0f069d960ef8..5c07fb7c5b76 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,2 +1,2 @@
-DIST syntax-highlighting-5.82.0.tar.xz 2290880 BLAKE2B 14a98534b4e0ec85bd3bb3603c6330f665b5d2a3958f1b9034e48fdc542aca0c0eca80a1bc5c75179c480ffb40189dd94a847093e81ab4af91442a9e323f7d32 SHA512 4487fece4b144fcdc3b03bc0c11573dcdb0bb073218f25a98a7d08fe55db0fde027f32b5614fa5083097136310cae46d7d28288f7f874eaa2fbd930af2d9fb16
-DIST syntax-highlighting-5.84.0.tar.xz 2328668 BLAKE2B e1df65b9897a391e2c0e33db7e48839a493b781d4904f16b4c6657603a79957fa21a08113afd386d036690754caf302127a721b9dfc71bd2dea36ef11564c6c1 SHA512 0eef420b8aa3917f28bfd64cbe046ebbfe34e9e537c7641666921d26931b3e5eab671b7b104857930fd35981f55bdce9d114b318b4bad2106479e1c3328b690b
+DIST syntax-highlighting-5.115.0.tar.xz 3432708 BLAKE2B 3ecfda27588509e5b791f3a78806c6fc3d898807157edef9e574c73f26069b1d92093d8c760da785cc9d769504a13f261c340fa4829857f37e158ade81a96dee SHA512 6a25a6c3be6258e956663065864ec177d05d91c817e79922ba599e45d4738813746a7c751c5043135d2c7255d341a60a6152e1d02ad90136e00a97ecb2ecd479
+DIST syntax-highlighting-6.1.0.tar.xz 3533272 BLAKE2B c88fdd05a966c6990ea752dfbd8200191b798145695d11ce223bc6ac36e5b5160844d7cd959ec886a4b9e8c383f18016d2dacc3d24dec33a85dcfcafb67bcfb2 SHA512 1aebf4507461aca80f5248cbce3311ca5a000b0d5e1f214ca877fd184a9380ac7646fab999901e230717a90047c90a66e8eedb35c224883474e20554b6931690
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch
new file mode 100644
index 000000000000..8ab49e752f2a
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch
@@ -0,0 +1,85 @@
+From aaede4eff4f9aa160be767c7b1aee0cf27cbb0e8 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Sun, 3 Mar 2024 18:01:38 +0100
+Subject: [PATCH] use (?:sub){0,2} to work with all pcre versions
+
+---
+ autotests/html/highlight.ly.dark.html | 2 +-
+ autotests/html/highlight.ly.html | 2 +-
+ autotests/reference/highlight.ly.ref | 2 +-
+ data/syntax/lilypond.xml | 6 +++---
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/autotests/html/highlight.ly.dark.html b/autotests/html/highlight.ly.dark.html
+index 8a8466174..441a16839 100644
+--- a/autotests/html/highlight.ly.dark.html
++++ b/autotests/html/highlight.ly.dark.html
+@@ -15,7 +15,7 @@
+ <span style="color:#7a7c7d;">%}</span>
+
+ <span style="font-weight:bold;">\header {</span>
+- title = <span style="color:#f44f4f;">&quot;Katepart Lilypond syntax highlighting test file&quot;</span>
++ <span style="color:#2980b9;">title</span> = <span style="color:#f44f4f;">&quot;Katepart Lilypond syntax highlighting test file&quot;</span>
+ <span style="color:#2980b9;">composer</span> = <span style="color:#7a7c7d;">%{&quot;Wilbert Berendsen&quot;%}</span> <span style="color:#f44f4f;">&quot;Anonymus&quot;</span>
+ <span style="color:#2980b9;">poet</span> = <span style="color:#f44f4f;">&quot;The KDE team&quot;</span>
+ <span style="color:#2980b9;">opus</span> = <span style="color:#f44f4f;">&quot;1&quot;</span>
+diff --git a/autotests/html/highlight.ly.html b/autotests/html/highlight.ly.html
+index 8bc714646..1081ed38c 100644
+--- a/autotests/html/highlight.ly.html
++++ b/autotests/html/highlight.ly.html
+@@ -15,7 +15,7 @@
+ <span style="color:#898887;">%}</span>
+
+ <span style="font-weight:bold;">\header {</span>
+- title = <span style="color:#bf0303;">&quot;Katepart Lilypond syntax highlighting test file&quot;</span>
++ <span style="color:#0057ae;">title</span> = <span style="color:#bf0303;">&quot;Katepart Lilypond syntax highlighting test file&quot;</span>
+ <span style="color:#0057ae;">composer</span> = <span style="color:#898887;">%{&quot;Wilbert Berendsen&quot;%}</span> <span style="color:#bf0303;">&quot;Anonymus&quot;</span>
+ <span style="color:#0057ae;">poet</span> = <span style="color:#bf0303;">&quot;The KDE team&quot;</span>
+ <span style="color:#0057ae;">opus</span> = <span style="color:#bf0303;">&quot;1&quot;</span>
+diff --git a/autotests/reference/highlight.ly.ref b/autotests/reference/highlight.ly.ref
+index f11654d43..9b7afdb3c 100644
+--- a/autotests/reference/highlight.ly.ref
++++ b/autotests/reference/highlight.ly.ref
+@@ -9,7 +9,7 @@
+ <Comment>%}</Comment><br/>
+ <Normal Text></Normal Text><br/>
+ <Keyword>\header {</Keyword><br/>
+-<Normal Text> title = </Normal Text><Quoted Text>"Katepart Lilypond syntax highlighting test file"</Quoted Text><br/>
++<Normal Text> </Normal Text><Variable>title</Variable><Normal Text> = </Normal Text><Quoted Text>"Katepart Lilypond syntax highlighting test file"</Quoted Text><br/>
+ <Normal Text> </Normal Text><Variable>composer</Variable><Normal Text> = </Normal Text><Comment>%{"Wilbert Berendsen"%}</Comment><Normal Text> </Normal Text><Quoted Text>"Anonymus"</Quoted Text><br/>
+ <Normal Text> </Normal Text><Variable>poet</Variable><Normal Text> = </Normal Text><Quoted Text>"The KDE team"</Quoted Text><br/>
+ <Normal Text> </Normal Text><Variable>opus</Variable><Normal Text> = </Normal Text><Quoted Text>"1"</Quoted Text><br/>
+diff --git a/data/syntax/lilypond.xml b/data/syntax/lilypond.xml
+index 58a4459db..1894d4063 100644
+--- a/data/syntax/lilypond.xml
++++ b/data/syntax/lilypond.xml
+@@ -23,7 +23,7 @@
+ <!ENTITY markupnotextargs "arrow-head|beam|char|(semi|sesqui|double)?(flat|sharp)|draw-(circle|line)|epsfile|eyeglasses|filled-box|fret-diagram(-terse|-verbose)?|fromproperty|harp-pedal|(justify|wordwrap)-(field|string)|left-brace|lookup|markalphabet|markletter|musicglyph|natural|note-by-number|note|null|path|right-brace|simple|(back)?slashed-digit|stencil|strut|tied-lyric|triangle|verbatim-file">
+ <!ENTITY markupwithtextargs "markup|bold|(rounded-)?box|bracket|caps|(center|general|left|right)-align|circle|((center|dir|left|right)-)?column|combine|concat|dynamic|fill-line|finger|fontCaps|(abs-)?fontsize|fraction|halign|hbracket|hcenter-in|hcenter|hspace|huge|italic|justify|larger?|line|lower|magnify|medium|normal-size-(sub|super)|normal-text|normalsize|number|on-the-fly|override|pad-(around|markup|to-box|x)|page-ref|postscript|put-adjacent|raise|roman|rotate|sans|small(er)?|smallCaps|sub|super|teeny|text|tiny|translate(-scaled)?|transparent|typewriter|underline|upright|vcenter|whiteout|with-(color|dimensions|url)|wordwrap|(markup|column-|justified-|override-|wordwrap-)lines|wordwrap-(string-)?internal">
+ <!ENTITY deprecatedmarkup "bigger|h?center">
+- <!ENTITY headervars "dedication|(sub){,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc|footer">
++ <!ENTITY headervars "dedication|(?:sub){0,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc|footer">
+
+ <!-- The '-new' entities are for for LilyPond 2.13.4 and higher, and '-old' for LilyPond up to 2.12 -->
+ <!ENTITY paper-margin "(top|bottom|left|right)-margin|(foot|head)-separation|indent|short-indent|paper-(height|width)|horizontal-shift|line-width">
+@@ -56,7 +56,7 @@
+ ]>
+ <language name="LilyPond" section="Other"
+ style="lilypond" indenter="lilypond"
+- version="10" kateversion="5.0"
++ version="11" kateversion="5.0"
+ extensions="*.ly;*.LY;*.ily;*.ILY;*.lyi;*.LYI"
+ mimetype="text/x-lilypond"
+ author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL">
+@@ -1076,7 +1076,7 @@
+ <RegExpr String="(&quot;?)\b(?:&engravers00;|&engravers01;|&engravers02;|&engravers1;|&engravers2;)\b\1" attribute="Engraver"/>
+ <keyword String="layoutobjects" attribute="Layout Object"/>
+ <keyword String="properties" attribute="Property"/>
+- <RegExpr String="\b(&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/>
++ <RegExpr String="\b(?:&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/>
+ <keyword String="deprecatedproperties" attribute="Deprecated Property"/>
+ <IncludeRules context="default"/>
+ </context>
+--
+GitLab
+
diff --git a/kde-frameworks/syntax-highlighting/metadata.xml b/kde-frameworks/syntax-highlighting/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/syntax-highlighting/metadata.xml
+++ b/kde-frameworks/syntax-highlighting/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild
new file mode 100644
index 000000000000..93a2dfd1f115
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5"
+BDEPEND="
+ dev-lang/perl
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) # bug 924756
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
deleted file mode 100644
index 17d20ea30d1a..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
- dev-lang/perl
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
- ecm_src_install
- dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.84.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.84.0.ebuild
deleted file mode 100644
index 02499f839b90..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.84.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- dev-lang/perl
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
- ecm_src_install
- dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild
new file mode 100644
index 000000000000..059677d77655
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE=""
+
+# examples: dev-qt/qtbase[printsupport,widgets]
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,network]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+"
+DEPEND="${RDEPEND}
+ dev-libs/xerces-c
+"
+BDEPEND="
+ dev-lang/perl
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
+"
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 85789df85d7f..ab0612c3ca98 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1,2 @@
-DIST threadweaver-5.82.0.tar.xz 1410496 BLAKE2B 2723b05277c1f8baa35ca0b759d21c75016a93912eb99600002cc4d5c816971fbefa41330fb1d2861d9d1a71ea9e4b8c5e938f87c5f61f450b93a18dd365b2b0 SHA512 11814680c7209ac29751e4b1411ea2d177e71306e06a9f01635f579147efa75641d6d3dfe84c0c52950069b415edb67965fc899427d69e896028510676af0e6c
-DIST threadweaver-5.84.0.tar.xz 1410032 BLAKE2B 85ea377558844a5be967332116929d32ed26c30ac20f6adb8980d4971d7996220d60300f691249028204da5f901e0c4f229575798f17f85a78258449d3eb660c SHA512 975998c58e61b611175d0505d1396f205962f7a134d15e78d55460eb66b20b1626c2885259b567cd34fafd4fbcf6e2350a23b4071be109f8f4d07ccb73d0dfaf
+DIST threadweaver-5.115.0.tar.xz 1413108 BLAKE2B 39a26c4e7fcf1350afb3c773cbf9bda02179eb3eb79857d8783830c4903a2539a27923302d6f0d52143c70e2d5ea5a7d0286567e01747ad489654a9a9f38a06e SHA512 4c7fa0fe4d04269bfabebab0cab1636e237005046b6c88e27f7dcb0bf8dc6b96d62254748e97177ae9b9a7ec69756130429280e09c64db8cb7f851d997b55240
+DIST threadweaver-6.1.0.tar.xz 1414960 BLAKE2B c0233d9d51ce20509bdea187c77d3da00885f3404579898d9c62422af370df186fb140e69b38b29c7bdbf477276cd1c9d7d1c640441d49440ee1bac8020c41b1 SHA512 ebbc7c83caa9bbd369ca0c8a7c807291f60b78fa1a7b4bcd1aa2bc2e5f8d1714f73b564b5ca511e430d8b594675ae2fe71032b6ceb62426f18cac85e94380b60
diff --git a/kde-frameworks/threadweaver/metadata.xml b/kde-frameworks/threadweaver/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/threadweaver/metadata.xml
+++ b/kde-frameworks/threadweaver/metadata.xml
@@ -1,8 +1,16 @@
<?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>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>
diff --git a/kde-frameworks/threadweaver/threadweaver-5.84.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.115.0.ebuild
index 4529902946b8..babc8b629360 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.84.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.115.0.ebuild
@@ -1,13 +1,13 @@
-# 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
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
src_prepare() {
diff --git a/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild b/kde-frameworks/threadweaver/threadweaver-6.1.0.ebuild
index bb0ec531692d..5339424c365c 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-6.1.0.ebuild
@@ -1,13 +1,14 @@
-# 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
-inherit ecm kde.org
+inherit ecm frameworks.kde.org
DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64"
IUSE=""
src_prepare() {