Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*.kde.org: Push PVCUT from ebuilds into new eclass var #1013

Merged
merged 5 commits into from
Dec 12, 2024
Merged

*.kde.org: Push PVCUT from ebuilds into new eclass var #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d73c98c
frameworks.kde.org.eclass: Introduce KDE_CATV
a17r Dec 6, 2024
42a0234
kde-frameworks: Drop PVCUT and replace w/ eclass-provided KDE_CATV
a17r Dec 6, 2024
e023b5c
plasma.kde.org.eclass: Introduce KDE_CATV
a17r Dec 6, 2024
c629431
kde-plasma: Drop PVCUT and replace w/ eclass-provided KDE_CATV
a17r Dec 6, 2024
c991c33
kde-misc/kdiff3: Update dependencies
a17r Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions eclass/frameworks.kde.org.eclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ esac
if [[ -z ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
_FRAMEWORKS_KDE_ORG_ECLASS=1

# @ECLASS_VARIABLE: KDE_CATV
# @DESCRIPTION:
# Holds main Frameworks release number (major.minor) for use on same-category
# dependencies.
KDE_CATV=$(ver_cut 1-2)
a17r marked this conversation as resolved.
Show resolved Hide resolved
readonly KDE_CATV

# @ECLASS_VARIABLE: KDE_PV_UNRELEASED
# @INTERNAL
# @DESCRIPTION:
Expand All @@ -43,7 +50,7 @@ if [[ ${PN} == extra-cmake-modules ]]; then
SLOT=0
else
if [[ ${KDE_BUILD_TYPE} == release ]]; then
SLOT=${SLOT}/$(ver_cut 1-2)
SLOT=${SLOT}/${KDE_CATV}
else
SLOT=${SLOT}/9999
fi
Expand All @@ -63,7 +70,7 @@ _KDE_SRC_URI="mirror://kde/"

# TODO: Remove after last KF5 PortingAid treecleaned; bug 755956
if [[ ${KDE_BUILD_TYPE} != live && -z ${KDE_ORG_COMMIT} ]]; then
_KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/"
_KDE_SRC_URI+="stable/frameworks/${KDE_CATV}/"
case ${KDE_ORG_NAME} in
kdelibs4support | \
kdesignerplugin | \
Expand Down
11 changes: 9 additions & 2 deletions eclass/plasma.kde.org.eclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ esac
if [[ -z ${_PLASMA_KDE_ORG_ECLASS} ]]; then
_PLASMA_KDE_ORG_ECLASS=1

# @ECLASS_VARIABLE: KDE_CATV
# @DESCRIPTION:
# Holds main Plasma release number (major.minor.micro) for use on same-category
# dependencies.
KDE_CATV=$(ver_cut 1-3)
readonly KDE_CATV

# @ECLASS_VARIABLE: KDE_PV_UNRELEASED
# @INTERNAL
# @DESCRIPTION:
Expand Down Expand Up @@ -64,10 +71,10 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then
elif [[ -z ${KDE_ORG_COMMIT} ]]; then
case ${PV} in
5.??.[6-9][05]* | 6.?.[6-9][05]* )
_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
_KDE_SRC_URI+="unstable/plasma/${KDE_CATV}/"
RESTRICT+=" mirror"
;;
*) _KDE_SRC_URI+="stable/plasma/$(ver_cut 1-3)/" ;;
*) _KDE_SRC_URI+="stable/plasma/${KDE_CATV}/" ;;
esac

SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
Expand Down
19 changes: 9 additions & 10 deletions kde-frameworks/baloo/baloo-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -20,15 +19,15 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
=kde-frameworks/kcrash-${KDE_CATV}*:6
=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
=kde-frameworks/kfilemetadata-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kidletime-${KDE_CATV}*:6
=kde-frameworks/kio-${KDE_CATV}*:6
=kde-frameworks/solid-${KDE_CATV}*:6
"
RDEPEND="${DEPEND}
!${CATEGORY}/${PN}:5[-kf6compat(-)]
Expand Down
19 changes: 9 additions & 10 deletions kde-frameworks/baloo/baloo-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -20,15 +19,15 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
=kde-frameworks/kcrash-${KDE_CATV}*:6
=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
=kde-frameworks/kfilemetadata-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kidletime-${KDE_CATV}*:6
=kde-frameworks/kio-${KDE_CATV}*:6
=kde-frameworks/solid-${KDE_CATV}*:6
"
RDEPEND="${DEPEND}
!${CATEGORY}/${PN}:5[-kf6compat(-)]
Expand Down
3 changes: 1 addition & 2 deletions kde-frameworks/breeze-icons/breeze-icons-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

EAPI=8

PVCUT=$(ver_cut 1-2)
PYTHON_COMPAT=( python3_{10..13} )
inherit cmake frameworks.kde.org python-any-r1 xdg

Expand All @@ -23,7 +22,7 @@ RDEPEND="
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
dev-qt/qtbase:6[gui]
>=kde-frameworks/extra-cmake-modules-${PVCUT}:*
>=kde-frameworks/extra-cmake-modules-${KDE_CATV}:*
test? ( app-misc/fdupes )
"

Expand Down
3 changes: 1 addition & 2 deletions kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

EAPI=8

PVCUT=$(ver_cut 1-2)
PYTHON_COMPAT=( python3_{10..13} )
inherit cmake frameworks.kde.org python-any-r1 xdg

Expand All @@ -23,7 +22,7 @@ RDEPEND="
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
dev-qt/qtbase:6[gui]
>=kde-frameworks/extra-cmake-modules-${PVCUT}:*
>=kde-frameworks/extra-cmake-modules-${KDE_CATV}:*
test? ( app-misc/fdupes )
"

Expand Down
17 changes: 8 additions & 9 deletions kde-frameworks/frameworkintegration/frameworkintegration-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -19,16 +18,16 @@ 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
=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kiconthemes-${KDE_CATV}*:6
=kde-frameworks/knewstuff-${KDE_CATV}*:6
=kde-frameworks/knotifications-${KDE_CATV}*:6
=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
"
DEPEND="${RDEPEND}
=kde-frameworks/kpackage-${PVCUT}*:6
=kde-frameworks/kpackage-${KDE_CATV}*:6
"

src_configure() {
Expand Down
17 changes: 8 additions & 9 deletions kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -19,16 +18,16 @@ 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
=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kiconthemes-${KDE_CATV}*:6
=kde-frameworks/knewstuff-${KDE_CATV}*:6
=kde-frameworks/knotifications-${KDE_CATV}*:6
=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
"
DEPEND="${RDEPEND}
=kde-frameworks/kpackage-${PVCUT}*:6
=kde-frameworks/kpackage-${KDE_CATV}*:6
"

src_configure() {
Expand Down
5 changes: 2 additions & 3 deletions kde-frameworks/kauth/kauth-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

EAPI=8

PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -15,10 +14,10 @@ IUSE="+policykit"

RDEPEND="
>=dev-qt/qtbase-${QTMIN}:6[gui]
=kde-frameworks/kcoreaddons-${PVCUT}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
policykit? (
>=dev-qt/qtbase-${QTMIN}:6[dbus]
=kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland]
=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland]
>=sys-auth/polkit-qt-0.175.0[qt6(+)]
)
"
Expand Down
5 changes: 2 additions & 3 deletions kde-frameworks/kauth/kauth-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

EAPI=8

PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -15,10 +14,10 @@ IUSE="+policykit"

RDEPEND="
>=dev-qt/qtbase-${QTMIN}:6[gui]
=kde-frameworks/kcoreaddons-${PVCUT}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
policykit? (
>=dev-qt/qtbase-${QTMIN}:6[dbus]
=kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland]
=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland]
>=sys-auth/polkit-qt-0.175.0[qt6(+)]
)
"
Expand Down
9 changes: 4 additions & 5 deletions kde-frameworks/kbookmarks/kbookmarks-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

EAPI=8

PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -15,10 +14,10 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
=kde-frameworks/kiconthemes-${KDE_CATV}*:6
=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
"
DEPEND="${RDEPEND}"
BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
9 changes: 4 additions & 5 deletions kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

EAPI=8

PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -15,10 +14,10 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
=kde-frameworks/kiconthemes-${KDE_CATV}*:6
=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
"
DEPEND="${RDEPEND}"
BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
19 changes: 9 additions & 10 deletions kde-frameworks/kcmutils/kcmutils-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -17,14 +16,14 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/kconfigwidgets-${KDE_CATV}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
=kde-frameworks/kguiaddons-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kio-${KDE_CATV}*:6
=kde-frameworks/kitemviews-${KDE_CATV}*:6
=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
=kde-frameworks/kxmlgui-${KDE_CATV}*:6
"
RDEPEND="${DEPEND}"
19 changes: 9 additions & 10 deletions kde-frameworks/kcmutils/kcmutils-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -17,14 +16,14 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/kconfigwidgets-${KDE_CATV}*:6
=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
=kde-frameworks/kguiaddons-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kio-${KDE_CATV}*:6
=kde-frameworks/kitemviews-${KDE_CATV}*:6
=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
=kde-frameworks/kxmlgui-${KDE_CATV}*:6
"
RDEPEND="${DEPEND}"
7 changes: 3 additions & 4 deletions kde-frameworks/kcolorscheme/kcolorscheme-6.9.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
EAPI=8

ECM_TEST="false"
PVCUT=$(ver_cut 1-2)
QTMIN=6.7.2
inherit ecm frameworks.kde.org

Expand All @@ -17,8 +16,8 @@ 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
=kde-frameworks/kconfig-${KDE_CATV}*:6
=kde-frameworks/ki18n-${KDE_CATV}*:6
=kde-frameworks/kguiaddons-${KDE_CATV}*:6
"
RDEPEND="${DEPEND}"
Loading
Loading