[gentoo-commits] proj/kde:master commit in: eclass/
commit: 533c79980981f12937f2a8b4d94a8255f792e318
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 22 21:04:42 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 22 21:05:26 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=533c7998
gear.kde.org.eclass: Re-add signon-kwallet-extension to SLOT=5 blocklist
It just makes no sense the other way, even if upstream has not declared it
"KF6-only" officially.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 04e5df8c73..8c84fbfc29 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -257,7 +257,8 @@ if $(ver_test -gt 24.04.75); then
audex | \
itinerary | \
kio-perldoc | \
- kolourpaint)
+ kolourpaint | \
+ signon-kwallet-extension)
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
*) ;;
esac
@@ -277,7 +278,6 @@ if $(ver_test -gt 24.07.75); then
libkomparediff2 | \
libksane | \
minuet | \
- signon-kwallet-extension | \
skanlite | \
step)
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 30ae9595f7e1f3c434a196fe0d929e546d4dea89
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 4 14:17:19 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 21 05:05:14 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=30ae9595
ecm.eclass: Restrict ECM_TEST="optional" and punting dep to _KFSLOT=5
In dev-qt/qtbase:6, Qt6Test is always provided so it makes no sense to
go through the trouble of ripping out the build dependency.
We should still aim to avoid needless building of tests if not requested,
either by detecting unconditional use of ecm_add_test or expose existing
force* logic to ebuild developers to catch those as errors.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 50 +-
1 file changed, 29 insertions(+), 21 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 6393c1c1d7..7f1b777a45 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -125,20 +125,21 @@ fi
# @ECLASS_VARIABLE: ECM_TEST
# @DEFAULT_UNSET
# @DESCRIPTION:
-# Will accept "true", "false", "optional", "forceoptional",
-# "forceoptional-recursive".
+# Will accept "true", "false", "forceoptional", and "forceoptional-recursive".
+# For KF5-based ebuilds, additionally accepts "optional".
# Default value is "false", except for CATEGORY=kde-frameworks where it is
# set to "true". If set to "false", do nothing.
-# For any other value, add "test" to IUSE (and for KF5 DEPEND on
-# dev-qt/qttest:5). If set to "optional", build with
-# -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON when USE=!test. If set
-# to "forceoptional", punt Qt${_KFSLOT}Test dependency and ignore "autotests",
-# "test", "tests" subdirs from top-level CMakeLists.txt when USE=!test.
-# If set to "forceoptional-recursive", punt Qt${_KFSLOT}Test dependencies and
-# make autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt
-# in ${S} and below conditional on BUILD_TESTING when USE=!test. This is always
-# meant as a short-term fix and creates ${T}/${P}-tests-optional.patch to
-# refine and submit upstream.
+# For any other value, add "test" to IUSE. If set to "forceoptional", ignore
+# "autotests", "test", "tests" subdirs from top-level CMakeLists.txt when
+# USE=!test. If set to "forceoptional-recursive", make autotest(s), unittest(s)
+# and test(s) subdirs from *any* CMakeLists.txt in ${S} and below conditional
+# on BUILD_TESTING when USE=!test. This is always meant as a short-term fix and
+# creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
+# For KF5-based ebuilds:
+# Additionally DEPEND on dev-qt/qttest:5 if USE=test, but punt Qt5Test
+# dependency if set to "forceoptional*" with USE=!test.
+# If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON
+# when USE=!test.
if [[ ${CATEGORY} = kde-frameworks ]]; then
: "${ECM_TEST:=true}"
fi
@@ -258,13 +259,13 @@ case ${ECM_QTHELP} in
esac
case ${ECM_TEST} in
- true|optional|forceoptional|forceoptional-recursive)
- IUSE+=" test"
- if [[ ${_KFSLOT} == 5 ]]; then
- DEPEND+=" test? ( dev-qt/qttest:${_KFSLOT} )"
+ optional)
+ if [[ ${_KFSLOT} != 5 ]]; then
+ eerror "Banned value for \${ECM_TEST}"
+ die "Value ${ECM_TEST} is only supported in KF5"
fi
- RESTRICT+=" !test? ( test )"
;;
+ true|forceoptional|forceoptional-recursive) ;;
false) ;;
*)
eerror "Unknown value for \${ECM_TEST}"
@@ -277,10 +278,17 @@ BDEPEND+="
>=kde-frameworks/extra-cmake-modules-${KFMIN}:*
"
RDEPEND+=" >=kde-frameworks/kf-env-4"
+if [[ ${ECM_TEST} != false ]]; then
+ IUSE+=" test"
+ RESTRICT+=" !test? ( test )"
+fi
if [[ ${_KFSLOT} == 6 ]]; then
COMMONDEPEND+=" dev-qt/qtbase:${_KFSLOT}"
else
COMMONDEPEND+=" dev-qt/qtcore:${_KFSLOT}"
+ if [[ ${ECM_TEST} != false ]]; then
+ DEPEND+=" test? ( dev-qt/qttest:5 )"
+ fi
fi
DEPEND+=" ${COMMONDEPEND}"
@@ -498,11 +506,11 @@ ecm_src_prepare() {
# only build unit tests when required
if ! { in_iuse test && use test; } ; then
if [[ ${ECM_TEST} = forceoptional ]] ; then
- ecm_punt_qt_module Test
+ [[ ${_KFSLOT} = 5 ]] && ecm_punt_qt_module Test
# if forceoptional, also cover non-kde categories
cmake_comment_add_subdirectory autotests test tests
elif [[ ${ECM_TEST} = forceoptional-recursive ]] ; then
- ecm_punt_qt_module Test
+ [[ ${_KFSLOT} = 5 ]] && ecm_punt_qt_module Test
local f pf="${T}/${P}"-tests-optional.patch
touch ${pf} || die "Failed to touch patch file"
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 76ad139fa613a3eb2a946c922d8fee43db9e1630
Author: Nic Boet boet cc>
AuthorDate: Thu Feb 1 03:48:21 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 6 19:47:59 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=76ad139f
cmake.eclass: bug 811486 escape find patterns
Modify cmake_src_prepare to qoute escape filenames
within the find search patterns
This resolves build issues with some EAPI 7 packages,
i.e. sys-fs/dislocker via catalyst
Bug: https://bugs.gentoo.org/811486
Signed-off-by: Nic Boet boet.cc>
Closes: https://github.com/gentoo/gentoo/pull/35125
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 1707836864..5e5418bc49 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -305,7 +305,7 @@ cmake_src_prepare() {
local name
for name in "${modules_list[@]}" ; do
if [[ ${EAPI} == 7 ]]; then
- find "${S}" -name ${name}.cmake -exec rm -v {} + || die
+ find "${S}" -name "${name}.cmake" -exec rm -v {} + ||
die
else
find -name "${name}.cmake" -exec rm -v {} + || die
fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 2f50a35ce082eee0a997f38e8212f602eec062f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 21 15:14:25 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 21 15:25:53 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f50a35c gear.kde.org.eclass: Mark 24.02.1 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 9de6fc5960..e3302ce56c 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 24.02.1 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 5f6c4cde43b6cfa1d714b56faa852c94e3f77dfe Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 7 11:35:46 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 7 11:36:20 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f6c4cde gear.kde.org.eclass: Add missing kio-perldoc to 24.05 SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 9774441240..f214408014 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -259,6 +259,7 @@ if $(ver_test -gt 24.03.75); then kdeedu-data | \ kdesdk-thumbnailers | \ kimagemapeditor | \ + kio-perldoc | \ kmplot | \ kolourpaint | \ kompare | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 3c251ef703e3be667159dde18465e4b41a78ec2f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 27 13:56:20 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 28 11:04:02 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3c251ef7
plasma.kde.org.eclass: Unsupport versioning scheme of Plasma 6 Betas
Won't appear again until Plasma 7.
This reverts commit fcf516962acde10c69640181257600254f3dd752.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma.kde.org.eclass | 4
1 file changed, 4 deletions(-)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index ddbd3271e8..491f1fcecc 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -67,10 +67,6 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
RESTRICT+=" mirror"
;;
- 5.9?.0* )
- _KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
- RESTRICT+=" mirror"
- ;;
*) _KDE_SRC_URI+="stable/plasma/$(ver_cut 1-3)/" ;;
esac
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 1f01b34afd6be7947d0a7ac99d62218f695f2e40 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 27 13:42:41 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 28 11:02:33 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1f01b34a gear.kde.org.eclass: Mark 24.02.0 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index d7955c9463..5ba654eceb 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 24.02.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 6fe16889688517aef3a336a20b948a875a217ccd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 27 13:54:59 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 28 11:02:40 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fe16889
frameworks.kde.org.eclass: Unsupport unstable release SRC_URIs
Will not appear again until KF7.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/frameworks.kde.org.eclass | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index ac3537813e..53811e3399 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -69,13 +69,7 @@ case ${KDE_BUILD_TYPE} in
;;
*)
if [[ -z ${KDE_ORG_COMMIT} ]]; then
- case ${PV} in
- 5.2[4-9]?.? )
-
_KDE_SRC_URI+="unstable/frameworks/$(ver_cut 1-3)/"
- RESTRICT+=" mirror"
- ;;
- *) _KDE_SRC_URI+="stable/frameworks/$(ver_cut
1-2)/" ;;
- esac
+ _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/"
case ${KDE_ORG_NAME} in
kdelibs4support | \
kdesignerplugin | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: b87a7f8ad90acfb8bf989825d2d729ee77934458 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 27 13:42:58 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 28 11:02:21 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b87a7f8a frameworks.kde.org.eclass: Mark 6.0.0 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 80a93d21cc..ac3537813e 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 6.0.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: e16f4dfd68afb37f078809d4dbafe62e28b2b7ab Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 27 13:43:10 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 28 11:02:28 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e16f4dfd plasma.kde.org.eclass: Mark 6.0.0 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/plasma.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index e85803a817..ddbd3271e8 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -29,7 +29,7 @@ _PLASMA_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 6.0.0 ) +KDE_PV_UNRELEASED=( ) # @ECLASS_VARIABLE: _PSLOT # @INTERNAL
[gentoo-commits] proj/kde:master commit in: eclass/, media-libs/ksanecore/
commit: a8ed9c37129f5673084de40c8865a1c6f14d3c28
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 28 10:11:36 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 28 10:22:09 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8ed9c37
media-libs/ksanecore: Port 24.02 to KF6, block ksanecore:5[-kf6compat]
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 1 -
media-libs/ksanecore/ksanecore-24.02.0.ebuild | 16 +---
media-libs/ksanecore/ksanecore-24.02.49..ebuild | 14 --
media-libs/ksanecore/ksanecore-.ebuild | 4 +++-
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 69358187e1..2904600fa2 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -261,7 +261,6 @@ if $(ver_test -gt 24.03.75); then
kolourpaint | \
kompare | \
krdc | \
- ksanecore | \
libkomparediff2 | \
libksane | \
minuet | \
diff --git a/media-libs/ksanecore/ksanecore-24.02.0.ebuild
b/media-libs/ksanecore/ksanecore-24.02.0.ebuild
index c2f93905e4..415219167d 100644
--- a/media-libs/ksanecore/ksanecore-24.02.0.ebuild
+++ b/media-libs/ksanecore/ksanecore-24.02.0.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-KFMIN=5.113.0
-QTMIN=5.15.9
+KFMIN=6.0
+QTMIN=6.6.2
inherit ecm gear.kde.org
DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
@@ -12,12 +12,14 @@ HOMEPAGE="https://invent.kde.org/libraries/ksanecore
https://api.kde.org/ksanecore/html/index.html;
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="6"
+KEYWORDS="~amd64"
DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=kde-frameworks/ki18n-${KFMIN}:6
media-gfx/sane-backends
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/media-libs/ksanecore/ksanecore-24.02.49..ebuild
b/media-libs/ksanecore/ksanecore-24.02.49..ebuild
index 0621e249bd..9d8df83e4c 100644
--- a/media-libs/ksanecore/ksanecore-24.02.49..ebuild
+++ b/media-libs/ksanecore/ksanecore-24.02.49..ebuild
@@ -3,8 +3,8 @@
EAPI=8
-KFMIN=5.113.0
-QTMIN=5.15.9
+KFMIN=5.249.0
+QTMIN=6.6.2
inherit ecm gear.kde.org
DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
@@ -12,12 +12,14 @@ HOMEPAGE="https://invent.kde.org/libraries/ksanecore
https://api.kde.org/ksanecore/html/index.html;
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
+SLOT="6"
KEYWORDS=""
DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[gui]
+ >=kde-frameworks/ki18n-${KFMIN}:6
media-gfx/sane-backends
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/media-libs/ksanecore/ksanecore-.ebuild
b/media-libs/ksanecore/ksanecore-.ebuild
index 69fd25ccb8..9d8df83e4c 100644
--- a/media-libs/ksanecore/ksanecore-.ebuild
+++ b/media-libs/ksanecore/ksanecore-.ebuild
@@ -20,4 +20,6 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:6
media-gfx/sane-backends
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 91c7179d5c426ef1ab8f074b468a23fdbf1335b7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 28 08:50:12 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 28 09:08:51 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=91c7179d gear.kde.org.eclass: Drop libkgapi and kio-gdrive from SLOT=5 blocklist Packages are being made co-installable instead. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index eba0116777..69358187e1 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -218,7 +218,6 @@ if $(ver_test -gt 24.01.75); then libkeduvocdocument | \ libkdegames | \ libkdepim | \ - libkgapi | \ libkleo | \ libkmahjongg | \ libksieve | \ @@ -258,7 +257,6 @@ if $(ver_test -gt 24.03.75); then k3b | \ kdeedu-data | \ kimagemapeditor | \ - kio-gdrive | \ kmplot | \ kolourpaint | \ kompare | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: d33ca1df91642b32c3c95448d5f55b58ed725c4f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 27 19:08:59 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 27 19:08:59 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d33ca1df gear.kde.org.eclass: Add audiocd-kio to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 1753cac22c..fa65025b58 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -77,6 +77,7 @@ if $(ver_test -gt 24.01.75); then akregator | \ analitza | \ ark | \ + audiocd-kio | \ baloo-widgets | \ blinken | \ bomber | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 4d4d7cbdafa4534f4520d59a793991f083e24c78
Author: Sam James gentoo org>
AuthorDate: Sun Jan 14 19:38:42 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 14 19:38:42 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d4d7cbd
cmake.eclass: dev-util/cmake -> dev-build/cmake
Signed-off-by: Sam James gentoo.org>
eclass/cmake.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f0cc0ce000..1707836864 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -144,7 +144,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
esac
if [[ ${PN} != cmake ]]; then
- BDEPEND+=" >=dev-util/cmake-3.20.5"
+ BDEPEND+=" >=dev-build/cmake-3.20.5"
fi
# @FUNCTION: cmake_run_in
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 7ae4cf69ce25adda1593cbb8f5538821578cd10b
Author: Sam James gentoo org>
AuthorDate: Sat Jan 13 18:00:21 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 13 18:00:21 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ae4cf69
cmake.eclass: sys-devel/make -> dev-build/make
Signed-off-by: Sam James gentoo.org>
eclass/cmake.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f4a0d6506c..f0cc0ce000 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -132,7 +132,7 @@ fi
case ${CMAKE_MAKEFILE_GENERATOR} in
emake)
- BDEPEND="sys-devel/make"
+ BDEPEND="dev-build/make"
;;
ninja)
BDEPEND="${NINJA_DEPEND}"
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 8ff1c59b040a3690e371eb3de70acaf08a800bc1
Author: Sam James gentoo org>
AuthorDate: Sat Jan 13 16:38:21 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 13 16:38:21 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ff1c59b
ecm.eclass: app-doc/doxygen -> app-text/doxygen
Signed-off-by: Sam James gentoo.org>
eclass/ecm.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index ee1d398681..6393c1c1d7 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -243,7 +243,7 @@ case ${ECM_QTHELP} in
true)
IUSE+=" doc"
COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${_KFSLOT} )"
- BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 )"
+ BDEPEND+=" doc? ( >=app-text/doxygen-1.8.13-r1 )"
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[assistant]"
else
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 37582f536b93020085b3a2f0cebcf32785a93570
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 11 18:44:57 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 11 18:44:57 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=37582f53
gear.kde.org.eclass: release/24.02 was branched
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index f4ebd8ee24..421f5f534f 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -48,9 +48,7 @@ KDE_ORG_SCHEDULE_URI+="/KDE_Gear_${PV:0:5}_Schedule"
_KDE_SRC_URI="mirror://kde/"
if [[ ${KDE_BUILD_TYPE} == live ]]; then
- if [[ ${PV} == 24.02.49. ]]; then
- EGIT_BRANCH="master" # drop after 24.02 branching
- elif [[ ${PV} == ??.??.49. ]]; then
+ if [[ ${PV} == ??.??.49. ]]; then
EGIT_BRANCH="release/$(ver_cut 1-2)"
fi
elif [[ -z ${KDE_ORG_COMMIT} ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 2b4440011b8ae718e744d86bcb1f076c9c4c8f1b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 10 10:16:16 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 10 10:16:16 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b444001
gear.kde.org.eclass: Add colord-kde, kdenlive to SLOT=5 blocklist
Move gwenview to 24.02 list.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index d8c6b5d12a..f4ebd8ee24 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -85,6 +85,7 @@ if $(ver_test -gt 24.01.75); then
bovo | \
calendarjanitor | \
calendarsupport | \
+ colord-kde | \
dolphin | \
dolphin-plugins-dropbox | \
dolphin-plugins-git | \
@@ -98,6 +99,7 @@ if $(ver_test -gt 24.01.75); then
granatier | \
grantlee-editor | \
grantleetheme | \
+ gwenview | \
incidenceeditor | \
isoimagewriter | \
juk | \
@@ -132,6 +134,7 @@ if $(ver_test -gt 24.01.75); then
kdeconnect | \
kdegraphics-mobipocket | \
kdenetwork-filesharing | \
+ kdenlive | \
kdepim-addons | \
kdepim-runtime | \
kdf | \
@@ -248,7 +251,6 @@ fi
if $(ver_test -gt 24.03.75); then
case ${PN} in
ffmpegthumbs | \
- gwenview | \
itinerary | \
k3b | \
kdeedu-data | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: ac79a132a17b805b76e3a9ebd6de9e697974edcc Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 9 14:39:51 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 9 14:39:51 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac79a132 gear.kde.org.eclass: Add konversation to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 6972808e1f..d8c6b5d12a 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -182,6 +182,7 @@ if $(ver_test -gt 24.01.75); then kontact | \ kontactinterface | \ kontrast | \ + konversation | \ korganizer | \ kpat | \ kpimtextedit | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 82519bb7f595cbb57db022b10cd01d40555c2690 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 8 11:08:51 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 8 13:16:37 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=82519bb7 gear.kde.org.eclass: Add krfb to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 06e23b6e4f..6972808e1f 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -188,6 +188,7 @@ if $(ver_test -gt 24.01.75); then kpkpass | \ kpmcore | \ kreversi | \ + krfb | \ kruler | \ kshisen | \ ksirk | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 7b9da6e6a6e522ad81ee3bf0dfe3eebeef038e9e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 18:13:33 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 7 18:13:33 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b9da6e6 gear.kde.org.eclass: Add isoimagewriter to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 8418a90d97..06e23b6e4f 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -99,6 +99,7 @@ if $(ver_test -gt 24.01.75); then grantlee-editor | \ grantleetheme | \ incidenceeditor | \ + isoimagewriter | \ juk | \ kaccounts-integration | \ kaccounts-providers | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: f5272ada70e921c24dcf0b8bf15f80fb6084f4f8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 7 13:19:07 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 7 13:24:39 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5272ada
gear.kde.org.eclass: Add post-24.02 release SLOT=5 blocklist
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 31 +++
1 file changed, 31 insertions(+)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 33fd4378de..8418a90d97 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -241,4 +241,35 @@ if $(ver_test -gt 24.01.75); then
esac
fi
+# list of applications ported to KF6 post-24.02 in SLOT=6 having to block
SLOT=5
+if $(ver_test -gt 24.03.75); then
+ case ${PN} in
+ ffmpegthumbs | \
+ gwenview | \
+ itinerary | \
+ k3b | \
+ kdeedu-data | \
+ kimagemapeditor | \
+ kio-gdrive | \
+ kmplot | \
+ kolourpaint | \
+ kompare | \
+ kopeninghours | \
+ kosmindoormap | \
+ kpublictransport | \
+ krdc | \
+ ksanecore | \
+ libkeduvocdocument | \
+ libkomparediff2 | \
+ libksane | \
+ minuet | \
+ signon-kwallet-extension | \
+ skanlite | \
+ skanpage | \
+ step)
+ RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
+ *) ;;
+ esac
+fi
+
fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: e62825845c816d8b60202ee38a8c72a49d86 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 6 12:02:09 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 6 12:02:09 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6282584 gear.kde.org.eclass: Add kde-apps/kgpg to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 346904e24a..1cd0253542 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -139,6 +139,7 @@ if $(ver_test -gt 24.01.75); then kgeography | \ kget | \ kgoldrunner | \ + kgpg | \ khangman | \ khelpcenter | \ kidentitymanagement | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: b279c4b7ebcf150673919f8d1b84565a2662e358
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 3 22:14:53 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 3 22:15:13 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b279c4b7
cmake.eclass: Set FETCHCONTENT_FULLY_DISCONNECTED=ON
Bug: https://bugs.gentoo.org/920846
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 41aebeee53..c29dcfe413 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -458,6 +458,7 @@ cmake_src_configure() {
set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE
PATH "")
set(BUILD_SHARED_LIBS ON CACHE BOOL "")
set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "")
+ set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "")
_EOF_
if [[ -n ${_ECM_ECLASS} ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 6717d6e786e7db9121eece74dfb3cfebfaed592d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 3 22:17:05 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 3 22:18:31 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6717d6e7
cmake.eclass: Set CMAKE_DISABLE_PRECOMPILE_HEADERS=ON
Bug: https://bugs.gentoo.org/920845
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index c29dcfe413..f4a0d6506c 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -459,6 +459,7 @@ cmake_src_configure() {
set(BUILD_SHARED_LIBS ON CACHE BOOL "")
set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "")
set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "")
+ set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "")
_EOF_
if [[ -n ${_ECM_ECLASS} ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 0b956101ca473b9547de02d9f67eb397d7847aee Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 31 21:12:10 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 31 21:12:38 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0b956101 gear.kde.org.eclass: Add juk and kdeconnect to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 69460c1c16..02c06c5c81 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -97,6 +97,7 @@ if $(ver_test -gt 24.01.75); then grantlee-editor | \ grantleetheme | \ incidenceeditor | \ + juk | \ kaccounts-integration | \ kaccounts-providers | \ kaddressbook | \ @@ -124,6 +125,7 @@ if $(ver_test -gt 24.01.75); then kcolorchooser | \ kcron | \ kdebugsettings | \ + kdeconnect | \ kdegraphics-mobipocket | \ kdenetwork-filesharing | \ kdepim-addons | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: aaca17c375360c0e316756798ede5302e3ddcdfe
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Dec 22 20:08:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 23 15:59:00 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=aaca17c3
plasma.kde.org.eclass: Exclude print-manager from SLOT=5 blockers
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma.kde.org.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index ad4511f635..0e0c3e7155 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -86,7 +86,8 @@ if [[ ${_PSLOT} == 6 ]]; then
ocean-sound-theme | \
plasma-activities | \
plasma-activities-stats | \
- plasma5support) ;;
+ plasma5support | \
+ print-manager) ;;
*) RDEPEND+=" !kde-plasma/${PN}:5" ;;
esac
fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 5047c29ed3890445e94018b66b9bbb2a089aeb38 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 22 19:10:12 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 22 19:15:55 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5047c29e gear.kde.org.eclass: Drop kio-extras from SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 0ef264ff0c..69460c1c16 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -143,7 +143,6 @@ if $(ver_test -gt 24.01.75); then kigo | \ killbots | \ kimap | \ - kio-extras | \ kiriki | \ kiten | \ kitinerary | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 683d61429e541b13c2f049a6c6ca410089227439
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 21 16:26:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 21 16:27:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=683d6142
ecm.eclass: Drop dev-qt/qtbase:6[test]
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 6e194c97e2..bd7665e640 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -129,8 +129,8 @@ fi
# "forceoptional-recursive".
# Default value is "false", except for CATEGORY=kde-frameworks where it is
# set to "true". If set to "false", do nothing.
-# For any other value, add "test" to IUSE and DEPEND on dev-qt/qtbase:6[test]
-# (for KF5: dev-qt/qttest:5). If set to "optional", build with
+# For any other value, add "test" to IUSE (and for KF5 DEPEND on
+# dev-qt/qttest:5). If set to "optional", build with
# -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON when USE=!test. If set
# to "forceoptional", punt Qt${_KFSLOT}Test dependency and ignore "autotests",
# "test", "tests" subdirs from top-level CMakeLists.txt when USE=!test.
@@ -260,9 +260,7 @@ esac
case ${ECM_TEST} in
true|optional|forceoptional|forceoptional-recursive)
IUSE+=" test"
- if [[ ${_KFSLOT} == 6 ]]; then
- DEPEND+=" test? ( dev-qt/qtbase:${_KFSLOT}[test] )"
- else
+ if [[ ${_KFSLOT} == 5 ]]; then
DEPEND+=" test? ( dev-qt/qttest:${_KFSLOT} )"
fi
RESTRICT+=" !test? ( test )"
[gentoo-commits] proj/kde:master commit in: eclass/
commit: ac80a202e7cda39783fc6309d3d0ed5c70f6a15e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 19 22:12:19 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 19 22:16:07 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac80a202
gear.kde.org.eclass: Add new KF6 ports to SLOT=5 blocklist
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 61 +-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 4a15eebd71..0ef264ff0c 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -66,12 +66,23 @@ fi
# list of applications ported to KF6 in SLOT=6 having to block SLOT=5
if $(ver_test -gt 24.01.75); then
case ${PN} in
+ akonadi | \
+ akonadi-calendar | \
+ akonadi-contacts | \
+ akonadi-import-wizard | \
+ akonadi-mime | \
+ akonadi-notes | \
+ akonadi-search | \
+ akonadiconsole | \
+ akregator | \
analitza | \
ark | \
baloo-widgets | \
blinken | \
bomber | \
bovo | \
+ calendarjanitor | \
+ calendarsupport | \
dolphin | \
dolphin-plugins-dropbox | \
dolphin-plugins-git | \
@@ -80,11 +91,20 @@ if $(ver_test -gt 24.01.75); then
dolphin-plugins-subversion | \
dragon | \
elisa | \
+ eventviews | \
filelight | \
granatier | \
+ grantlee-editor | \
+ grantleetheme | \
+ incidenceeditor | \
+ kaccounts-integration | \
+ kaccounts-providers | \
+ kaddressbook | \
kajongg | \
+ kalarm | \
kalgebra | \
kamera | \
+ kanagram | \
kapman | \
kapptemplate | \
kate | \
@@ -99,12 +119,15 @@ if $(ver_test -gt 24.01.75); then
kbruch | \
kcachegrind | \
kcalc | \
+ kcalutils | \
kcharselect | \
kcolorchooser | \
kcron | \
kdebugsettings | \
kdegraphics-mobipocket | \
kdenetwork-filesharing | \
+ kdepim-addons | \
+ kdepim-runtime | \
kdf | \
kdialog | \
kdiamond | \
@@ -114,36 +137,55 @@ if $(ver_test -gt 24.01.75); then
kgeography | \
kget | \
kgoldrunner | \
+ khangman | \
khelpcenter | \
+ kidentitymanagement | \
kigo | \
killbots | \
+ kimap | \
kio-extras | \
kiriki | \
kiten | \
+ kitinerary | \
kjumpingcube | \
+ kldap | \
+ kleopatra | \
klettres | \
klickety | \
klines | \
kmag | \
kmahjongg | \
+ kmail | \
+ kmail-account-wizard | \
+ kmailtransport | \
+ kmbox | \
+ kmime | \
kmines | \
kmousetool | \
kmouth | \
knavalbattle | \
knetwalk | \
knights | \
+ knotes | \
kolf | \
kollision | \
konqueror | \
konquest | \
konsole | \
+ konsolekalendar | \
+ kontact | \
+ kontactinterface | \
kontrast | \
+ korganizer | \
kpat | \
+ kpimtextedit | \
+ kpkpass | \
kpmcore | \
kreversi | \
kruler | \
kshisen | \
ksirk | \
+ ksmtp | \
ksnakeduel | \
kspaceduel | \
ksquares | \
@@ -157,21 +199,38 @@ if $(ver_test -gt 24.01.75); then
kubrick | \
kwalletmanager | \
kweather | \
+ kwordquiz | \
kwrite | \
+ libgravatar | \
libkdegames | \
+ libkdepim | \
+ libkgapi | \
+ libkleo | \
libkmahjongg | \
+ libksieve | \
+ libktnef | \
libktorrent | \
lskat | \
+ mailcommon | \
+ mailimporter | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: c69d9104ae42916fbeedcd0ba4b6fa00dcb21740 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 19 09:07:18 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 19 09:23:28 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c69d9104 gear.kde.org.eclass: Add okular to SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 128428641f..4a15eebd71 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -163,6 +163,7 @@ if $(ver_test -gt 24.01.75); then libktorrent | \ lskat | \ markdownpart | \ + okular | \ palapeli | \ partitionmanager | \ picmi | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 38ce27e85da2f2e2dbb50ab4ee6a5fc9736a4963 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 17 09:59:00 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 17 09:59:00 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=38ce27e8 gear.kde.org.eclass: Drop kdevelop from SLOT=5 blocklist Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 4d799ec672..128428641f 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -105,7 +105,6 @@ if $(ver_test -gt 24.01.75); then kdebugsettings | \ kdegraphics-mobipocket | \ kdenetwork-filesharing | \ - kdevelop | \ kdf | \ kdialog | \ kdiamond | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 0064b9b7eaa908237e22b2bffd64f1c0ed91c5be
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 17 08:21:40 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 17 09:09:19 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0064b9b7
frameworks.kde.org.eclass: Support unstable release SRC_URIs
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/frameworks.kde.org.eclass | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 248edede2e..19db30352f 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -69,7 +69,13 @@ case ${KDE_BUILD_TYPE} in
;;
*)
if [[ -z ${KDE_ORG_COMMIT} ]]; then
- _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/"
+ case ${PV} in
+ 5.2[4-9]?.? )
+
_KDE_SRC_URI+="unstable/frameworks/$(ver_cut 1-3)/"
+ RESTRICT+=" mirror"
+ ;;
+ *) _KDE_SRC_URI+="stable/frameworks/$(ver_cut
1-2)/" ;;
+ esac
case ${KDE_ORG_NAME} in
kdelibs4support | \
kdesignerplugin | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 92b1152408d6d0b522b5bd52e66a2e6b9c17e433
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 16 13:27:03 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 16 13:27:03 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=92b11524
gear.kde.org.eclass: Replace ill-fated dynamic SLOT blocking w/ static
We don't know a package's SLOT at this point in the eclass because it is
set within Gear ebuilds.
- Drop KDE_BLOCK_SLOT5
- Add static list of PN requiring blocking against ${CATEGORY}/${PN}
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 135 +
1 file changed, 113 insertions(+), 22 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 226db68a87..4d799ec672 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -25,18 +25,6 @@ esac
if [[ -z ${_GEAR_KDE_ORG_ECLASS} ]]; then
_GEAR_KDE_ORG_ECLASS=1
-# @ECLASS-VARIABLE: KDE_BLOCK_SLOT5
-# @PRE_INHERIT
-# @DESCRIPTION:
-# By default set to "true", which means for packages in SLOT 6, add RDEPEND
-# block against ${CATEGORY}/${PN}:5.
-# Set to "false" in order to enable side-by-side installability.
-if [[ ${SLOT} == 6 ]]; then
-: ${KDE_BLOCK_SLOT5:=true}
-else
-: ${KDE_BLOCK_SLOT5:=false}
-fi
-
# @ECLASS_VARIABLE: KDE_PV_UNRELEASED
# @INTERNAL
# @DESCRIPTION:
@@ -75,15 +63,118 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
fi
-case ${KDE_BLOCK_SLOT5} in
- true)
- RDEPEND+=" !${CATEGORY}/${PN}:5"
- ;;
- false) ;;
- *)
- eerror "Unknown value for \${KDE_BLOCK_SLOT5}"
- die "Value ${KDE_BLOCK_SLOT5} is not supported"
- ;;
-esac
+# list of applications ported to KF6 in SLOT=6 having to block SLOT=5
+if $(ver_test -gt 24.01.75); then
+ case ${PN} in
+ analitza | \
+ ark | \
+ baloo-widgets | \
+ blinken | \
+ bomber | \
+ bovo | \
+ dolphin | \
+ dolphin-plugins-dropbox | \
+ dolphin-plugins-git | \
+ dolphin-plugins-mercurial | \
+ dolphin-plugins-mountiso | \
+ dolphin-plugins-subversion | \
+ dragon | \
+ elisa | \
+ filelight | \
+ granatier | \
+ kajongg | \
+ kalgebra | \
+ kamera | \
+ kapman | \
+ kapptemplate | \
+ kate | \
+ kate-addons | \
+ kate-lib | \
+ katomic | \
+ kbackup | \
+ kblackbox | \
+ kblocks | \
+ kbounce | \
+ kbreakout | \
+ kbruch | \
+ kcachegrind | \
+ kcalc | \
+ kcharselect | \
+ kcolorchooser | \
+ kcron | \
+ kdebugsettings | \
+ kdegraphics-mobipocket | \
+ kdenetwork-filesharing | \
+ kdevelop | \
+ kdf | \
+ kdialog | \
+ kdiamond | \
+ keditbookmarks | \
+ kfind | \
+ kfourinline | \
+ kgeography | \
+ kget | \
+ kgoldrunner | \
+ khelpcenter | \
+ kigo | \
+ killbots | \
+ kio-extras | \
+ kiriki | \
+ kiten | \
+ kjumpingcube | \
+ klettres | \
+ klickety | \
+ klines | \
+ kmag | \
+ kmahjongg | \
+ kmines | \
+ kmousetool | \
+ kmouth | \
+ knavalbattle | \
+ knetwalk | \
+ knights | \
+ kolf | \
+ kollision | \
+ konqueror | \
+ konquest | \
+ konsole | \
+ kontrast | \
+ kpat | \
+ kpmcore | \
+ kreversi | \
+ kruler | \
+ kshisen | \
+ ksirk | \
+ ksnakeduel | \
+ kspaceduel | \
+ ksquares | \
+ ksudoku | \
+ ksystemlog | \
+ kteatime | \
+ ktimer | \
+ ktorrent | \
+ ktuberling | \
+ kturtle | \
+ kubrick | \
+ kwalletmanager | \
+ kweather | \
+ kwrite | \
+ libkdegames | \
+ libkmahjongg | \
+ libktorrent | \
+ lskat | \
+ markdownpart | \
+ palapeli | \
+ partitionmanager | \
+
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 0b622a1ee682356b853a7a7a84fb08e865766fc0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 16 11:04:56 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 16 11:04:56 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0b622a1e
plasma.kde.org.eclass: Exclude kwayland-integration from SLOT=5 blockers
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma.kde.org.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 7a829b8596..ad4511f635 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -81,6 +81,7 @@ if [[ ${_PSLOT} == 6 ]]; then
case ${PN} in
kglobalacceld | \
kwayland | \
+ kwayland-integration | \
libplasma | \
ocean-sound-theme | \
plasma-activities | \
[gentoo-commits] proj/kde:master commit in: eclass/
commit: bb7b1a3a31d8a4bb5de8ab4644dfb566b954fb58
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 9 11:16:39 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 9 11:20:20 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb7b1a3a
gear.kde.org.eclass: Add new meta variable KDE_BLOCK_SLOT5
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/gear.kde.org.eclass | 23 +++
1 file changed, 23 insertions(+)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 0588951090..226db68a87 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -25,6 +25,18 @@ esac
if [[ -z ${_GEAR_KDE_ORG_ECLASS} ]]; then
_GEAR_KDE_ORG_ECLASS=1
+# @ECLASS-VARIABLE: KDE_BLOCK_SLOT5
+# @PRE_INHERIT
+# @DESCRIPTION:
+# By default set to "true", which means for packages in SLOT 6, add RDEPEND
+# block against ${CATEGORY}/${PN}:5.
+# Set to "false" in order to enable side-by-side installability.
+if [[ ${SLOT} == 6 ]]; then
+: ${KDE_BLOCK_SLOT5:=true}
+else
+: ${KDE_BLOCK_SLOT5:=false}
+fi
+
# @ECLASS_VARIABLE: KDE_PV_UNRELEASED
# @INTERNAL
# @DESCRIPTION:
@@ -63,4 +75,15 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
fi
+case ${KDE_BLOCK_SLOT5} in
+ true)
+ RDEPEND+=" !${CATEGORY}/${PN}:5"
+ ;;
+ false) ;;
+ *)
+ eerror "Unknown value for \${KDE_BLOCK_SLOT5}"
+ die "Value ${KDE_BLOCK_SLOT5} is not supported"
+ ;;
+esac
+
fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 835a9b5f6cc189360446a80c9aa9b10e9aae74f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 7 08:21:38 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 7 09:04:55 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=835a9b5f gear.kde.org.eclass: Mark 23.08.4 unreleased Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 0588951090..325b1b574a 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( ) +KDE_PV_UNRELEASED=( 23.08.4 ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: fcf516962acde10c69640181257600254f3dd752
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 29 20:26:28 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 29 20:27:20 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fcf51696
plasma.kde.org.eclass: Support versioning scheme of Plasma 6 Betas
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma.kde.org.eclass | 4
1 file changed, 4 insertions(+)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 8326a7b5ed..8a91155fc7 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -67,6 +67,10 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
RESTRICT+=" mirror"
;;
+ 5.9?.0* )
+ _KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
+ RESTRICT+=" mirror"
+ ;;
*) _KDE_SRC_URI+="stable/plasma/$(ver_cut 1-3)/" ;;
esac
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 4933c28677189614a6025a68939207ad78b5e014
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 29 20:23:17 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 29 20:27:20 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4933c286
plasma.kde.org.eclass: Add _PSLOT major version mapping, SLOT 5 blocker
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma.kde.org.eclass | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 367ad94a61..8326a7b5ed 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -31,6 +31,16 @@ _PLASMA_KDE_ORG_ECLASS=1
# For proper description see kde.org.eclass manpage.
KDE_PV_UNRELEASED=( )
+# @ECLASS_VARIABLE: _PSLOT
+# @INTERNAL
+# @DESCRIPTION:
+# KDE Plasma major version mapping, implied by package version. This is being
+# used throughout the eclass as a switch between Plasma 5 and 6 packages.
+_PSLOT=6
+if $(ver_test -lt 5.27.50); then
+ _PSLOT=5
+fi
+
inherit kde.org
HOMEPAGE="https://kde.org/plasma-desktop;
@@ -39,7 +49,7 @@ HOMEPAGE="https://kde.org/plasma-desktop;
# @INTERNAL
# @DESCRIPTION:
# For proper description see kde.org.eclass manpage.
-KDE_ORG_SCHEDULE_URI+="/Plasma_5"
+KDE_ORG_SCHEDULE_URI+="/Plasma_${_PSLOT}"
# @ECLASS_VARIABLE: _KDE_SRC_URI
# @INTERNAL
@@ -63,4 +73,17 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz"
fi
+if [[ ${_PSLOT} == 6 ]]; then
+ case ${PN} in
+ kglobalacceld | \
+ kwayland | \
+ libplasma | \
+ ocean-sound-theme | \
+ plasma-activities | \
+ plasma-activities-stats | \
+ plasma5support) ;;
+ *) RDEPEND+=" !kde-plasma/${PN}:5" ;;
+ esac
+fi
+
fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 306d1be4b48b586196f00210f5f46f0c496eeae9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 18 22:56:55 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 25 23:25:47 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=306d1be4
ecm.eclass: Enforce QT_MAJOR_VERSION=6 for packages w/ KFMIN >= 5.240
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 39780f422f..6b870688a1 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -148,7 +148,8 @@ fi
# @DESCRIPTION:
# Minimum version of Frameworks to require. Default value for kde-frameworks
# is ${PV} and 5.106.0 baseline for everything else.
-# If set to >=5.240, KF6/Qt6 will be assumed thus SLOT=6 dependencies added.
+# If set to >=5.240, KF6/Qt6 is assumed thus SLOT=6 dependencies added and
+# -DQT_MAJOR_VERSION=6 added to cmake args.
if [[ ${CATEGORY} = kde-frameworks ]]; then
: "${KFMIN:=$(ver_cut 1-2)}"
fi
@@ -542,6 +543,10 @@ ecm_src_configure() {
local cmakeargs
+ if [[ ${_KFSLOT} == 6 ]]; then
+ cmakeargs+=( -DQT_MAJOR_VERSION=6 )
+ fi
+
if in_iuse test && ! use test ; then
cmakeargs+=( -DBUILD_TESTING=OFF )
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 3988b47f84f5051001afbfa6b30b5c97c4fd72ea
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 15 21:33:29 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 25 23:25:47 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3988b47f
frameworks.kde.org.eclass: Define SLOT=6 for >=5.240, set ECM to SLOT=0
Exclude 5. from SLOT=6.
git master was set to 5.240 for KF6 ports, unstable KF6 releases use
numbers 5.245 and above.
Also do it with less lines and no intermediate vars.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/frameworks.kde.org.eclass | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 456902d39c..5d54b736c9 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -35,18 +35,19 @@ inherit kde.org
HOMEPAGE="https://develop.kde.org/products/frameworks/;
-_SLOT=6
-_SUBSLOT=${PV}
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
- _SUBSLOT=$(ver_cut 1-2)
-else
- _SUBSLOT=
+SLOT=6
+if [[ ${PV} == 5. ]] || ver_test ${PV} -lt 5.240; then
+ SLOT=5
fi
-if [[ ${PV/.*} == 5 ]]; then
- _SLOT=5
+if [[ ${PN} == extra-cmake-modules ]]; then
+ SLOT=0
+else
+ if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SLOT=${SLOT}/$(ver_cut 1-2)
+ else
+ SLOT=${SLOT}/
+ fi
fi
-SLOT=${_SLOT}/${_SUBSLOT}
-unset _SLOT _SUBSLOT
# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
# @INTERNAL
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 8265ebedad8ae06f1889f03ed258d9322055fa58
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 15 21:04:07 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 25 23:25:47 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8265ebed
ecm.eclass: Relax kde-frameworks/extra-cmake-modules SLOT dep to :*
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index b31fbf479f..39780f422f 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -270,8 +270,8 @@ case ${ECM_TEST} in
esac
BDEPEND+="
- >=kde-frameworks/extra-cmake-modules-${KFMIN}:${_KFSLOT}
dev-libs/libpcre2:*
+ >=kde-frameworks/extra-cmake-modules-${KFMIN}:*
"
RDEPEND+=" >=kde-frameworks/kf-env-4"
if [[ ${_KFSLOT} == 6 ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 45e6c18e9550643b5dfe337f06a46910290cf0c4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 19 12:28:03 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 25 23:25:47 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=45e6c18e
ecm.eclass: Use _KFSLOT to aptly configure KF5/KF6 based packages
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 46 +-
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 6b870688a1..6e194c97e2 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -87,26 +87,27 @@ fi
# Will accept "true", "false", "optional", "forceoptional". If set to "false",
# do nothing.
# Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and let
-# KF5DocTools generate and install the handbook from docbook file(s) found in
-# ECM_HANDBOOK_DIR. However if !handbook, disable build of ECM_HANDBOOK_DIR
-# in CMakeLists.txt.
-# If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
-# when !handbook. In case package requires KF5KDELibs4Support, see next:
-# If set to "forceoptional", remove a KF5DocTools dependency from the root
-# CMakeLists.txt in addition to the above.
+# KF${_KFSLOT}DocTools generate and install the handbook from docbook file(s)
+# found in ECM_HANDBOOK_DIR. However if !handbook, disable build of
+# ECM_HANDBOOK_DIR in CMakeLists.txt.
+# If set to "optional", build with
+# -DCMAKE_DISABLE_FIND_PACKAGE_KF${_KFSLOT}DocTools=ON when !handbook. In case
+# package requires KF5KDELibs4Support, see next:
+# If set to "forceoptional", remove a KF${_KFSLOT}DocTools dependency from the
+# root CMakeLists.txt in addition to the above.
: "${ECM_HANDBOOK:=false}"
# @ECLASS_VARIABLE: ECM_HANDBOOK_DIR
# @DESCRIPTION:
# Specifies the directory containing the docbook file(s) relative to ${S} to
-# be processed by KF5DocTools (kdoctools_install).
+# be processed by KF${_KFSLOT}DocTools (kdoctools_install).
: "${ECM_HANDBOOK_DIR:=doc}"
# @ECLASS_VARIABLE: ECM_PO_DIRS
# @DESCRIPTION:
# Specifies directories of l10n files relative to ${S} to be processed by
-# KF5I18n (ki18n_install). If IUSE nls exists and is disabled then disable
-# build of these directories in CMakeLists.txt.
+# KF${_KFSLOT}I18n (ki18n_install). If IUSE nls exists and is disabled then
+# disable build of these directories in CMakeLists.txt.
: "${ECM_PO_DIRS:="po poqm"}"
# @ECLASS_VARIABLE: ECM_QTHELP
@@ -128,14 +129,14 @@ fi
# "forceoptional-recursive".
# Default value is "false", except for CATEGORY=kde-frameworks where it is
# set to "true". If set to "false", do nothing.
-# For any other value, add "test" to IUSE and DEPEND on dev-qt/qttest:5.
-# If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON
-# when USE=!test.
-# If set to "forceoptional", punt Qt5Test dependency and ignore "autotests",
+# For any other value, add "test" to IUSE and DEPEND on dev-qt/qtbase:6[test]
+# (for KF5: dev-qt/qttest:5). If set to "optional", build with
+# -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON when USE=!test. If set
+# to "forceoptional", punt Qt${_KFSLOT}Test dependency and ignore "autotests",
# "test", "tests" subdirs from top-level CMakeLists.txt when USE=!test.
-# If set to "forceoptional-recursive", punt Qt5Test dependencies and make
-# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in
-# ${S} and below conditional on BUILD_TESTING when USE=!test. This is always
+# If set to "forceoptional-recursive", punt Qt${_KFSLOT}Test dependencies and
+# make autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt
+# in ${S} and below conditional on BUILD_TESTING when USE=!test. This is always
# meant as a short-term fix and creates ${T}/${P}-tests-optional.patch to
# refine and submit upstream.
if [[ ${CATEGORY} = kde-frameworks ]]; then
@@ -158,7 +159,10 @@ fi
# @ECLASS_VARIABLE: _KFSLOT
# @INTERNAL
# @DESCRIPTION:
-# KDE Frameworks and Qt slot dependency, implied by KFMIN version.
+# KDE Frameworks and Qt main slot dependency, implied by KFMIN version, *not*
+# necessarily the package's SLOT. This is being used throughout the eclass to
+# depend on either :5 or :6 Qt/KF packages as well as setting correctly
+# prefixed cmake args.
: "${_KFSLOT:=5}"
if [[ ${CATEGORY} == kde-frameworks ]]; then
if [[ ${PV} != 5. ]] && $(ver_test ${KFMIN} -ge 5.240); then
@@ -489,7 +493,7 @@ ecm_src_prepare() {
# always install unconditionally for kconfigwidgets - if you use
# language X as system language, and there is a combobox with
language
# names, the translated language name for language Y is taken
from
- # /usr/share/locale/Y/kf5_entry.desktop
+ # /usr/share/locale/Y/kf${_KFSLOT}_entry.desktop
[[ ${PN} != kconfigwidgets ]] &&
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 91efc16e90cf9a7f70029f7476dc17f3c63f0e8e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 12 10:10:15 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 12 10:18:03 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=91efc16e
ecm.eclass: Raise baseline Frameworks version (KFMIN) to 5.106.0
In ecm.eclass, this only affects BDEPENDs, and in practise every ebuild
making use of KFMIN in RDEPEND will set their own minimum pre-inherit.
Many KDE packages already require 5.101 at a minimum for new API and
porting away from deprecated.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 9d79189127..b31fbf479f 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -147,13 +147,12 @@ fi
# @DEFAULT_UNSET
# @DESCRIPTION:
# Minimum version of Frameworks to require. Default value for kde-frameworks
-# is ${PV} and 5.82.0 baseline for everything else. This is not going to be
-# changed unless we also bump EAPI, which usually implies (rev-)bumping.
+# is ${PV} and 5.106.0 baseline for everything else.
# If set to >=5.240, KF6/Qt6 will be assumed thus SLOT=6 dependencies added.
if [[ ${CATEGORY} = kde-frameworks ]]; then
: "${KFMIN:=$(ver_cut 1-2)}"
fi
-: "${KFMIN:=5.82.0}"
+: "${KFMIN:=5.106.0}"
# @ECLASS_VARIABLE: _KFSLOT
# @INTERNAL
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 749716069dc59f5553162db86337153e02d531d5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 12 09:16:33 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 12 09:16:33 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=74971606 frameworks.kde.org.eclass: Mark 5.112 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 83ecd0825b..456902d39c 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.112.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: a1b3e9e0835befcb782d9744b1086e5cb4eba412 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 9 12:33:26 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 9 12:33:26 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1b3e9e0 gear.kde.org.eclass: Mark 23.08.3 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 6bd6bedea2..5977c0f72e 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 23.08.3 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 065572bdc5985f3a481348fb69e0780ee2f7d7ba
Author: Raul E Rangel chromium org>
AuthorDate: Wed Apr 19 21:54:01 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 16 15:03:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=065572bd
cmake.eclass: Set CMAKE_SYSROOT when building with SYSROOT=
When performing a SYSROOT= build, the --sysroot parameter was not
getting passed to the compiler if the CBUILD and CHOST matched. This
results in the build attempting to use BROOT libraries and headers
instead of the ones from the SYSROOT.
This change will allow `llvm` to be built into a new SYSROOT.
ROOT=/build/amd64-host emerge sys-devel/llvm
Signed-off-by: Raul E Rangel chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/30658
Signed-off-by: James Le Cuirot gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b7db941bfb..340645e917 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -407,17 +407,17 @@ cmake_src_configure() {
cat >> "${toolchain_file}" <<- _EOF_ || die
set(CMAKE_SYSTEM_NAME "${sysname}")
_EOF_
+ fi
- if [ "${SYSROOT:-/}" != "/" ] ; then
- # When cross-compiling with a sysroot (e.g. with
crossdev's emerge wrappers)
- # we need to tell cmake to use libs/headers from the
sysroot but programs from / only.
- cat >> "${toolchain_file}" <<- _EOF_ || die
- set(CMAKE_SYSROOT "${ESYSROOT}")
- set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
- set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
- set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
- _EOF_
- fi
+ if [[ ${SYSROOT:-/} != / ]] ; then
+ # When building with a sysroot (e.g. with crossdev's emerge
wrappers)
+ # we need to tell cmake to use libs/headers from the sysroot
but programs from / only.
+ cat >> "${toolchain_file}" <<- _EOF_ || die
+ set(CMAKE_SYSROOT "${ESYSROOT}")
+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+ _EOF_
fi
if use prefix-guest; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 23f1fc2f04eec136c833d983cbbc9233ac8bf30d
Author: Michał Górny gentoo org>
AuthorDate: Wed Aug 23 06:50:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 16 15:03:36 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=23f1fc2f
cmake.eclass: Remove duplicate eninja call from cmake_build
Signed-off-by: Michał Górny gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 -
1 file changed, 1 deletion(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index bf5ee61c06..ad647ab7d4 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -578,7 +578,6 @@ cmake_build() {
OFF) NINJA_VERBOSE=OFF eninja "$@" ;;
*) eninja "$@" ;;
esac
- eninja "$@"
;;
esac
[gentoo-commits] proj/kde:master commit in: eclass/
commit: fa7eb5b9389c9767e78794ad63966cdd4be052c8 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 11 11:18:44 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 16 15:03:38 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fa7eb5b9 cmake.eclass: remove USER_VARIABLE from CMAKE_SKIP_TESTS This is an array, and users cannot even set arrays through the environment. Must have been a copy/paste oversight (skipping ML review). Signed-off-by: Ionen Wolkens gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/cmake.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index ad647ab7d4..cc4af463f8 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -126,7 +126,6 @@ fi # the ebuild. Helps in improving QA of build systems that write to source tree. # @ECLASS_VARIABLE: CMAKE_SKIP_TESTS -# @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: # Array of tests that should be skipped when running CTest.
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 96d078feec54ab045cc0773dbf3cdfb7d683cc93
Author: Matt Turner gentoo org>
AuthorDate: Mon Jul 17 15:13:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 16 15:03:33 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=96d078fe
cmake.eclass: Support CMAKE_VERBOSE with ninja
Signed-off-by: Matt Turner gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 4
1 file changed, 4 insertions(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 91cbf976bb..bf5ee61c06 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -574,6 +574,10 @@ cmake_build() {
;;
ninja)
[[ -e build.ninja ]] || die "build.ninja not found.
Error during configure stage."
+ case ${CMAKE_VERBOSE} in
+ OFF) NINJA_VERBOSE=OFF eninja "$@" ;;
+ *) eninja "$@" ;;
+ esac
eninja "$@"
;;
esac
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 2b32cb0d67222da271e2ae25b19479f0374648da
Author: Sam James gentoo org>
AuthorDate: Mon Jun 26 09:54:06 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 16 15:03:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b32cb0d
cmake.eclass: workaround S=${WORKDIR} creating builddir above ${WORKDIR}
When S=${WORKDIR}, cmake.eclass would create its build directory (if
CMAKE_USE_DIR
is unset) above WORKDIR(!) as ${WORKDIR}_build. Creating directories above
WORKDIR is not legal.
Portage has its own bug (bug #889418) in that it doesn't clean up unknown
directories
above WORKDIR in PORTAGE_TMPDIR, so combined, you get a problem where "ebuild
... clean" doesn't
actually clean things up at all, and you get very confusing issues if e.g.
changing
CC between runs.
The explicit S=WORKDIR check isn't truly needed but it makes explicit our
intent here.
Bug: https://bugs.gentoo.org/889418
Closes: https://bugs.gentoo.org/889420
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 9 +
1 file changed, 9 insertions(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 340645e917..91cbf976bb 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -216,6 +216,15 @@ _cmake_check_build_dir() {
BUILD_DIR="${CMAKE_USE_DIR}"
else
: "${BUILD_DIR:=${CMAKE_USE_DIR}_build}"
+
+ # Avoid creating ${WORKDIR}_build (which is above WORKDIR).
+ # TODO: For EAPI > 8, we should ban S=WORKDIR for CMake.
+ # See bug #889420.
+ if [[ ${S} == "${WORKDIR}" && ${BUILD_DIR} ==
"${WORKDIR}_build" ]] ; then
+ eqawarn "QA notice: S=WORKDIR is deprecated for
cmake.eclass."
+ eqawarn "Please relocate the sources in src_unpack."
+ BUILD_DIR="${WORKDIR}"/${P}_build
+ fi
fi
einfo "Source directory (CMAKE_USE_DIR): \"${CMAKE_USE_DIR}\""
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 2d2bdb49ec5b099004dbd939e2709b198a678d84
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 9 11:09:20 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 9 16:39:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d2bdb49
ecm.eclass: Drop supposedly obsolete dev-qt/qthelp crutch for Portage
Bug: https://bugs.gentoo.org/836726
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index dfbc005701..9d79189127 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -235,10 +235,6 @@ case ${ECM_HANDBOOK} in
;;
esac
-# Unfortunately, Portage has no concept of BDEPEND=dev-qt/qthelp being broken
-# by having only partially updated Qt dependencies, which means it will order
-# dev-qt/qthelp revdeps in build queue before its own Qt dependencies, leaving
-# qhelpgenerator broken. This is an attempt to help with that. Bug #836726
case ${ECM_QTHELP} in
true)
IUSE+=" doc"
@@ -247,13 +243,7 @@ case ${ECM_QTHELP} in
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[assistant]"
else
- BDEPEND+=" doc? (
- =dev-qt/qtcore-5.15.10*:5
- =dev-qt/qtgui-5.15.10*:5
- =dev-qt/qthelp-5.15.10*:5
- =dev-qt/qtsql-5.15.10*:5
- =dev-qt/qtwidgets-5.15.10*:5
- )"
+ BDEPEND+=" doc? ( dev-qt/qthelp:${_KFSLOT} )"
fi
;;
false) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: ddcd6609520b70fac53605dd598ac1cd735a2f02 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 24 10:20:32 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 24 10:20:32 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ddcd6609 gear.kde.org.eclass: Mark 23.08.0 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 0304451a5d..5977c0f72e 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 23.08.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 0ad1e01237a766fdb531d735bfbec1cc0fc20793
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 24 11:51:58 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 24 11:51:58 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ad1e012
ecm.eclass: Drop Qt 5.15.9 from ECM_QTHELP Portage bug workaround
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 23 +++
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index c0d46ce0e0..dfbc005701 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -247,22 +247,13 @@ case ${ECM_QTHELP} in
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[assistant]"
else
- BDEPEND+=" doc? ( || (
- (
- =dev-qt/qtcore-5.15.10*:5
- =dev-qt/qtgui-5.15.10*:5
- =dev-qt/qthelp-5.15.10*:5
- =dev-qt/qtsql-5.15.10*:5
- =dev-qt/qtwidgets-5.15.10*:5
- )
- (
- =dev-qt/qtcore-5.15.9*:5
- =dev-qt/qtgui-5.15.9*:5
- =dev-qt/qthelp-5.15.9*:5
- =dev-qt/qtsql-5.15.9*:5
- =dev-qt/qtwidgets-5.15.9*:5
- )
- ) )"
+ BDEPEND+=" doc? (
+ =dev-qt/qtcore-5.15.10*:5
+ =dev-qt/qtgui-5.15.10*:5
+ =dev-qt/qthelp-5.15.10*:5
+ =dev-qt/qtsql-5.15.10*:5
+ =dev-qt/qtwidgets-5.15.10*:5
+ )"
fi
;;
false) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: ae61a433c4c25dd5d3dcb58d9367d523c7c1b6d3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 8 15:15:23 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 8 15:15:23 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae61a433 frameworks.kde.org.eclass: Mark 5.108 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index ff4ff14648..456902d39c 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.108.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: ef4c082a5c44e00177298608bae6e2e00b65108f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jun 21 10:00:54 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 22 16:03:04 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ef4c082a
plasma.kde.org.eclass: Better restrict unstable version def
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma.kde.org.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 8fcf087896..367ad94a61 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -53,7 +53,7 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then
fi
elif [[ -z ${KDE_ORG_COMMIT} ]]; then
case ${PV} in
- 5.??.[6-9]?* )
+ 5.??.[6-9][05]* )
_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
RESTRICT+=" mirror"
;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: df307a4cda55eaa63949f6d8354babb7a93bda6d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 17 20:33:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 17 20:34:08 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=df307a4c
ecm.eclass: Add Qt 5.15.10 to ECM_QTHELP Portage bug workaround
Bug: https://bugs.gentoo.org/908715
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 59c6fac220..c0d46ce0e0 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -247,13 +247,22 @@ case ${ECM_QTHELP} in
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[assistant]"
else
- BDEPEND+=" doc? (
- =dev-qt/qtcore-5.15.9*:5
- =dev-qt/qtgui-5.15.9*:5
- =dev-qt/qthelp-5.15.9*:5
- =dev-qt/qtsql-5.15.9*:5
- =dev-qt/qtwidgets-5.15.9*:5
- )"
+ BDEPEND+=" doc? ( || (
+ (
+ =dev-qt/qtcore-5.15.10*:5
+ =dev-qt/qtgui-5.15.10*:5
+ =dev-qt/qthelp-5.15.10*:5
+ =dev-qt/qtsql-5.15.10*:5
+ =dev-qt/qtwidgets-5.15.10*:5
+ )
+ (
+ =dev-qt/qtcore-5.15.9*:5
+ =dev-qt/qtgui-5.15.9*:5
+ =dev-qt/qthelp-5.15.9*:5
+ =dev-qt/qtsql-5.15.9*:5
+ =dev-qt/qtwidgets-5.15.9*:5
+ )
+ ) )"
fi
;;
false) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 31433838eaf10631f74a41f8785c3dbaa6d2fd03
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 13 07:11:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 13 07:11:27 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31433838
kde.org.eclass: Fix Qt5PatchCollection matching to 5.15.*.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/kde.org.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 88040026ec..c972c12ab8 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -161,7 +161,7 @@ case ${KDE_BUILD_TYPE} in
EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
EGIT_REPO_URI="${EGIT_MIRROR}/${EGIT_REPONAME:=$KDE_ORG_NAME}.git"
- if [[ ${PV} == 5.??.?. && ${CATEGORY} == dev-qt ]]; then
+ if [[ ${PV} == 5.15.*. && ${CATEGORY} == dev-qt ]]; then
EGIT_BRANCH="kde/$(ver_cut 1-2)"
fi
;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 31f39c1644bd9b5bfebded1d8988b902f0f20239 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 10 09:42:51 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 10 09:42:51 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31f39c16 frameworks.kde.org.eclass: Mark 5.107 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 94776aed0d..456902d39c 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.107.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 45ce71a878d28734231749a28b3765af9e043192 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 8 10:46:19 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 8 10:46:19 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=45ce71a8 gear.kde.org.eclass: Mark 23.04.2 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 0070797e4b..5977c0f72e 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 23.04.2 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: af9f38d884d0a009f06774f68c7cf9b3498c12d3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 25 20:04:48 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 27 06:52:08 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=af9f38d8
ecm.eclass: Use QT_QPA_PLATFORM=offscreen instead of virtualx.eclass
Keep inheriting virtualx.eclass since it is expected from ecm.eclass for now.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 542993b6ec..59c6fac220 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -29,6 +29,9 @@ esac
if [[ -z ${_ECM_ECLASS} ]]; then
_ECM_ECLASS=1
+inherit cmake flag-o-matic toolchain-funcs
+
+if [[ ${EAPI} == 8 ]]; then
# @ECLASS_VARIABLE: VIRTUALX_REQUIRED
# @DESCRIPTION:
# For proper description see virtualx.eclass manpage.
@@ -36,7 +39,8 @@ _ECM_ECLASS=1
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
: "${VIRTUALX_REQUIRED:=manual}"
-inherit cmake flag-o-matic toolchain-funcs virtualx
+inherit virtualx
+fi
# @ECLASS_VARIABLE: ECM_NONGUI
# @DEFAULT_UNSET
@@ -610,13 +614,15 @@ ecm_src_test() {
KDE_DEBUG=1 cmake_src_test
}
+ local -x QT_QPA_PLATFORM=offscreen
+
# When run as normal user during ebuild development with the ebuild
command,
# tests tend to access the session DBUS. This however is not possible
in a
# real emerge or on the tinderbox.
# make sure it does not happen, so bad tests can be recognized and
disabled
unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
- if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]];
then
+ if [[ ${EAPI} == 8 ]] && [[ ${VIRTUALX_REQUIRED} = always ||
${VIRTUALX_REQUIRED} = test ]]; then
virtx _test_runner
else
_test_runner
[gentoo-commits] proj/kde:master commit in: eclass/
commit: e4640674ee8579dfa2c330c94cc737a1ec41de37
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 20 20:18:37 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 20 20:18:37 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4640674
ecm.eclass: Need to exclude KDE Frameworks 5. from KFMIN>=5.240 check
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index fdd5ba92b8..542993b6ec 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -156,8 +156,14 @@ fi
# @DESCRIPTION:
# KDE Frameworks and Qt slot dependency, implied by KFMIN version.
: "${_KFSLOT:=5}"
-if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then
- _KFSLOT=6
+if [[ ${CATEGORY} == kde-frameworks ]]; then
+ if [[ ${PV} != 5. ]] && $(ver_test ${KFMIN} -ge 5.240); then
+ _KFSLOT=6
+ fi
+else
+ if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then
+ _KFSLOT=6
+ fi
fi
case ${ECM_NONGUI} in
[gentoo-commits] proj/kde:master commit in: eclass/
commit: de26dfceff864a2ad343531f3683961042dea398
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 18 20:28:51 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 18 20:28:51 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de26dfce
ecm.eclass: Add SLOT=6 dependencies if KFMIN is >=5.240
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 125b47b42e..ef59ddfbce 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -145,7 +145,7 @@ fi
# Minimum version of Frameworks to require. Default value for kde-frameworks
# is ${PV} and 5.82.0 baseline for everything else. This is not going to be
# changed unless we also bump EAPI, which usually implies (rev-)bumping.
-# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6.
+# If set to >=5.240, KF6/Qt6 will be assumed thus SLOT=6 dependencies added.
if [[ ${CATEGORY} = kde-frameworks ]]; then
: "${KFMIN:=$(ver_cut 1-2)}"
fi
@@ -156,7 +156,9 @@ fi
# @DESCRIPTION:
# KDE Frameworks and Qt slot dependency, implied by KFMIN version.
: "${_KFSLOT:=5}"
-[[ ${KFMIN/.*} == 6 ]] && _KFSLOT=6
+if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then
+ _KFSLOT=6
+fi
case ${ECM_NONGUI} in
true) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 5bd2c28df8f44f5515fd621919568cb6ab5b5e83
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 18 20:07:35 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 18 20:07:35 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5bd2c28d
cmake.eclass: Cleanup fatal banned functions and meta variables
All of this was ported away from long ago, cmake-utils.eclass was removed
almost a year ago.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 91 -
1 file changed, 91 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 485ecbb7a9..b7db941bfb 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -131,13 +131,6 @@ fi
# @DESCRIPTION:
# Array of tests that should be skipped when running CTest.
-[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary,
set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly"
-[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
-[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set
CMAKE_REMOVE_MODULES_LIST array instead"
-[[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY
instead"
-[[ ${WANT_CMAKE} ]] && die "WANT_CMAKE has been removed and is a no-op"
-[[ ${PREFIX} ]] && die "PREFIX has been removed and is a no-op"
-
case ${CMAKE_MAKEFILE_GENERATOR} in
emake)
BDEPEND="sys-devel/make"
@@ -190,14 +183,6 @@ cmake_comment_add_subdirectory() {
done
}
-# @FUNCTION: comment_add_subdirectory
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use cmake_comment_add_subdirectory instead.
-comment_add_subdirectory() {
- die "comment_add_subdirectory is banned. Use
cmake_comment_add_subdirectory instead"
-}
-
# @FUNCTION: cmake_use_find_package
# @USAGE:
# @DESCRIPTION:
@@ -216,74 +201,6 @@ cmake_use_find_package() {
echo "-DCMAKE_DISABLE_FIND_PACKAGE_$2=$(use $1 && echo OFF || echo ON)"
}
-# @FUNCTION: _cmake_banned_func
-# @INTERNAL
-# @DESCRIPTION:
-# Banned functions are banned.
-_cmake_banned_func() {
- die "${FUNCNAME[1]} is banned. use
-D$1=\"\$(usex $2)\" instead"
-}
-
-# @FUNCTION: cmake-utils_use_with
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DWITH_FOO=$(usex foo) instead.
-cmake-utils_use_with() { _cmake_banned_func WITH_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_enable
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DENABLE_FOO=$(usex foo) instead.
-cmake-utils_use_enable() { _cmake_banned_func ENABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_disable
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DDISABLE_FOO=$(usex !foo) instead.
-cmake-utils_use_disable() { _cmake_banned_func DISABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_no
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DNO_FOO=$(usex !foo) instead.
-cmake-utils_use_no() { _cmake_banned_func NO_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_want
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DWANT_FOO=$(usex foo) instead.
-cmake-utils_use_want() { _cmake_banned_func WANT_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_build
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DBUILD_FOO=$(usex foo) instead.
-cmake-utils_use_build() { _cmake_banned_func BUILD_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_has
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DHAVE_FOO=$(usex foo) instead.
-cmake-utils_use_has() { _cmake_banned_func HAVE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_use
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DUSE_FOO=$(usex foo) instead.
-cmake-utils_use_use() { _cmake_banned_func USE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DFOO=$(usex foo) instead.
-cmake-utils_use() { _cmake_banned_func "" "$@" ; }
-
-# @FUNCTION: cmake-utils_useno
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use -DNOFOO=$(usex !foo) instead.
-cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
-
# @FUNCTION: _cmake_check_build_dir
# @INTERNAL
# @DESCRIPTION:
@@ -655,14 +572,6 @@ cmake_build() {
popd > /dev/null || die
}
-# @FUNCTION: cmake-utils_src_make
-# @INTERNAL
-# @DESCRIPTION:
-# Banned. Use cmake_build instead.
-cmake-utils_src_make() {
- die "cmake-utils_src_make is banned. Use cmake_build instead"
-}
-
# @FUNCTION: cmake_src_test
# @DESCRIPTION:
# Function for testing the package. Automatically detects the build type.
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 9b644d5ba0ce49494d254f4cec010e6a4614677a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 18 20:48:12 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 18 20:48:12 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b644d5b
ecm.eclass: ECM_QTHELP needs qhelpgenerator, provided by qttools[assistant]:6
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index ef59ddfbce..fdd5ba92b8 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -235,7 +235,7 @@ case ${ECM_QTHELP} in
COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${_KFSLOT} )"
BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 )"
if [[ ${_KFSLOT} == 6 ]]; then
- BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
+ BDEPEND+=" dev-qt/qttools:${_KFSLOT}[assistant]"
else
BDEPEND+=" doc? (
=dev-qt/qtcore-5.15.9*:5
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 0dcbe478843b99daf634f28cbf9395eef408ba79
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 18 15:48:46 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 18 15:54:49 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dcbe478
frameworks.kde.org.eclass: Fixup for KF6 support
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/frameworks.kde.org.eclass | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 81ac235d01..456902d39c 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -37,10 +37,13 @@ HOMEPAGE="https://develop.kde.org/products/frameworks/;
_SLOT=6
_SUBSLOT=${PV}
-[[ ${KDE_BUILD_TYPE} == release ]] && _SUBSLOT=$(ver_cut 1-2)
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ _SUBSLOT=$(ver_cut 1-2)
+else
+ _SUBSLOT=
+fi
if [[ ${PV/.*} == 5 ]]; then
_SLOT=5
- [[ ${KDE_BUILD_TYPE} == live ]] && _SUBSLOT=
fi
SLOT=${_SLOT}/${_SUBSLOT}
unset _SLOT _SUBSLOT
@@ -59,7 +62,9 @@ _KDE_SRC_URI="mirror://kde/"
case ${KDE_BUILD_TYPE} in
live)
- [[ ${PV} == 5. ]] && EGIT_BRANCH="kf5"
+ if [[ ${PV} == 5. ]]; then
+ EGIT_BRANCH="kf5"
+ fi
;;
*)
if [[ -z ${KDE_ORG_COMMIT} ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 8d369f479b1e2a39184f7e0510369f5802afa43d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 13 16:30:57 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 13 16:30:57 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d369f47 frameworks.kde.org.eclass: Mark 5.106 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 0cecb0bd6f..81ac235d01 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.106.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 0be5c637065b93b19083172cccdec2f574594e50 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 11 16:34:15 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 11 16:34:15 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0be5c637 gear.kde.org.eclass: Mark 23.04.1 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 582bc73ed1..5977c0f72e 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 23.04.1 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 67c3e2d94b37c393f635bb64a86e646272531160
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 8 13:38:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 8 13:38:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=67c3e2d9
ecm.eclass: Add Qt 5.15.9 to ECM_QTHELP Portage bug workaround
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 139be799fe..80019b0ed7 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -235,13 +235,22 @@ case ${ECM_QTHELP} in
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
else
- BDEPEND+=" doc? (
- =dev-qt/qtcore-5.15.8*:5
- =dev-qt/qtgui-5.15.8*:5
- =dev-qt/qthelp-5.15.8*:5
- =dev-qt/qtsql-5.15.8*:5
- =dev-qt/qtwidgets-5.15.8*:5
- )"
+ BDEPEND+=" doc? ( || (
+ (
+ =dev-qt/qtcore-5.15.9*:5
+ =dev-qt/qtgui-5.15.9*:5
+ =dev-qt/qthelp-5.15.9*:5
+ =dev-qt/qtsql-5.15.9*:5
+ =dev-qt/qtwidgets-5.15.9*:5
+ )
+ (
+ =dev-qt/qtcore-5.15.8*:5
+ =dev-qt/qtgui-5.15.8*:5
+ =dev-qt/qthelp-5.15.8*:5
+ =dev-qt/qtsql-5.15.8*:5
+ =dev-qt/qtwidgets-5.15.8*:5
+ )
+ ) )"
fi
;;
false) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 78d54f084506a9a53dea8a8af10280165f385f0d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 8 13:20:59 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 8 13:20:59 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=78d54f08 frameworks.kde.org.eclass: Mark 5.105 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 9009b78ca0..81ac235d01 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.105.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: e7a6bf0add17c5ca8faad1c1577a45f7017a5960 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 4 17:53:26 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 4 19:13:14 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7a6bf0a frameworks.kde.org.eclass: Mark KDE Frameworks 5.105 unreleased Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 81ac235d01..9009b78ca0 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( ) +KDE_PV_UNRELEASED=( 5.105.0 ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: cc1bdcd022bdcd319180469ff031987a23c3f3ef
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Mar 23 16:39:58 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 26 12:11:00 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc1bdcd0
plasma-mobile.kde.org.eclass: Quote argument of ":" command
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Signed-off-by: Ulrich Müller gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma-mobile.kde.org.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/plasma-mobile.kde.org.eclass
b/eclass/plasma-mobile.kde.org.eclass
index 1e2c5b6eb4..9fd54100d2 100644
--- a/eclass/plasma-mobile.kde.org.eclass
+++ b/eclass/plasma-mobile.kde.org.eclass
@@ -29,7 +29,7 @@ _PLASMA_MOBILE_KDE_ORG_ECLASS=1
# @PRE_INHERIT
# @DESCRIPTION:
# For proper description see kde.org.eclass manpage.
-: ${KDE_ORG_CATEGORY:=plasma-mobile}
+: "${KDE_ORG_CATEGORY:=plasma-mobile}"
inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: a32a7a70e9120a1f14d51e4f2795b02ff9fa4c76
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Mar 23 16:39:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 26 12:11:00 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a32a7a70
ecm.eclass: Quote argument of ":" command
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Signed-off-by: Ulrich Müller gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5d4ec3c7f2..139be799fe 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -34,7 +34,7 @@ _ECM_ECLASS=1
# For proper description see virtualx.eclass manpage.
# Here we redefine default value to be manual, if your package needs virtualx
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
-: ${VIRTUALX_REQUIRED:=manual}
+: "${VIRTUALX_REQUIRED:=manual}"
inherit cmake flag-o-matic toolchain-funcs virtualx
@@ -46,9 +46,9 @@ inherit cmake flag-o-matic toolchain-funcs virtualx
# kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst,
# pkg_postinst and pkg_postrm. If set to "true", do nothing.
if [[ ${CATEGORY} = kde-frameworks ]] ; then
- : ${ECM_NONGUI:=true}
+ : "${ECM_NONGUI:=true}"
fi
-: ${ECM_NONGUI:=false}
+: "${ECM_NONGUI:=false}"
if [[ ${ECM_NONGUI} = false ]] ; then
inherit xdg
@@ -58,25 +58,25 @@ fi
# @DESCRIPTION:
# Assume the package is using KDEInstallDirs macro and switch
# KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing.
-: ${ECM_KDEINSTALLDIRS:=true}
+: "${ECM_KDEINSTALLDIRS:=true}"
# @ECLASS_VARIABLE: ECM_DEBUG
# @DESCRIPTION:
# Add "debug" to IUSE. If !debug, add -DQT_NO_DEBUG to CPPFLAGS. If set to
# "false", do nothing.
-: ${ECM_DEBUG:=true}
+: "${ECM_DEBUG:=true}"
# @ECLASS_VARIABLE: ECM_DESIGNERPLUGIN
# @DESCRIPTION:
# If set to "true", add "designer" to IUSE to toggle build of designer plugins
# and add the necessary BDEPEND. If set to "false", do nothing.
-: ${ECM_DESIGNERPLUGIN:=false}
+: "${ECM_DESIGNERPLUGIN:=false}"
# @ECLASS_VARIABLE: ECM_EXAMPLES
# @DESCRIPTION:
# By default unconditionally ignore a top-level examples subdirectory.
# If set to "true", add "examples" to IUSE to toggle adding that subdirectory.
-: ${ECM_EXAMPLES:=false}
+: "${ECM_EXAMPLES:=false}"
# @ECLASS_VARIABLE: ECM_HANDBOOK
# @DESCRIPTION:
@@ -90,20 +90,20 @@ fi
# when !handbook. In case package requires KF5KDELibs4Support, see next:
# If set to "forceoptional", remove a KF5DocTools dependency from the root
# CMakeLists.txt in addition to the above.
-: ${ECM_HANDBOOK:=false}
+: "${ECM_HANDBOOK:=false}"
# @ECLASS_VARIABLE: ECM_HANDBOOK_DIR
# @DESCRIPTION:
# Specifies the directory containing the docbook file(s) relative to ${S} to
# be processed by KF5DocTools (kdoctools_install).
-: ${ECM_HANDBOOK_DIR:=doc}
+: "${ECM_HANDBOOK_DIR:=doc}"
# @ECLASS_VARIABLE: ECM_PO_DIRS
# @DESCRIPTION:
# Specifies directories of l10n files relative to ${S} to be processed by
# KF5I18n (ki18n_install). If IUSE nls exists and is disabled then disable
# build of these directories in CMakeLists.txt.
-: ${ECM_PO_DIRS:="po poqm"}
+: "${ECM_PO_DIRS:="po poqm"}"
# @ECLASS_VARIABLE: ECM_QTHELP
# @DEFAULT_UNSET
@@ -113,9 +113,9 @@ fi
# -DBUILD_QCH=ON generate and install Qt compressed help files when USE=doc.
# If set to "false", do nothing.
if [[ ${CATEGORY} = kde-frameworks ]]; then
- : ${ECM_QTHELP:=true}
+ : "${ECM_QTHELP:=true}"
fi
-: ${ECM_QTHELP:=false}
+: "${ECM_QTHELP:=false}"
# @ECLASS_VARIABLE: ECM_TEST
# @DEFAULT_UNSET
@@ -135,9 +135,9 @@ fi
# meant as a short-term fix and creates ${T}/${P}-tests-optional.patch to
# refine and submit upstream.
if [[ ${CATEGORY} = kde-frameworks ]]; then
- : ${ECM_TEST:=true}
+ : "${ECM_TEST:=true}"
fi
-: ${ECM_TEST:=false}
+: "${ECM_TEST:=false}"
# @ECLASS_VARIABLE: KFMIN
# @DEFAULT_UNSET
@@ -147,15 +147,15 @@ fi
# changed unless we also bump EAPI, which usually implies (rev-)bumping.
# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6.
if [[ ${CATEGORY} = kde-frameworks ]]; then
- : ${KFMIN:=$(ver_cut 1-2)}
+ : "${KFMIN:=$(ver_cut 1-2)}"
fi
-: ${KFMIN:=5.82.0}
+: "${KFMIN:=5.82.0}"
# @ECLASS_VARIABLE: _KFSLOT
# @INTERNAL
# @DESCRIPTION:
# KDE Frameworks and Qt slot dependency, implied by KFMIN version.
-: ${_KFSLOT:=5}
+: "${_KFSLOT:=5}"
[[ ${KFMIN/.*} == 6 ]] && _KFSLOT=6
case ${ECM_NONGUI} in
[gentoo-commits] proj/kde:master commit in: eclass/
commit: cd8ca2ea4bc92301dae4ce7df44fbc243cacfc4e
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Mar 23 16:39:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 26 12:11:00 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd8ca2ea
cmake.eclass: Quote argument of ":" command
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Signed-off-by: Ulrich Müller gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 5f8fd04aaf..485ecbb7a9 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -35,15 +35,15 @@ inherit flag-o-matic multiprocessing ninja-utils
toolchain-funcs xdg-utils
# For in-source build it's fixed to ${CMAKE_USE_DIR}.
# For out-of-source build it can be overridden, by default it uses
# ${CMAKE_USE_DIR}_build (in EAPI-7: ${WORKDIR}/${P}_build).
-[[ ${EAPI} == 7 ]] && : ${BUILD_DIR:=${WORKDIR}/${P}_build}
+[[ ${EAPI} == 7 ]] && : "${BUILD_DIR:=${WORKDIR}/${P}_build}"
# EAPI-8: set inside _cmake_check_build_dir
# @ECLASS_VARIABLE: CMAKE_BINARY
# @DESCRIPTION:
# Eclass can use different cmake binary than the one provided in by system.
-: ${CMAKE_BINARY:=cmake}
+: "${CMAKE_BINARY:=cmake}"
-[[ ${EAPI} == 7 ]] && : ${CMAKE_BUILD_TYPE:=Gentoo}
+[[ ${EAPI} == 7 ]] && : "${CMAKE_BUILD_TYPE:=Gentoo}"
# @ECLASS_VARIABLE: CMAKE_BUILD_TYPE
# @DESCRIPTION:
# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
@@ -55,7 +55,7 @@ inherit flag-o-matic multiprocessing ninja-utils
toolchain-funcs xdg-utils
# build type to achieve desirable results.
#
# In EAPI 7, the default was non-standard build type of Gentoo.
-: ${CMAKE_BUILD_TYPE:=RelWithDebInfo}
+: "${CMAKE_BUILD_TYPE:=RelWithDebInfo}"
# @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD
# @DEFAULT_UNSET
@@ -69,7 +69,7 @@ inherit flag-o-matic multiprocessing ninja-utils
toolchain-funcs xdg-utils
# Specify a makefile generator to be used by cmake.
# At this point only "emake" and "ninja" are supported.
# The default is set to "ninja".
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+: "${CMAKE_MAKEFILE_GENERATOR:=ninja}"
# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST
# @PRE_INHERIT
@@ -100,14 +100,14 @@ fi
# @USER_VARIABLE
# @DESCRIPTION:
# Set to OFF to disable verbose messages during compilation
-: ${CMAKE_VERBOSE:=ON}
+: "${CMAKE_VERBOSE:=ON}"
# @ECLASS_VARIABLE: CMAKE_WARN_UNUSED_CLI
# @DESCRIPTION:
# Warn about variables that are declared on the command line
# but not used. Might give false-positives.
# "no" to disable (default) or anything else to enable.
-: ${CMAKE_WARN_UNUSED_CLI:=yes}
+: "${CMAKE_WARN_UNUSED_CLI:=yes}"
# @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE
# @USER_VARIABLE
@@ -290,15 +290,15 @@ cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
# Determine using IN or OUT source build
_cmake_check_build_dir() {
if [[ ${EAPI} == 7 ]]; then
- : ${CMAKE_USE_DIR:=${S}}
+ : "${CMAKE_USE_DIR:=${S}}"
else
- : ${CMAKE_USE_DIR:=${PWD}}
+ : "${CMAKE_USE_DIR:=${PWD}}"
fi
if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
# we build in source dir
BUILD_DIR="${CMAKE_USE_DIR}"
else
- : ${BUILD_DIR:=${CMAKE_USE_DIR}_build}
+ : "${BUILD_DIR:=${CMAKE_USE_DIR}_build}"
fi
einfo "Source directory (CMAKE_USE_DIR): \"${CMAKE_USE_DIR}\""
[gentoo-commits] proj/kde:master commit in: eclass/
commit: b47c6e219fe71ca3022f33e0cec4dfa59623f9cc
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Mar 23 16:39:40 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 26 12:11:00 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b47c6e21
kde.org.eclass: Quote argument of ":" command
This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
Signed-off-by: Ulrich Müller gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/kde.org.eclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 629c57d9a0..88040026ec 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -84,7 +84,7 @@ readonly KDE_ORG_CATEGORIES
# @DESCRIPTION:
# If unset, default value is mapped from ${CATEGORY} to corresponding upstream
# category on invent.kde.org, with "kde" as fallback value.
-: ${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}}
+: "${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}}"
# @ECLASS_VARIABLE: KDE_ORG_COMMIT
# @PRE_INHERIT
@@ -99,12 +99,12 @@ readonly KDE_ORG_CATEGORIES
# @DESCRIPTION:
# If unset, default value is set to ${PN}.
# Name of the package as hosted on kde.org mirrors.
-: ${KDE_ORG_NAME:=$PN}
+: "${KDE_ORG_NAME:=$PN}"
# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
# @DESCRIPTION:
# Known schedule URI of package or release group.
-: ${KDE_ORG_SCHEDULE_URI:="https://community.kde.org/Schedules"}
+: "${KDE_ORG_SCHEDULE_URI:="https://community.kde.org/Schedules"};
# @ECLASS_VARIABLE: KDE_SELINUX_MODULE
# @PRE_INHERIT
@@ -112,7 +112,7 @@ readonly KDE_ORG_CATEGORIES
# If set to "none", do nothing.
# For any other value, add selinux to IUSE, and depending on that useflag
# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
-: ${KDE_SELINUX_MODULE:=none}
+: "${KDE_SELINUX_MODULE:=none}"
case ${KDE_SELINUX_MODULE} in
none) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 9e36d762d679b8ce229fb15d8131234e0d3ec8f2
Author: Sam James gentoo org>
AuthorDate: Tue Jan 3 04:04:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 23 19:31:21 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9e36d762
cmake.eclass: mark CMAKE_VERBOSE as @USER_VARIABLE
It's a policy requirement that ebuilds produce verbose logs, so ebuilds
themselves
must not set CMAKE_VERBOSE. But users can.
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 3c432ceca8..4c9df47252 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -96,6 +96,7 @@ fi
# By default it uses current working directory (in EAPI-7: ${S}).
# @ECLASS_VARIABLE: CMAKE_VERBOSE
+# @USER_VARIABLE
# @DESCRIPTION:
# Set to OFF to disable verbose messages during compilation
: ${CMAKE_VERBOSE:=ON}
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 147f7e85a9722d6eb67a888210b03767b5a75f7f Author: Sam James gentoo org> AuthorDate: Tue Jan 3 04:06:11 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 23 19:31:21 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=147f7e85 cmake.eclass: add base-system as @MAINTAINER too (align with dev-util/cmake) Signed-off-by: Sam James gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/cmake.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 4c9df47252..28114eb76e 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -4,6 +4,7 @@ # @ECLASS: cmake.eclass # @MAINTAINER: # k...@gentoo.org +# base-sys...@gentoo.org # @AUTHOR: # Tomáš Chvátal # Maciej Mrozowski
[gentoo-commits] proj/kde:master commit in: eclass/
commit: fa01350086b8d254a03250c6ffab5f2ed4de93b3
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Feb 27 23:19:46 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 23 19:31:21 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fa013500
cmake.eclass: Set CMAKE_SYSROOT in toolchain file when necessary
We previously set CMAKE_FIND_ROOT_PATH, but CMAKE_SYSROOT also sets this
and more. The latter is needed when cross-compiling Fortran code such as
sci-libs/lapack. Without this, it uses the toolchain's default sysroot,
adds a -L/usr/${CHOST}/usr/lib flag based on that, reads the libc.so.6
ld script from this directory, does not apply any sysroot to the paths
within because the script is outside the sysroot, and finally fails when
attempting to link the host's libc.so.6.
Signed-off-by: James Le Cuirot gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b12b8ec8d6..1986e5cf08 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -502,7 +502,7 @@ cmake_src_configure() {
# When cross-compiling with a sysroot (e.g. with
crossdev's emerge wrappers)
# we need to tell cmake to use libs/headers from the
sysroot but programs from / only.
cat >> "${toolchain_file}" <<- _EOF_ || die
- set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
+ set(CMAKE_SYSROOT "${ESYSROOT}")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 03bf9f353b7014ff61ed61b381ab517b73a69608
Author: orbea riseup net>
AuthorDate: Fri Apr 9 18:43:53 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 23 19:31:21 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=03bf9f35
cmake.eclass: Support dev-util/samurai
samurai is a ninja-compatible build tool written in C which
works with cmake, meson and other users of ninja.
It is feature-complete and supports most of the same options
as ninja.
Signed-off-by: orbea riseup.net>
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 15 ++-
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 1986e5cf08..5f8fd04aaf 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -143,7 +143,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
BDEPEND="sys-devel/make"
;;
ninja)
- BDEPEND="dev-util/ninja"
+ BDEPEND="${NINJA_DEPEND}"
;;
*)
eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@@ -370,13 +370,6 @@ cmake_src_prepare() {
die "FATAL: Unable to find CMakeLists.txt"
fi
- # if ninja is enabled but not installed, the build could fail
- # this could happen if ninja is manually enabled (eg. make.conf) but
not installed
- if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]] && ! has_version -b
dev-util/ninja; then
- eerror "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is
not installed."
- die "Please install dev-util/ninja or unset
CMAKE_MAKEFILE_GENERATOR."
- fi
-
local modules_list
if [[ ${EAPI} == 7 && $(declare -p CMAKE_REMOVE_MODULES_LIST) !=
"declare -a"* ]]; then
modules_list=( ${CMAKE_REMOVE_MODULES_LIST} )
@@ -714,11 +707,7 @@ cmake_src_test() {
cmake_src_install() {
debug-print-function ${FUNCNAME} "$@"
- _cmake_check_build_dir
- pushd "${BUILD_DIR}" > /dev/null || die
- DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" ||
- die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
- popd > /dev/null || die
+ DESTDIR="${D}" cmake_build install "$@"
if [[ ${EAPI} == 7 ]]; then
pushd "${S}" > /dev/null || die
[gentoo-commits] proj/kde:master commit in: eclass/
commit: dfa1acfc797304d73d4014b0c2df7e849878c075
Author: David Seifert gentoo org>
AuthorDate: Fri Mar 17 22:04:31 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 23 19:31:21 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfa1acfc
eclass: standardize prologue/epilogue
Closes: https://github.com/gentoo/gentoo/pull/30061
Signed-off-by: David Seifert gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 2 +-
eclass/ecm.eclass | 2 +-
eclass/frameworks.kde.org.eclass| 2 +-
eclass/gear.kde.org.eclass | 2 +-
eclass/kde.org.eclass | 2 +-
eclass/plasma-mobile.kde.org.eclass | 2 +-
eclass/plasma.kde.org.eclass| 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 28114eb76e..b12b8ec8d6 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -20,7 +20,7 @@
case ${EAPI} in
7|8) ;;
- *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_CMAKE_ECLASS} ]]; then
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 25e8493ecc..5d4ec3c7f2 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -23,7 +23,7 @@
case ${EAPI} in
8) ;;
- *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_ECM_ECLASS} ]]; then
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index d0a3ce1e99..81ac235d01 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -19,7 +19,7 @@
case ${EAPI} in
8) ;;
- *) die "EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 0f6ffe67c5..5977c0f72e 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -19,7 +19,7 @@
case ${EAPI} in
8) ;;
- *) die "EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_GEAR_KDE_ORG_ECLASS} ]]; then
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 0fa9006ba2..629c57d9a0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -17,7 +17,7 @@
case ${EAPI} in
8) ;;
- *) die "EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_KDE_ORG_ECLASS} ]]; then
diff --git a/eclass/plasma-mobile.kde.org.eclass
b/eclass/plasma-mobile.kde.org.eclass
index a0436dbd97..1e2c5b6eb4 100644
--- a/eclass/plasma-mobile.kde.org.eclass
+++ b/eclass/plasma-mobile.kde.org.eclass
@@ -19,7 +19,7 @@
case ${EAPI} in
8) ;;
- *) die "EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_PLASMA_MOBILE_KDE_ORG_ECLASS} ]]; then
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index afdb95d694..8fcf087896 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -19,7 +19,7 @@
case ${EAPI} in
8) ;;
- *) die "EAPI=${EAPI:-0} is not supported" ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_PLASMA_KDE_ORG_ECLASS} ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 282dbd873deafc6f3c956294ba741e080dac8ea6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 6 00:23:26 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 22 18:54:40 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=282dbd87
cmake.eclass: Set Python3_FIND_UNVERSIONED_NAMES FIRST
See also:
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8287
Bug: https://bugs.gentoo.org/835799
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 9195f3b2d1..3c432ceca8 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -537,6 +537,7 @@ cmake_src_configure() {
set(CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE
FILEPATH "Gentoo override rules")
set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE
PATH "")
set(BUILD_SHARED_LIBS ON CACHE BOOL "")
+ set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "")
_EOF_
if [[ -n ${_ECM_ECLASS} ]]; then
[gentoo-commits] proj/kde:master commit in: eclass/
commit: f5d4c32b3895553e040dc0e4a195e3fe4f5bd300 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 14 17:22:45 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 14 17:22:45 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5d4c32b plasma.kde.org.eclass: Mark 5.27.3 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/plasma.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index efcf62bb0c..afdb95d694 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -29,7 +29,7 @@ _PLASMA_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.27.3 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 3302a8cd9758d7496e703401d13fc65b9fbdfba3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 14 14:46:01 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 14 14:47:18 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3302a8cd plasma.org.eclass: Mark 5.27.3 unreleased Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/plasma.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index afdb95d694..efcf62bb0c 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -29,7 +29,7 @@ _PLASMA_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( ) +KDE_PV_UNRELEASED=( 5.27.3 ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: c0dd647e38e739db4e4fa184f739e747892a915a
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Feb 27 18:28:52 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 12 20:55:11 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0dd647e
cmake.eclass: handle quoted whitespace in MYCMAKEARGS
This uses eval in a similar way to econf and meson.eclass.
Closes: https://github.com/gentoo/gentoo/pull/29839
Signed-off-by: Mike Gilbert gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 10aeef882f..9195f3b2d1 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -606,9 +606,9 @@ cmake_src_configure() {
-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
)
- if [[ -n ${MYCMAKEARGS} ]] ; then
- cmakeargs+=( "${MYCMAKEARGS}" )
- fi
+ # Handle quoted whitespace
+ eval "local -a MYCMAKEARGS=( ${MYCMAKEARGS} )"
+ cmakeargs+=( "${MYCMAKEARGS[@]}" )
if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 9d608eac695da285af3234855fd13e1585d49140 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 11 08:40:12 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 11 08:40:12 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d608eac frameworks.kde.org.eclass: Mark 5.104.0 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 13a487d17f..d0a3ce1e99 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.104.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: d501904a3990f07c2cbc759cd80fe5b7060d0cd3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 4 12:53:10 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 4 12:53:10 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d501904a frameworks.kde.org.eclass: Mark 5.104 unreleased Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index d0a3ce1e99..13a487d17f 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( ) +KDE_PV_UNRELEASED=( 5.104.0 ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 72c78dbe03c32ff2318e0f3f031d8d377913b3ec Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 2 12:58:02 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 2 12:59:46 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=72c78dbe gear.kde.org.eclass: Mark 22.12.3 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index e4ee6c8ee5..0f6ffe67c5 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 22.12.3 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 9204fa7c2d2d8cd3cce0a7d1ee3f67bb79fded4f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 28 09:59:20 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 28 10:30:57 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9204fa7c gear.kde.org.eclass: Mark KDE Gear 22.12.3 unreleased Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 0f6ffe67c5..e4ee6c8ee5 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( ) +KDE_PV_UNRELEASED=( 22.12.3 ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: bc0bd12be73d1d04b825eb2209f14cf943bb8369 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 13 10:51:10 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 13 10:51:10 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc0bd12b plasma.kde.org.eclass: Mark 5.27.0 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/plasma.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index 7e7d63588c..afdb95d694 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -29,7 +29,7 @@ _PLASMA_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.27.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: a431adae9763bde892fa3d4d0bb5122bb4d1dcdd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 12 11:21:20 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 12 11:21:20 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a431adae frameworks.kde.org.eclass: Mark 5.103 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/frameworks.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index cfff9ea0d6..d0a3ce1e99 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -29,7 +29,7 @@ _FRAMEWORKS_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 5.103.0 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 023b89d012d726e4fa9de9404e879d0485c5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 2 08:59:50 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 2 11:03:44 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=023b89d0 gear.kde.org.eclass: Mark 22.12.2 as released Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 318fcbe200..0f6ffe67c5 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -29,7 +29,7 @@ _GEAR_KDE_ORG_ECLASS=1 # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_PV_UNRELEASED=( 22.12.2 ) +KDE_PV_UNRELEASED=( ) inherit kde.org
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 7d6756c8422726fb75d2bdca762975e06561c54b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 24 22:10:49 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 29 17:00:35 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d6756c8
ecm.eclass: Drop Qt 5.15.7 from ECM_QTHELP Portage bug workaround
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 23 +++
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index fdcb92cf96..25e8493ecc 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -235,22 +235,13 @@ case ${ECM_QTHELP} in
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
else
- BDEPEND+=" doc? ( || (
- (
- =dev-qt/qtcore-5.15.8*:5
- =dev-qt/qtgui-5.15.8*:5
- =dev-qt/qthelp-5.15.8*:5
- =dev-qt/qtsql-5.15.8*:5
- =dev-qt/qtwidgets-5.15.8*:5
- )
- (
- =dev-qt/qtcore-5.15.7*:5
- =dev-qt/qtgui-5.15.7*:5
- =dev-qt/qthelp-5.15.7*:5
- =dev-qt/qtsql-5.15.7*:5
- =dev-qt/qtwidgets-5.15.7*:5
- )
- ) )"
+ BDEPEND+=" doc? (
+ =dev-qt/qtcore-5.15.8*:5
+ =dev-qt/qtgui-5.15.8*:5
+ =dev-qt/qthelp-5.15.8*:5
+ =dev-qt/qtsql-5.15.8*:5
+ =dev-qt/qtwidgets-5.15.8*:5
+ )"
fi
;;
false) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 7c3f269a9edc5b9ee2f4175175cf4c8c040b60a7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jan 9 09:11:17 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jan 9 09:36:16 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c3f269a
ecm.eclass: Add Qt 5.15.8 to ECM_QTHELP Portage bug workaround
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 32eea1373b..fdcb92cf96 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -235,13 +235,22 @@ case ${ECM_QTHELP} in
if [[ ${_KFSLOT} == 6 ]]; then
BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
else
- BDEPEND+=" doc? (
- =dev-qt/qtcore-5.15.7*:5
- =dev-qt/qtgui-5.15.7*:5
- =dev-qt/qthelp-5.15.7*:5
- =dev-qt/qtsql-5.15.7*:5
- =dev-qt/qtwidgets-5.15.7*:5
- )"
+ BDEPEND+=" doc? ( || (
+ (
+ =dev-qt/qtcore-5.15.8*:5
+ =dev-qt/qtgui-5.15.8*:5
+ =dev-qt/qthelp-5.15.8*:5
+ =dev-qt/qtsql-5.15.8*:5
+ =dev-qt/qtwidgets-5.15.8*:5
+ )
+ (
+ =dev-qt/qtcore-5.15.7*:5
+ =dev-qt/qtgui-5.15.7*:5
+ =dev-qt/qthelp-5.15.7*:5
+ =dev-qt/qtsql-5.15.7*:5
+ =dev-qt/qtwidgets-5.15.7*:5
+ )
+ ) )"
fi
;;
false) ;;
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 05676f41c8ad85cb5c3fe14a2300d9ec561af8f6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 26 10:22:14 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 26 10:22:14 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=05676f41
kde.org.eclass: Drop EAPI-7 support
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/kde.org.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index a39e205d0e..efe3186f28 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -4,7 +4,7 @@
# @ECLASS: kde.org.eclass
# @MAINTAINER:
# k...@gentoo.org
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
# @BLURB: Support eclass for packages that are hosted on kde.org
infrastructure.
# @DESCRIPTION:
# This eclass is mainly providing facilities for the three upstream release
@@ -16,7 +16,7 @@
# particular build system.
case ${EAPI} in
- 7|8) ;;
+ 8) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 5ecdb90c0fe91d0724bb5947f9f16b81f41f23b6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 26 10:21:04 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 26 10:21:04 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ecdb90c
ecm.eclass: Drop EAPI-7 support
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 32 +---
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 1827f07b1d..c388e397da 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -4,7 +4,7 @@
# @ECLASS: ecm.eclass
# @MAINTAINER:
# k...@gentoo.org
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
# @PROVIDES: cmake virtualx
# @BLURB: Support eclass for packages that use KDE Frameworks with ECM.
# @DESCRIPTION:
@@ -22,7 +22,7 @@
# any phase functions are overridden the version here should also be called.
case ${EAPI} in
- 7|8) ;;
+ 8) ;;
*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
esac
@@ -143,9 +143,9 @@ fi
# @DEFAULT_UNSET
# @DESCRIPTION:
# Minimum version of Frameworks to require. Default value for kde-frameworks
-# is ${PV} and 5.64.0 baseline for everything else. This is not going to be
+# is ${PV} and 5.82.0 baseline for everything else. This is not going to be
# changed unless we also bump EAPI, which usually implies (rev-)bumping.
-# Version will later be used to differentiate between KF5/Qt5 and KF6/Qt6.
+# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6.
if [[ ${CATEGORY} = kde-frameworks ]]; then
: ${KFMIN:=$(ver_cut 1-2)}
fi
@@ -630,16 +630,14 @@ ecm_src_install() {
cmake_src_install
# bug 621970
- if [[ ${EAPI} != 7 ]]; then
- if [[ -d "${ED}"/usr/share/applications ]]; then
- local f
- for f in "${ED}"/usr/share/applications/*.desktop; do
- if [[ -x ${f} ]]; then
- einfo "Removing executable bit from
${f#${ED}}"
- fperms a-x "${f#${ED}}"
- fi
- done
- fi
+ if [[ -d "${ED}"/usr/share/applications ]]; then
+ local f
+ for f in "${ED}"/usr/share/applications/*.desktop; do
+ if [[ -x ${f} ]]; then
+ einfo "Removing executable bit from ${f#${ED}}"
+ fperms a-x "${f#${ED}}"
+ fi
+ done
fi
}
@@ -691,8 +689,4 @@ if [[ -v ${KDE_GCC_MINIMAL} ]]; then
EXPORT_FUNCTIONS pkg_pretend
fi
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst
pkg_postinst pkg_postrm
-
-if [[ ${EAPI} != 7 ]]; then
- EXPORT_FUNCTIONS src_install
-fi
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test src_install
pkg_preinst pkg_postinst pkg_postrm
[gentoo-commits] proj/kde:master commit in: eclass/
commit: b9789e26a686553a61a2a6e6b7b050e973f2defe
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 24 23:34:27 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 24 23:35:32 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9789e26
plasma-mobile.kde.org.eclass: Drop bogus SLOT def
It should not be here.
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma-mobile.kde.org.eclass | 3 ---
1 file changed, 3 deletions(-)
diff --git a/eclass/plasma-mobile.kde.org.eclass
b/eclass/plasma-mobile.kde.org.eclass
index fcec3e4b39..73cb98a3c1 100644
--- a/eclass/plasma-mobile.kde.org.eclass
+++ b/eclass/plasma-mobile.kde.org.eclass
@@ -35,9 +35,6 @@ inherit kde.org
HOMEPAGE="https://plasma-mobile.org/;
-SLOT=5/${PV}
-[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
-
# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
# @INTERNAL
# @DESCRIPTION:
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 36e93c4b391449c27dfe3974ff26f057ca5b3c9e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 24 23:33:01 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 24 23:35:26 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=36e93c4b
plasma-mobile.kde.org.eclass: Fix SRC_URI versioned tarball subdir
Thanks-to: Jesús P Rey (Chuso) chuso.net>
Bug: https://bugs.gentoo.org/887235
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/plasma-mobile.kde.org.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/plasma-mobile.kde.org.eclass
b/eclass/plasma-mobile.kde.org.eclass
index 91397cd1c0..fcec3e4b39 100644
--- a/eclass/plasma-mobile.kde.org.eclass
+++ b/eclass/plasma-mobile.kde.org.eclass
@@ -45,7 +45,7 @@ SLOT=5/${PV}
KDE_ORG_SCHEDULE_URI="https://invent.kde.org/plasma/plasma-mobile/-/wikis/Release-Schedule;
if [[ ${KDE_BUILD_TYPE} != live && -z ${KDE_ORG_COMMIT} ]]; then
-
SRC_URI="mirror://kde/stable/plasma-mobile/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
+ SRC_URI="mirror://kde/stable/plasma-mobile/$(ver_cut
1-2)/${KDE_ORG_NAME}-${PV}.tar.xz"
fi
fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: cafeb032b276db836c7ca1b53c05f6d9748d1bbb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 11 17:57:31 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 11 21:24:24 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cafeb032
frameworks.kde.org.eclass: Support KF6, don't change KF5 live slot
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/frameworks.kde.org.eclass | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 876c05c9b6..d4dff92c04 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -35,8 +35,15 @@ inherit kde.org
HOMEPAGE="https://develop.kde.org/products/frameworks/;
-SLOT=5/${PV}
-[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+_SLOT=6
+_SUBSLOT=${PV}
+[[ ${KDE_BUILD_TYPE} == release ]] && _SUBSLOT=$(ver_cut 1-2)
+if [[ ${PV/.*} == 5 ]]; then
+ _SLOT=5
+ [[ ${KDE_BUILD_TYPE} == live ]] && _SUBSLOT=
+fi
+SLOT=${_SLOT}/${_SUBSLOT}
+unset _SLOT _SUBSLOT
# @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
# @INTERNAL
[gentoo-commits] proj/kde:master commit in: eclass/
commit: cbe952b4c0118d5d180810e3c16031f895f06428
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 11 18:50:30 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 11 21:24:24 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbe952b4
ecm.eclass: Initial support for Qt6-based consumers
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/ecm.eclass | 41 -
1 file changed, 28 insertions(+), 13 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 61d41d43ee..1827f07b1d 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -151,11 +151,12 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
fi
: ${KFMIN:=5.82.0}
-# @ECLASS_VARIABLE: KFSLOT
+# @ECLASS_VARIABLE: _KFSLOT
# @INTERNAL
# @DESCRIPTION:
# KDE Frameworks and Qt slot dependency, implied by KFMIN version.
-: ${KFSLOT:=5}
+: ${_KFSLOT:=5}
+[[ ${KFMIN/.*} == 6 ]] && _KFSLOT=6
case ${ECM_NONGUI} in
true) ;;
@@ -186,7 +187,11 @@ esac
case ${ECM_DESIGNERPLUGIN} in
true)
IUSE+=" designer"
- BDEPEND+=" designer? ( dev-qt/designer:${KFSLOT} )"
+ if [[ ${_KFSLOT} == 6 ]]; then
+ BDEPEND+=" designer? (
dev-qt/qttools:${_KFSLOT}[designer] )"
+ else
+ BDEPEND+=" designer? ( dev-qt/designer:${_KFSLOT} )"
+ fi
;;
false) ;;
*)
@@ -209,7 +214,7 @@ esac
case ${ECM_HANDBOOK} in
true|optional|forceoptional)
IUSE+=" +handbook"
- BDEPEND+=" handbook? (
>=kde-frameworks/kdoctools-${KFMIN}:${KFSLOT} )"
+ BDEPEND+=" handbook? (
>=kde-frameworks/kdoctools-${KFMIN}:${_KFSLOT} )"
;;
false) ;;
*)
@@ -225,17 +230,19 @@ esac
case ${ECM_QTHELP} in
true)
IUSE+=" doc"
- COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )"
- BDEPEND+=" doc? (
- >=app-doc/doxygen-1.8.13-r1
- (
+ COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${_KFSLOT} )"
+ BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 )"
+ if [[ ${_KFSLOT} == 6 ]]; then
+ BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
+ else
+ BDEPEND+=" doc? (
=dev-qt/qtcore-5.15.7*:5
=dev-qt/qtgui-5.15.7*:5
=dev-qt/qthelp-5.15.7*:5
=dev-qt/qtsql-5.15.7*:5
=dev-qt/qtwidgets-5.15.7*:5
- )
- )"
+ )"
+ fi
;;
false) ;;
*)
@@ -247,7 +254,11 @@ esac
case ${ECM_TEST} in
true|optional|forceoptional|forceoptional-recursive)
IUSE+=" test"
- DEPEND+=" test? ( dev-qt/qttest:${KFSLOT} )"
+ if [[ ${_KFSLOT} == 6 ]]; then
+ DEPEND+=" test? ( dev-qt/qtbase:${_KFSLOT}[test] )"
+ else
+ DEPEND+=" test? ( dev-qt/qttest:${_KFSLOT} )"
+ fi
RESTRICT+=" !test? ( test )"
;;
false) ;;
@@ -258,11 +269,15 @@ case ${ECM_TEST} in
esac
BDEPEND+="
- >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}
+ >=kde-frameworks/extra-cmake-modules-${KFMIN}:${_KFSLOT}
dev-libs/libpcre2:*
"
RDEPEND+=" >=kde-frameworks/kf-env-4"
-COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
+if [[ ${_KFSLOT} == 6 ]]; then
+ COMMONDEPEND+=" dev-qt/qtbase:${_KFSLOT}"
+else
+ COMMONDEPEND+=" dev-qt/qtcore:${_KFSLOT}"
+fi
DEPEND+=" ${COMMONDEPEND}"
RDEPEND+=" ${COMMONDEPEND}"
[gentoo-commits] proj/kde:master commit in: eclass/
commit: cda3419752edab5d177b2e740df8731f363fbf72
Author: Sam James gentoo org>
AuthorDate: Sat Dec 10 01:39:38 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 11 15:50:43 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cda34197
cmake.eclass: drop use_enable reference in @DESCRIPTION
This is from cmake-utils.eclass and the use_enable-style functions
it refers to are long-banned.
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 98538f783a..a50a8bf7f8 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -15,8 +15,7 @@
# @DESCRIPTION:
# The cmake eclass makes creating ebuilds for cmake-based packages much easier.
# It provides all inherited features (DOCS, HTML_DOCS, PATCHES) along with
-# out-of-source builds (default), in-source builds and an implementation of the
-# well-known use_enable function for CMake.
+# out-of-source builds (default) and in-source builds.
case ${EAPI} in
7|8) ;;
