summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2025-07-09 17:08:38 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2025-07-09 17:08:38 +0000
commit71f43e3cc0c7618793cf04cecc841692c3eb3310 (patch)
tree1dccdc3c65116743a002b870122e666c2c07fa0e
parent0a2e4b99c95c8ae17d8256af8f1c47b0e17d231e (diff)
parent00099a2f4c0578cabd85a092664bb9664e140f58 (diff)
downloadkde-71f43e3cc0c7618793cf04cecc841692c3eb3310.tar.gz
kde-71f43e3cc0c7618793cf04cecc841692c3eb3310.tar.bz2
kde-71f43e3cc0c7618793cf04cecc841692c3eb3310.zip
Merge updates from master
-rw-r--r--Documentation/package.accept_keywords/.kde-gear-live/kdeedu-live4
-rw-r--r--Documentation/package.accept_keywords/kde-gear-live.keywords4
-rw-r--r--Documentation/package.mask/kde-gear-live4
-rw-r--r--Documentation/package.unmask/kde-gear-live4
-rw-r--r--kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild6
-rw-r--r--sets/kdeedu-live4
6 files changed, 13 insertions, 13 deletions
diff --git a/Documentation/package.accept_keywords/.kde-gear-live/kdeedu-live b/Documentation/package.accept_keywords/.kde-gear-live/kdeedu-live
index bb9ed81345b..d2456bcc38c 100644
--- a/Documentation/package.accept_keywords/.kde-gear-live/kdeedu-live
+++ b/Documentation/package.accept_keywords/.kde-gear-live/kdeedu-live
@@ -14,8 +14,8 @@
~kde-apps/kiten-9999 **
~kde-apps/klettres-9999 **
~kde-apps/kmplot-9999 **
-# ~kde-apps/kqtquickcharts-9999 # while KF5-based
-# ~kde-apps/ktouch-9999 # while KF5-based
+~kde-apps/kqtquickcharts-9999 **
+~kde-apps/ktouch-9999 **
~kde-apps/kturtle-9999 **
~kde-apps/kwordquiz-9999 **
~kde-apps/libkeduvocdocument-9999 **
diff --git a/Documentation/package.accept_keywords/kde-gear-live.keywords b/Documentation/package.accept_keywords/kde-gear-live.keywords
index 2192a77a4a0..ee9453d14b1 100644
--- a/Documentation/package.accept_keywords/kde-gear-live.keywords
+++ b/Documentation/package.accept_keywords/kde-gear-live.keywords
@@ -42,8 +42,8 @@
~kde-apps/kiten-9999 **
~kde-apps/klettres-9999 **
~kde-apps/kmplot-9999 **
-# ~kde-apps/kqtquickcharts-9999 # while KF5-based
-# ~kde-apps/ktouch-9999 # while KF5-based
+~kde-apps/kqtquickcharts-9999 **
+~kde-apps/ktouch-9999 **
~kde-apps/kturtle-9999 **
~kde-apps/kwordquiz-9999 **
~kde-apps/libkeduvocdocument-9999 **
diff --git a/Documentation/package.mask/kde-gear-live b/Documentation/package.mask/kde-gear-live
index ae38a0f90ce..f724568bcb2 100644
--- a/Documentation/package.mask/kde-gear-live
+++ b/Documentation/package.mask/kde-gear-live
@@ -31,8 +31,8 @@
~kde-apps/kiten-9999
~kde-apps/klettres-9999
~kde-apps/kmplot-9999
-# ~kde-apps/kqtquickcharts-9999 # while KF5-based
-# ~kde-apps/ktouch-9999 # while KF5-based
+~kde-apps/kqtquickcharts-9999
+~kde-apps/ktouch-9999
~kde-apps/kturtle-9999
~kde-apps/kwordquiz-9999
~kde-apps/libkeduvocdocument-9999
diff --git a/Documentation/package.unmask/kde-gear-live b/Documentation/package.unmask/kde-gear-live
index ae38a0f90ce..f724568bcb2 100644
--- a/Documentation/package.unmask/kde-gear-live
+++ b/Documentation/package.unmask/kde-gear-live
@@ -31,8 +31,8 @@
~kde-apps/kiten-9999
~kde-apps/klettres-9999
~kde-apps/kmplot-9999
-# ~kde-apps/kqtquickcharts-9999 # while KF5-based
-# ~kde-apps/ktouch-9999 # while KF5-based
+~kde-apps/kqtquickcharts-9999
+~kde-apps/ktouch-9999
~kde-apps/kturtle-9999
~kde-apps/kwordquiz-9999
~kde-apps/libkeduvocdocument-9999
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
index bb7694c687a..9f6721e0756 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
@@ -22,12 +22,12 @@ RDEPEND="
>=kde-apps/kdeedu-data-${PV}:*
>=kde-apps/kgeography-${PV}:*
>=kde-apps/khangman-${PV}:*
- qt5? ( >=kde-apps/kig-25.04.0:* )
+ >=kde-apps/kig-${PV}:*
>=kde-apps/kiten-${PV}:*
>=kde-apps/klettres-${PV}:*
>=kde-apps/kmplot-${PV}:*
- qt5? ( >=kde-apps/kqtquickcharts-25.04.0:* )
- qt5? ( >=kde-apps/ktouch-25.04.0:* )
+ >=kde-apps/kqtquickcharts-${PV}:*
+ >=kde-apps/ktouch-${PV}:*
>=kde-apps/kturtle-${PV}:*
>=kde-apps/kwordquiz-${PV}:*
>=kde-apps/libkeduvocdocument-${PV}:*
diff --git a/sets/kdeedu-live b/sets/kdeedu-live
index 27b3b8f83fd..c8b9d8352c4 100644
--- a/sets/kdeedu-live
+++ b/sets/kdeedu-live
@@ -14,8 +14,8 @@
~kde-apps/kiten-9999
~kde-apps/klettres-9999
~kde-apps/kmplot-9999
-# ~kde-apps/kqtquickcharts-9999 # while KF5-based
-# ~kde-apps/ktouch-9999 # while KF5-based
+~kde-apps/kqtquickcharts-9999
+~kde-apps/ktouch-9999
~kde-apps/kturtle-9999
~kde-apps/kwordquiz-9999
~kde-apps/libkeduvocdocument-9999