Skip to content

Commit

Permalink
kde-frameworks/extra-cmake-modules: slotmove 5 to 0
Browse files Browse the repository at this point in the history
See also:
https://community.kde.org/Frameworks/6.0_Release_notes#Coinstallability

"Only one version of extra-cmake-modules can be installed. The KF6
version is backwards compatible and should also be used for KF5 builds."

Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Nov 25, 2023
1 parent cbe4689 commit 4396c60
Show file tree
Hide file tree
Showing 43 changed files with 43 additions and 42 deletions.
2 changes: 1 addition & 1 deletion app-doc/zeal/zeal-0.6.1_p20200815-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DEPEND="
RDEPEND="${DEPEND}
x11-themes/hicolor-icon-theme
"
BDEPEND="kde-frameworks/extra-cmake-modules:5"
BDEPEND="kde-frameworks/extra-cmake-modules:0"

PATCHES=(
"${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch"
Expand Down
2 changes: 1 addition & 1 deletion app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ BDEPEND=">=app-i18n/fcitx-4.2.9:4
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtwidgets:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig"
# Private headers of dev-qt/qtgui:5 used.
RDEPEND=">=app-i18n/fcitx-4.2.9:4
Expand Down
2 changes: 1 addition & 1 deletion app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ BDEPEND=">=app-i18n/fcitx-4.2.9:4
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtwidgets:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig"
# Private headers of dev-qt/qtgui:5 used.
RDEPEND=">=app-i18n/fcitx-4.2.9:4
Expand Down
2 changes: 1 addition & 1 deletion app-i18n/fcitx/fcitx-4.2.9.8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ REQUIRED_USE="cairo? ( X )
RESTRICT="!test? ( test )"

BDEPEND="dev-util/glib-utils
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
introspection? ( dev-libs/gobject-introspection )
nls? ( sys-devel/gettext )"
Expand Down
2 changes: 1 addition & 1 deletion app-i18n/fcitx/fcitx-4.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ REQUIRED_USE="cairo? ( X )
RESTRICT="!test? ( test )"

BDEPEND="dev-util/glib-utils
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
introspection? ( dev-libs/gobject-introspection )
nls? ( sys-devel/gettext )"
Expand Down
2 changes: 1 addition & 1 deletion app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ IUSE=""
BDEPEND=">=app-i18n/fcitx-4.2.9:4
dev-qt/qtcore:5
dev-qt/qtwidgets:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
sys-devel/gettext
virtual/pkgconfig"
DEPEND=">=app-i18n/fcitx-4.2.9:4
Expand Down
2 changes: 1 addition & 1 deletion app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ IUSE=""
BDEPEND=">=app-i18n/fcitx-4.2.9:4
dev-qt/qtcore:5
dev-qt/qtwidgets:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
sys-devel/gettext
virtual/pkgconfig"
DEPEND=">=app-i18n/fcitx-4.2.9:4
Expand Down
2 changes: 1 addition & 1 deletion dev-util/heaptrack/heaptrack-1.5.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DEPEND="
RDEPEND="${DEPEND}
gui? ( >=kde-frameworks/kf-env-4 )
"
BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:5 )"
BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"

src_prepare() {
cmake_src_prepare
Expand Down
2 changes: 1 addition & 1 deletion dev-util/heaptrack/heaptrack-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ DEPEND="
RDEPEND="${DEPEND}
gui? ( >=kde-frameworks/kf-env-4 )
"
BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:5 )"
BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"

src_prepare() {
cmake_src_prepare
Expand Down
2 changes: 1 addition & 1 deletion games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ COMMON_DEPENDS="
BDEPEND="
app-text/scdoc
dev-cpp/gulrak-filesystem
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"

DEPEND="
Expand Down
2 changes: 1 addition & 1 deletion games-action/prismlauncher/prismlauncher-8.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ COMMON_DEPENDS="
BDEPEND="
app-text/scdoc
dev-cpp/gulrak-filesystem
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"

DEPEND="
Expand Down
2 changes: 1 addition & 1 deletion games-action/prismlauncher/prismlauncher-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ COMMON_DEPENDS="
BDEPEND="
app-text/scdoc
dev-cpp/gulrak-filesystem
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"

DEPEND="
Expand Down
2 changes: 1 addition & 1 deletion games-emulation/melonds/melonds-0.9.5-r4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RDEPEND="
net-libs/libslirp
"
DEPEND="${RDEPEND}"
BDEPEND="kde-frameworks/extra-cmake-modules:5"
BDEPEND="kde-frameworks/extra-cmake-modules:0"

PATCHES=( "${FILESDIR}"/${P}-no-ccache-detection.patch )

Expand Down
2 changes: 1 addition & 1 deletion games-emulation/melonds/melonds-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RDEPEND="
wayland? ( dev-libs/wayland )
"
DEPEND="${RDEPEND}"
BDEPEND="wayland? ( kde-frameworks/extra-cmake-modules:5 )"
BDEPEND="wayland? ( kde-frameworks/extra-cmake-modules:0 )"

# used for JIT recompiler
QA_EXECSTACK="usr/bin/melonDS"
Expand Down
2 changes: 1 addition & 1 deletion kde-apps/kdeedu-data/kdeedu-data-23.04.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ IUSE=""

BDEPEND="
dev-qt/qtcore:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"
2 changes: 1 addition & 1 deletion kde-apps/kdeedu-data/kdeedu-data-23.08.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ IUSE=""

BDEPEND="
dev-qt/qtcore:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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 )
"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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 )
"

Expand Down
2 changes: 1 addition & 1 deletion kde-frameworks/breeze-icons/breeze-icons-5.110.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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 )
"

Expand Down
2 changes: 1 addition & 1 deletion kde-frameworks/breeze-icons/breeze-icons-5.112.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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 )
"

Expand Down
2 changes: 1 addition & 1 deletion kde-frameworks/oxygen-icons/oxygen-icons-5.110.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"

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 )"
Expand Down
2 changes: 1 addition & 1 deletion kde-frameworks/oxygen-icons/oxygen-icons-5.112.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"

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 )"
Expand Down
2 changes: 1 addition & 1 deletion kde-misc/kshutdown/kshutdown-5.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
BDEPEND="
app-arch/unzip
sys-devel/gettext
kde? ( kde-frameworks/extra-cmake-modules:5 )
kde? ( kde-frameworks/extra-cmake-modules:0 )
"

src_configure() {
Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/breeze-plymouth/breeze-plymouth-5.27.8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
IUSE=""

BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
DEPEND="sys-boot/plymouth"
RDEPEND="${DEPEND}"

Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/breeze-plymouth/breeze-plymouth-5.27.9.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
IUSE=""

BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
DEPEND="sys-boot/plymouth"
RDEPEND="${DEPEND}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ IUSE=""

BDEPEND="
dev-qt/qtcore:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ IUSE=""

BDEPEND="
dev-qt/qtcore:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"
2 changes: 1 addition & 1 deletion kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DEPEND="
RDEPEND="${DEPEND}
!kde-plasma/xembed-sni-proxy:0
"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"

PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" )

Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.9.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DEPEND="
RDEPEND="${DEPEND}
!kde-plasma/xembed-sni-proxy:0
"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"

PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" )

Expand Down
2 changes: 1 addition & 1 deletion media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ IUSE=""

BDEPEND="
>=dev-qt/qtcore-5.12.3:5
>=kde-frameworks/extra-cmake-modules-5.60.0:5
>=kde-frameworks/extra-cmake-modules-5.60.0:0
media-gfx/fontforge
"

Expand Down
2 changes: 1 addition & 1 deletion media-sound/kid3/kid3-3.9.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="${PYTHON_DEPS}
dev-qt/linguist-tools:5
kde? ( kde-frameworks/extra-cmake-modules:5 )
kde? ( kde-frameworks/extra-cmake-modules:0 )
"

pkg_setup() {
Expand Down
2 changes: 1 addition & 1 deletion net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="dev-lang/perl:0
virtual/pkgconfig
doc? ( app-doc/doxygen )
kde? ( kde-frameworks/extra-cmake-modules:5 )
kde? ( kde-frameworks/extra-cmake-modules:0 )
nls? ( sys-devel/gettext )"
DEPEND="dev-qt/qtcore:5
dev-qt/qtgui:5
Expand Down
2 changes: 1 addition & 1 deletion net-irc/kvirc/kvirc-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="dev-lang/perl:0
virtual/pkgconfig
doc? ( app-doc/doxygen )
kde? ( kde-frameworks/extra-cmake-modules:5 )
kde? ( kde-frameworks/extra-cmake-modules:0 )
nls? ( sys-devel/gettext )"
DEPEND="dev-qt/qtcore:5
dev-qt/qtgui:5
Expand Down
2 changes: 1 addition & 1 deletion net-irc/quassel/quassel-0.14.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ DEPEND="dev-libs/boost:=
)"
RDEPEND="${DEPEND}"
BDEPEND="dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5"
kde-frameworks/extra-cmake-modules:0"

DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"

Expand Down
2 changes: 1 addition & 1 deletion net-irc/quassel/quassel-0.14.0-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ DEPEND="
"
BDEPEND="
dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"

DOCS=( AUTHORS ChangeLog README.md )
Expand Down
2 changes: 1 addition & 1 deletion net-irc/quassel/quassel-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ DEPEND="
"
BDEPEND="
dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
"

DOCS=( AUTHORS ChangeLog README.md )
Expand Down
1 change: 1 addition & 0 deletions profiles/updates/4Q-2023
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ slotmove dev-haskell/quickcheck 2 0
move kde-frameworks/plasma kde-plasma/libplasma
move kde-frameworks/kactivities-stats kde-plasma/plasma-activities-stats
move kde-frameworks/kactivities kde-plasma/plasma-activities
slotmove kde-frameworks/extra-cmake-modules 5 0
2 changes: 1 addition & 1 deletion x11-misc/copyq/copyq-6.4.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto
"
BDEPEND="
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
!qt6? (
dev-qt/linguist-tools:5
dev-qt/qtwaylandscanner:5
Expand Down
2 changes: 1 addition & 1 deletion x11-misc/copyq/copyq-7.0.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto
"
BDEPEND="
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
!qt6? (
dev-qt/linguist-tools:5
dev-qt/qtwaylandscanner:5
Expand Down
2 changes: 1 addition & 1 deletion x11-misc/sddm/sddm-0.18.1-r8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="
dev-python/docutils
dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
"

Expand Down
2 changes: 1 addition & 1 deletion x11-misc/sddm/sddm-0.20.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="
dev-python/docutils
>=dev-qt/linguist-tools-${QTMIN}:5
kde-frameworks/extra-cmake-modules:5
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
"

Expand Down
2 changes: 1 addition & 1 deletion x11-themes/qtcurve/qtcurve-1.9.0_p20210412.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
plasma? ( kde-frameworks/extra-cmake-modules:5 )
plasma? ( kde-frameworks/extra-cmake-modules:0 )
"

DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
Expand Down
2 changes: 1 addition & 1 deletion x11-themes/qtcurve/qtcurve-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
plasma? ( kde-frameworks/extra-cmake-modules:5 )
plasma? ( kde-frameworks/extra-cmake-modules:0 )
"

DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
Expand Down

0 comments on commit 4396c60

Please sign in to comment.