diff options
| -rw-r--r-- | Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live | 2 | ||||
| -rw-r--r-- | Documentation/package.accept_keywords/kde-gear-live.keywords | 2 | ||||
| -rw-r--r-- | Documentation/package.mask/kde-gear-live | 2 | ||||
| -rw-r--r-- | Documentation/package.unmask/kde-gear-live | 2 | ||||
| -rw-r--r-- | eclass/gear.kde.org.eclass | 3 | ||||
| -rw-r--r-- | kde-apps/kamoso/kamoso-9999.ebuild | 41 | ||||
| -rw-r--r-- | net-misc/smb4k/smb4k-9999.ebuild | 1 | ||||
| -rw-r--r-- | sets/kdemultimedia-live | 2 |
8 files changed, 25 insertions, 30 deletions
diff --git a/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live b/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live index eada2ad24ce..35bd460080e 100644 --- a/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live +++ b/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live @@ -3,7 +3,7 @@ ~kde-apps/ffmpegthumbs-9999 ** ~kde-apps/juk-9999 ** ~kde-apps/k3b-9999 ** -# ~kde-apps/kamoso-9999 # while KF5-based +~kde-apps/kamoso-9999 ** ~kde-apps/kdemultimedia-meta-9999 ** ~kde-apps/kdenlive-9999 ** ~kde-apps/kmix-9999 ** diff --git a/Documentation/package.accept_keywords/kde-gear-live.keywords b/Documentation/package.accept_keywords/kde-gear-live.keywords index 9223ae45257..2192a77a4a0 100644 --- a/Documentation/package.accept_keywords/kde-gear-live.keywords +++ b/Documentation/package.accept_keywords/kde-gear-live.keywords @@ -125,7 +125,7 @@ ~kde-apps/ffmpegthumbs-9999 ** ~kde-apps/juk-9999 ** ~kde-apps/k3b-9999 ** -# ~kde-apps/kamoso-9999 # while KF5-based +~kde-apps/kamoso-9999 ** ~kde-apps/kdemultimedia-meta-9999 ** ~kde-apps/kdenlive-9999 ** ~kde-apps/kmix-9999 ** diff --git a/Documentation/package.mask/kde-gear-live b/Documentation/package.mask/kde-gear-live index 4cba776a850..ae38a0f90ce 100644 --- a/Documentation/package.mask/kde-gear-live +++ b/Documentation/package.mask/kde-gear-live @@ -114,7 +114,7 @@ ~kde-apps/ffmpegthumbs-9999 ~kde-apps/juk-9999 ~kde-apps/k3b-9999 -# ~kde-apps/kamoso-9999 # while KF5-based +~kde-apps/kamoso-9999 ~kde-apps/kdemultimedia-meta-9999 ~kde-apps/kdenlive-9999 ~kde-apps/kmix-9999 diff --git a/Documentation/package.unmask/kde-gear-live b/Documentation/package.unmask/kde-gear-live index 4cba776a850..ae38a0f90ce 100644 --- a/Documentation/package.unmask/kde-gear-live +++ b/Documentation/package.unmask/kde-gear-live @@ -114,7 +114,7 @@ ~kde-apps/ffmpegthumbs-9999 ~kde-apps/juk-9999 ~kde-apps/k3b-9999 -# ~kde-apps/kamoso-9999 # while KF5-based +~kde-apps/kamoso-9999 ~kde-apps/kdemultimedia-meta-9999 ~kde-apps/kdenlive-9999 ~kde-apps/kmix-9999 diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 7784f3e9a57..1111a1f0fd8 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -301,9 +301,10 @@ if $(ver_test -gt 24.11.75); then fi # list of applications ported to KF6 post-25.04 having to block SLOT=5 -if $(ver_test -gt 25.07.75); then +if $(ver_test -gt 25.07.50); then case ${PN} in artikulate | \ + kamoso | \ kig) RDEPEND+=" !${CATEGORY}/${PN}:5" ;; *) ;; diff --git a/kde-apps/kamoso/kamoso-9999.ebuild b/kde-apps/kamoso/kamoso-9999.ebuild index f62e9603abf..bcc9a5c3fbd 100644 --- a/kde-apps/kamoso/kamoso-9999.ebuild +++ b/kde-apps/kamoso/kamoso-9999.ebuild @@ -3,42 +3,35 @@ EAPI=8 -ECM_TEST="true" ECM_HANDBOOK="forceoptional" -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm gear.kde.org +KFMIN=6.9.0 +QTMIN=6.8.1 +inherit ecm gear.kde.org xdg -DESCRIPTION="Application to take pictures and videos from your webcam by KDE" +DESCRIPTION="Application to take pictures and videos from your webcam" HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso" LICENSE="GPL-2+" -SLOT="5" +SLOT="0" KEYWORDS="" IUSE="" -RESTRICT="test" # bug 653674 - -COMMON_DEPEND=" +DEPEND=" dev-libs/glib:2 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 media-libs/gst-plugins-base:1.0 virtual/opengl " -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtopengl-${QTMIN}:5 ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] diff --git a/net-misc/smb4k/smb4k-9999.ebuild b/net-misc/smb4k/smb4k-9999.ebuild index 31fdaeef60c..4eafda4cf9f 100644 --- a/net-misc/smb4k/smb4k-9999.ebuild +++ b/net-misc/smb4k/smb4k-9999.ebuild @@ -67,6 +67,7 @@ src_configure() { } pkg_postinst() { + xdg_pkg_postinst elog "Users of Samba 4.7 and above please note that for the time being," elog "the following setting has to be added to or changed in the [global]" elog "section of the smb.conf file:" diff --git a/sets/kdemultimedia-live b/sets/kdemultimedia-live index ca54e847c2e..506f8f79521 100644 --- a/sets/kdemultimedia-live +++ b/sets/kdemultimedia-live @@ -3,7 +3,7 @@ ~kde-apps/ffmpegthumbs-9999 ~kde-apps/juk-9999 ~kde-apps/k3b-9999 -# ~kde-apps/kamoso-9999 # while KF5-based +~kde-apps/kamoso-9999 ~kde-apps/kdemultimedia-meta-9999 ~kde-apps/kdenlive-9999 ~kde-apps/kmix-9999 |