[gentoo-commits] proj/kde:master commit in: eclass/

[gentoo-commits] proj/kde:master commit in: eclass/

[Jorge Manuel B. S. Vicetto]

commit:     1c8d9dcaf2c789e2fde461d8e2d1c6af8be37d36
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 02:54:48 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 02:54:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1c8d9dca

Add an if block to allow the use of xz tarballs. We really, *really* need to rewrite the unpack code.

---
 eclass/kde4-meta.eclass |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 16d61e5..112c908 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -210,8 +210,13 @@ kde4-meta_src_extract() {
 	else
 		local abort tarball tarfile f extractlist postfix
 
-		KMTARPARAMS+=" --bzip2"
-		postfix="bz2"
+		if [[ ${PV} == 4.8.1 ]]; then
+			postfix="xz"
+			KMTARPARAMS+=" --xz"
+		else
+			postfix="bz2"
+			KMTARPARAMS+=" --bzip2"
+		fi
 
 		case ${KMNAME} in
 			kdebase-apps)

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     fc3d4ec6bb78d21165e2e149421d5a7fd689e021
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 28 15:36:43 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 15:03:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc3d4ec6

[eclass] Let 9999 ebuilds depend on >=5.9999

Fixes bug 553492

 eclass/kde5-functions.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7756fbf..fd98bb7 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -188,7 +188,11 @@ add_kdeapps_dep() {
 		version=${PV}
 	elif [[ -z "${version}" ]] ; then
 		# In KDE applications world, 5.9999 > yy.mm.x
-		[[ ${PV} = 5.9999 ]] && version=5.9999 || version=${KDE_APPS_MINIMAL}
+		if [[ ${PV} = 5.9999 || ${PV} = 9999 ]]; then
+			version=5.9999
+		else
+			version=${KDE_APPS_MINIMAL}
+		fi
 	fi
 
 	_add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     b67c8ac5ebf4579d43946a27441523d361dea878
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 28 15:35:32 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 15:03:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b67c8ac5

[eclass] Fix minimum dependencies after kde-apps pkgmove

 eclass/kde4-functions.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 2a4c206..989eeb9 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -296,10 +296,10 @@ add_kdeapps_dep() {
 	# to allow merging packages against more stable basic stuff
 	elif [[ ${PV} == *.9999 ]]; then
 		ver=$(get_kde_version)
-	# if building live master depend on final stable applications version
-	# as live KDE4 ebuilds are slowly being shown the door
-	elif [[ ${CATEGORY} == kde-apps && ${PV} == 9999 ]]; then
-		ver=14.12.3
+	# if building live master or kde-apps, use the final SC version
+	# since there are no further general releases.
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then
+		ver=4.14.3
 	else
 		ver=${PV}
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Hüttel]

commit:     495e840be50677c74f7b67e315cf3701e472567a
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 08:51:28 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 08:51:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=495e840b

[eclass] prepare eclasses for no-akonadi branch

 eclass/kde4-base.eclass | 4 ++++
 eclass/kde4-meta.eclass | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 1915b6d..f46f2c4 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -430,6 +430,10 @@ _calculate_src_uri() {
 					# KDEPIM 4.4, special case
 					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
 					SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
+				4.4.20*)
+					# KDEPIM 4.4 no-akonadi branch, special case
+					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
+					SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz" ;;
 				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index abc4d02..d22992c 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -182,7 +182,7 @@ kde4-meta_src_extract() {
 	else
 		local abort tarball tarfile f extractlist postfix
 
-		if [[ ${PV} =~ 4.[47].[12345] ]]; then
+		if [[ ${PV} =~ '4\.4\.[12].*' ]]; then
 			postfix="bz2"
 			KMTARPARAMS+=" --bzip2"
 		else

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     804d1f7483bc42bd34f1f9208b275f753bce403e
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 15:54:12 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 15:54:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=804d1f74

[eclass] Add SRC_URIs for KDE SC 4.14.10 / Workspaces 4.11.21.

 eclass/kde4-base.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index f46f2c4..c00c402 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -452,6 +452,9 @@ _calculate_src_uri() {
 				4.11.20)
 					# Part of 15.04.2 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz" ;;
+				4.11.21)
+					# Part of 15.04.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				4.14.3)
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
@@ -467,6 +470,9 @@ _calculate_src_uri() {
 				4.14.9)
 					# Part of 15.04.2 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz" ;;
+				4.14.10)
+					# Part of 15.04.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4836c1895eeb71767090176618f49a282900c71a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 15:46:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 15:46:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4836c189

[eclass] Add missing USE dependency default wrt bug #554056.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bbcd156..9983db2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -136,7 +136,7 @@ case ${KDE_AUTODEPS} in
 
 		if [[ ${CATEGORY} = kde-plasma ]]; then
 			RDEPEND+="
-				!kde-apps/kde4-l10n[-minimal]
+				!kde-apps/kde4-l10n[-minimal(-)]
 				!kde-base/kde-l10n:4[-minimal(-)]
 			"
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     90325250d4ab97a774f2316fb4842ba8dbf40c29
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 15:50:58 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 15:50:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=90325250

[eclass] Remove blocker on pkgmoved package.

 eclass/kde5.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9983db2..d54badd 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,6 @@ case ${KDE_AUTODEPS} in
 		if [[ ${CATEGORY} = kde-plasma ]]; then
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
-				!kde-base/kde-l10n:4[-minimal(-)]
 			"
 		fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     d84a719bf80664380e35a47abd0683463c5f1bc7
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul  5 19:57:30 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 22:36:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d84a719b

[eclass] Add KDE_DOC_DIR variable

Defaults to "doc". Otherwise, use alternative KDE handbook path.

 eclass/kde5.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d54badd..43fb4b1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -77,6 +77,11 @@ fi
 # generate and install KDE handbook.
 : ${KDE_HANDBOOK:=false}
 
+# @ECLASS-VARIABLE: KDE_DOC_DIR
+# @DESCRIPTION:
+# Defaults to "doc". Otherwise, use alternative KDE handbook path.
+: ${KDE_DOC_DIR:=doc}
+
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -366,7 +371,7 @@ kde5_src_prepare() {
 
 	# only enable handbook when required
 	if ! use_if_iuse handbook ; then
-		comment_add_subdirectory doc
+		comment_add_subdirectory ${KDE_DOC_DIR}
 	fi
 
 	# enable only the requested translations
@@ -388,7 +393,7 @@ kde5_src_prepare() {
 		fi
 
 		if [[ ${KDE_HANDBOOK} = true ]] ; then
-			pushd doc > /dev/null
+			pushd ${KDE_DOC_DIR} > /dev/null
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					comment_add_subdirectory ${lang}

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     37578c8f35d7cb52e4a0d0d8b7e2cb24668c32eb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 10:50:01 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 10:50:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=37578c8f

[eclass] Cleanup SRC_URIs

 eclass/kde4-base.eclass | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c00c402..b0fe4a4 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -440,36 +440,18 @@ _calculate_src_uri() {
 				4.11.14)
 					# Part of 4.14 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;;
-				4.11.17)
-					# Part of 14.12.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz" ;;
-				4.11.18)
-					# Part of 15.04.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.0/src/${_kmname_pv}.tar.xz" ;;
 				4.11.19)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
-				4.11.20)
-					# Part of 15.04.2 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz" ;;
 				4.11.21)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				4.14.3)
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.14.6)
-					# Part of 14.12.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.7)
-					# Part of 15.04.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.8)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
-				4.14.9)
-					# Part of 15.04.2 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz" ;;
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     84b9dab08e9db4f4a20769e11b10215cffd1765e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jul 22 11:52:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 12:36:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=84b9dab0

[eclass] Fix oldpim bug 555566

 eclass/kde4-meta.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index d22992c..fa9c8d0 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -182,7 +182,7 @@ kde4-meta_src_extract() {
 	else
 		local abort tarball tarfile f extractlist postfix
 
-		if [[ ${PV} =~ '4\.4\.[12].*' ]]; then
+		if [[ ${PV} =~ 4.4.11 ]]; then
 			postfix="bz2"
 			KMTARPARAMS+=" --bzip2"
 		else

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     523575023973ab92a14fdc9266bbfdc68f7dfb92
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 24 22:12:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 15:51:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=52357502

[eclass] Treat stable-live the same as live

 eclass/kde4-functions.eclass | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 989eeb9..d480bcb 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -292,13 +292,9 @@ add_kdeapps_dep() {
 		ver=${KDE_OVERRIDE_MINIMAL}
 	elif [[ ${KDEBASE} != kde-base ]]; then
 		ver=${KDE_MINIMAL}
-	# if building stable-live version depend just on the raw KDE version
-	# to allow merging packages against more stable basic stuff
-	elif [[ ${PV} == *.9999 ]]; then
-		ver=$(get_kde_version)
-	# if building live master or kde-apps, use the final SC version
-	# since there are no further general releases.
-	elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then
+	# if building kde-apps, live master or stable-live branch,
+	# use the final SC version since there are no further general releases.
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
 		ver=4.14.3
 	else
 		ver=${PV}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     86191949c3f84b8f54d7b5b50fa2e681a4b4faac
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 24 22:24:37 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 15:51:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=86191949

[eclass] Actually pull from stable branch

 eclass/kde5.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 43fb4b1..1e39060 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -306,6 +306,10 @@ _calculate_live_repo() {
 				_kmname=${PN}
 			fi
 
+			if [[ ${PV} != 9999 && ${CATEGORY} = kde-apps ]]; then
+				EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
+			fi
+
 			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
 				EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)"
 			fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     85372bc86d8c515e4521d79ee5bf9d03dbf7f973
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 24 22:56:19 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jul 24 23:17:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=85372bc8

[eclass] Avoid confusion over system configuration

E.g. https://forums.gentoo.org/viewtopic-p-7786236.html#7786236

 eclass/kde4-base.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b0fe4a4..d715c89 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -894,12 +894,10 @@ kde4-base_pkg_postinst() {
 		fi
 		# for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta
 		if [[ ${KDEBASE} != kde-base ]] && \
-				! has_version 'kde-apps/kdebase-runtime-meta' && \
-				! has_version 'kde-base/kdebase-startkde'; then
+				! has_version 'kde-apps/kdebase-runtime-meta'; then
 			if [[ ${KDE_REQUIRED} == always ]] || ( [[ ${KDE_REQUIRED} == optional ]] && use kde ); then
 				echo
-				ewarn "WARNING! Your system configuration contains neither \"kde-base/kdebase-runtime-meta\""
-				ewarn "nor \"kde-base/kdebase-startkde\". You need one of above."
+				ewarn "WARNING! Your system configuration does not contain \"kde-apps/kdebase-runtime-meta\"."
 				ewarn "With this setting you are unsupported by KDE team."
 				ewarn "All missing features you report for misc packages will be probably ignored or closed as INVALID."
 			fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     8534e956d4b643c10f81afb2c5a1f8569bd2eec6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 11:20:38 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 11:20:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8534e956

[eclass] Fix Applications branch calculation

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1e39060..9698ef9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -306,7 +306,7 @@ _calculate_live_repo() {
 				_kmname=${PN}
 			fi
 
-			if [[ ${PV} != 9999 && ${CATEGORY} = kde-apps ]]; then
+			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
 				EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
 			fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     3dd1550fd37950fe0fb98753289d2684d907acad
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 20:55:31 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 21:36:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3dd1550f

[eclass] Fix KDE_SCM=svn

 eclass/kde4-base.eclass |  5 +++++
 eclass/kde5.eclass      | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d715c89..26c54c9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -489,6 +489,11 @@ _calculate_live_repo() {
 				*)
 					# branch
 					branch_prefix="branches/KDE/$(get_kde_version)"
+
+					if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+						branch_prefix="branches/Applications/$(get_kde_version)"
+					fi
+
 					# @ECLASS-VARIABLE: ESVN_PROJECT_SUFFIX
 					# @DESCRIPTION
 					# Suffix appended to ESVN_PROJECT depending on fetched branch.

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9698ef9..affd1c6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -276,13 +276,25 @@ _calculate_live_repo() {
 			# (anonsvn) with anything else you might want to use.
 			ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
 
-			local branch_prefix="KDE"
+			local branch_prefix="trunk/KDE"
+
+			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+				branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
+			fi
+
+			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+				branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
+			fi
+
+			local _kmname
 
 			if [[ -n ${KMNAME} ]]; then
-				branch_prefix="${KMNAME}"
+				_kmname=${KMNAME}
+			else
+				_kmname=${PN}
 			fi
 
-			ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${branch_prefix}/${PN}"
+			ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
 			;;
 		git)
 			# @ECLASS-VARIABLE: EGIT_MIRROR

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     258ab129b4696d32c3aff66da727625fe1fbce46
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 13:21:13 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 13:21:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=258ab129

[eclass] Raise minimum versions

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index fd98bb7..aa48748 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,12 +26,12 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.11.0}
+: ${FRAMEWORKS_MINIMAL:=5.12.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.3.1}
+: ${PLASMA_MINIMAL:=5.3.2}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     788e9a06f693cf3475944eaf760be8ae9eb46382
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 13:58:56 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 13:58:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=788e9a06

[eclass] Do not compress handbooks.

Otherwise, khelpcenter can't find them.

 eclass/kde5.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index affd1c6..3db6402 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -533,6 +533,12 @@ kde5_src_install() {
 	fi
 
 	cmake-utils_src_install
+
+	# We don't want ${PREFIX}/share/doc/HTML to be compressed,
+	# because then khelpcenter can't find the docs
+	if [[ -d ${ED}/${PREFIX}/share/doc/HTML ]]; then
+		docompress -x ${PREFIX}/share/doc/HTML
+	fi
 }
 
 # @FUNCTION: kde5_pkg_preinst

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     772c995cdb5429fee1395dc11189e8b872d2472c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug 12 20:15:08 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 12:34:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=772c995c

kde5.eclass: Fix release version handbook bug 557390

Do not accidentally comment any directory if KDE_DOC_DIR not exists

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e4bc5ed..78be3d8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -408,7 +408,7 @@ kde5_src_prepare() {
 			popd > /dev/null
 		fi
 
-		if [[ ${KDE_HANDBOOK} = true ]] ; then
+		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} ]] ; then
 			pushd ${KDE_DOC_DIR} > /dev/null
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     14d561bc5f6cc7d635222822d6225687b4b0fa5c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 12:09:46 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 12:09:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14d561bc

kde5-functions.eclass: Raise Frameworks version

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 59e2266..e19d7fd 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.12.0}
+: ${FRAMEWORKS_MINIMAL:=5.13.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     0e87cc3c8e83cbdc20074166277a568884a12054
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 22:51:01 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 22:51:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e87cc3c

kde4-base.eclass: Update SRC_URIs

 eclass/kde4-base.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index aab5791..8a81c55 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -446,6 +446,9 @@ _calculate_src_uri() {
 				4.11.21)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
+				4.11.22)
+					# Part of 15.08.0 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.3)
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
@@ -455,6 +458,9 @@ _calculate_src_uri() {
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
+				4.14.11)
+					# Part of 15.08.0 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b83ced604cbe012a4ca09ad4cd5d5214a0327b5c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 14:09:49 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 14:11:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b83ced60

kde5.eclass: implement ridiculous pkg_nofetch because there are no limits to what people will ignore.

Based on Manuel Rüger's <mrueg <AT> gentoo.org> idea from 603f50e1bacae45e1a24452e07d1381e2ea0c786.

 eclass/kde5.eclass | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 78be3d8..950f53f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -28,7 +28,7 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	esac
 fi
 
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
@@ -106,6 +106,14 @@ fi
 # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
 : ${KDE_SELINUX_MODULE:=none}
 
+# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @INTERNAL
+# @DESCRIPTION
+# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
+# Any package matching this will have fetch restriction enabled, and receive
+# a proper error message via pkg_nofetch.
+KDE_UNRELEASED=( kde-apps-15.08.0 )
+
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="http://www.kdevelop.org/"
 else
@@ -260,6 +268,13 @@ _calculate_src_uri() {
 			esac
 			;;
 	esac
+
+	local pair
+	for pair in "${KDE_UNRELEASED[@]}" ; do
+		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+			RESTRICT+=" fetch"
+		fi
+	done
 }
 
 # Determine fetch location for live sources
@@ -354,6 +369,33 @@ kde5_pkg_setup() {
 	_check_gcc_version
 }
 
+# @FUNCTION: kde5_pkg_nofetch
+# @DESCRIPTION:
+# Display package publication status
+kde5_pkg_nofetch() {
+	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
+	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
+	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"
+	eerror "| |_| | |\  |  _ <| |___| |___| |___ / ___ \ ___) | |___| |_| |"
+	eerror " \___/|_| \_|_| \_\_____|_____|_____/_/   \_\____/|_____|____/ "
+	eerror "                                                               "
+	eerror " ____   _    ____ _  __    _    ____ _____ "
+	eerror "|  _ \ / \  / ___| |/ /   / \  / ___| ____|"
+	eerror "| |_) / _ \| |   | ' /   / _ \| |  _|  _|  "
+	eerror "|  __/ ___ \ |___| . \  / ___ \ |_| | |___ "
+	eerror "|_| /_/   \_\____|_|\_\/_/   \_\____|_____|"
+	eerror
+	eerror "${CATEGORY}/${P} has not been released to the public yet"
+	eerror "and is only available to packagers right now."
+	eerror ""
+	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
+	eerror ""
+	eerror "Please consult the upstream release schedule to see when this "
+	eerror "package is scheduled to be released:"
+	eerror "https://techbase.kde.org/Schedules"
+}
+
+
 # @FUNCTION: kde5_src_unpack
 # @DESCRIPTION:
 # Function for unpacking KDE 5.

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     3d6388d3346df7073427584ed38f358dc0d35ac2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 14:33:05 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 14:33:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d6388d3

kde4-base.eclass: backport pkg_nofetch from kde5.eclass

 eclass/kde4-base.eclass | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8a81c55..9193674 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -102,7 +102,7 @@ esac
 
 inherit ${buildsystem_eclass}
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare ${export_fns} pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare ${export_fns} pkg_preinst pkg_postinst pkg_postrm
 
 unset buildsystem_eclass
 unset export_fns
@@ -165,6 +165,14 @@ if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
 	KDE_LINGUAS=""
 fi
 
+# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @INTERNAL
+# @DESCRIPTION
+# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
+# Any package matching this will have fetch restriction enabled, and receive
+# a proper error message via pkg_nofetch.
+KDE_UNRELEASED=( kde-apps-15.08.0 )
+
 # Setup packages inheriting this eclass
 case ${KDEBASE} in
 	kde-base)
@@ -477,6 +485,13 @@ _calculate_src_uri() {
 			esac
 			;;
 	esac
+
+	local pair
+	for pair in "${KDE_UNRELEASED[@]}" ; do
+		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+			RESTRICT+=" fetch"
+		fi
+	done
 }
 
 _calculate_live_repo() {
@@ -644,6 +659,32 @@ kde4-base_pkg_setup() {
 	export XDG_CONFIG_HOME="${T}"
 }
 
+# @FUNCTION: kde4-base_pkg_nofetch
+# @DESCRIPTION:
+# Display package publication status
+kde4-base_pkg_nofetch() {
+	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
+	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
+	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"
+	eerror "| |_| | |\  |  _ <| |___| |___| |___ / ___ \ ___) | |___| |_| |"
+	eerror " \___/|_| \_|_| \_\_____|_____|_____/_/   \_\____/|_____|____/ "
+	eerror "                                                               "
+	eerror " ____   _    ____ _  __    _    ____ _____ "
+	eerror "|  _ \ / \  / ___| |/ /   / \  / ___| ____|"
+	eerror "| |_) / _ \| |   | ' /   / _ \| |  _|  _|  "
+	eerror "|  __/ ___ \ |___| . \  / ___ \ |_| | |___ "
+	eerror "|_| /_/   \_\____|_|\_\/_/   \_\____|_____|"
+	eerror
+	eerror "${CATEGORY}/${P} has not been released to the public yet"
+	eerror "and is only available to packagers right now."
+	eerror ""
+	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
+	eerror ""
+	eerror "Please consult the upstream release schedule to see when this "
+	eerror "package is scheduled to be released:"
+	eerror "https://techbase.kde.org/Schedules"
+}
+
 # @FUNCTION: kde4-base_src_unpack
 # @DESCRIPTION:
 # This function unpacks the source tarballs for KDE4 applications.

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d3291e75a84b9fd3af0ef8d34639d88ce33b8150
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 14:33:23 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 14:33:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3291e75

kde5.eclass: whitespace

 eclass/kde5.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 950f53f..6b600ad 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -395,7 +395,6 @@ kde5_pkg_nofetch() {
 	eerror "https://techbase.kde.org/Schedules"
 }
 
-
 # @FUNCTION: kde5_src_unpack
 # @DESCRIPTION:
 # Function for unpacking KDE 5.

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     7ef296d72bdb000ac53bcba9f9cb90b0b1815075
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 14:53:05 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 14:53:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ef296d7

kde4-base.eclass: Update KDE_UNRELEASED

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 9193674..ad00d03 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -171,7 +171,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-15.08.0 )
+KDE_UNRELEASED=( kde-apps-15.08.0 kde-base-4.11.22 kde-base-4.14.11 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7a8f59b12c15afd21948266c802c6ac68a8b63a4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 17:36:11 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 17:36:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a8f59b1

kde4-base.eclass: kde-apps-15.08.0 and related are released

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ad00d03..8cc21c9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -171,7 +171,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-15.08.0 kde-base-4.11.22 kde-base-4.14.11 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     9cc239ccce96c06a888821bca4105039142ab866
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 17:35:15 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 17:36:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9cc239cc

kde5.eclass: kde-apps-15.08.0 is released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6b600ad..1b3b84c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-15.08.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="http://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d3907fc5eaed884dfaf67ef8a6c0bab0c66bb080
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 18:11:58 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 18:12:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3907fc5

eclass: don't warn on regular fetch failure

pkg_nofetch is called if fetch fails for any reason, not just if the package is fetch-restricted.

 eclass/kde5.eclass | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1b3b84c..94bacf9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -216,6 +216,17 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
+_kde_is_unreleased() {
+	local pair
+	for pair in "${KDE_UNRELEASED[@]}" ; do
+		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
 # Determine fetch location for released tarballs
 _calculate_src_uri() {
 	debug-print-function ${FUNCNAME} "$@"
@@ -269,12 +280,9 @@ _calculate_src_uri() {
 			;;
 	esac
 
-	local pair
-	for pair in "${KDE_UNRELEASED[@]}" ; do
-		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
-			RESTRICT+=" fetch"
-		fi
-	done
+	if _kde_is_unreleased ; then
+		RESTRICT+=" fetch"
+	fi
 }
 
 # Determine fetch location for live sources
@@ -373,6 +381,10 @@ kde5_pkg_setup() {
 # @DESCRIPTION:
 # Display package publication status
 kde5_pkg_nofetch() {
+	if ! _kde_is_unreleased ; then
+		return
+	fi
+
 	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
 	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
 	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0406767d0563f0a01874128e83039b961c7023e4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 18:15:16 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 18:15:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0406767d

kde4-base.eclass: don't warn on regular fetch failure

 eclass/kde4-base.eclass | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8cc21c9..b072a06 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -414,6 +414,17 @@ DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
+_kde_is_unreleased() {
+	local pair
+	for pair in "${KDE_UNRELEASED[@]}" ; do
+		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
 # Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
 # kdevelop ebuild, the URI should be set in the ebuild itself
 _calculate_src_uri() {
@@ -486,12 +497,9 @@ _calculate_src_uri() {
 			;;
 	esac
 
-	local pair
-	for pair in "${KDE_UNRELEASED[@]}" ; do
-		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
-			RESTRICT+=" fetch"
-		fi
-	done
+	if _kde_is_unreleased ; then
+		RESTRICT+=" fetch"
+	fi
 }
 
 _calculate_live_repo() {
@@ -663,6 +671,10 @@ kde4-base_pkg_setup() {
 # @DESCRIPTION:
 # Display package publication status
 kde4-base_pkg_nofetch() {
+	if ! _kde_is_unreleased ; then
+		return
+	fi
+
 	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
 	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
 	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     381d345d813e37004839503a30aa3c2229c06ed8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 19:30:57 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 19:30:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=381d345d

kde5.eclass: mark kde-plasma-5.4.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 94bacf9..f956b77 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.4.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="http://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     cf7de3ca3805eb5f729a4163b207fff0c1933b9c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 13:52:11 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 13:52:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf7de3ca

eclass: kde-plasma-5.4.0 is now released.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f956b77..94bacf9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.4.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="http://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     24cdc375b1fd58ffe57ee9e2a561bb1a0fd7e9e3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 10:48:51 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 10:48:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=24cdc375

kde5.eclass: disable root test directory.

 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 94bacf9..10d3fe9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -484,6 +484,7 @@ kde5_src_prepare() {
 		# only build unit tests when required
 		if ! use_if_iuse test ; then
 			comment_add_subdirectory autotests
+			comment_add_subdirectory test
 			comment_add_subdirectory tests
 		fi
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     07a7ad7c59dcd6fa353844bb514ea10b506fb57b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 11:30:21 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 11:30:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=07a7ad7c

eclass: use https

 eclass/kde4-base.eclass     | 4 ++--
 eclass/kde4-meta-pkg.eclass | 2 +-
 eclass/kde5-meta-pkg.eclass | 2 +-
 eclass/kde5.eclass          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b072a06..915f2bf 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ KDE_UNRELEASED=( )
 # Setup packages inheriting this eclass
 case ${KDEBASE} in
 	kde-base)
-		HOMEPAGE="http://www.kde.org/"
+		HOMEPAGE="https://www.kde.org/"
 		LICENSE="GPL-2"
 		if [[ ${KDE_BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 			# Disable tests for live ebuilds by default
@@ -193,7 +193,7 @@ case ${KDEBASE} in
 		esac
 		;;
 	kdevelop)
-		HOMEPAGE="http://www.kdevelop.org/"
+		HOMEPAGE="https://www.kdevelop.org/"
 		LICENSE="GPL-2"
 		;;
 esac

diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
index 7b735c9..d9c0b2d 100644
--- a/eclass/kde4-meta-pkg.eclass
+++ b/eclass/kde4-meta-pkg.eclass
@@ -14,7 +14,7 @@ _KDE4_META_PKG_ECLASS=1
 
 inherit kde4-functions
 
-HOMEPAGE="http://www.kde.org/"
+HOMEPAGE="https://www.kde.org/"
 
 LICENSE="metapackage"
 IUSE="aqua"

diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index 8134db3..939ce1c 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -14,7 +14,7 @@ _KDE5_META_PKG_ECLASS=1
 
 inherit kde5-functions
 
-HOMEPAGE="http://www.kde.org/"
+HOMEPAGE="https://www.kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 10d3fe9..cb310d7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -115,9 +115,9 @@ fi
 KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
-	HOMEPAGE="http://www.kdevelop.org/"
+	HOMEPAGE="https://www.kdevelop.org/"
 else
-	HOMEPAGE="http://www.kde.org/"
+	HOMEPAGE="https://www.kde.org/"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     78de52711edbc85a4e7ca347f7a328b9fb069a40
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 15:46:35 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 15:46:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=78de5271

kde5.eclass: don't make kde-plasma/polkit-kde-agent block kde-apps/kde4-l10n.

As sys-auth/polkit-kde-agent was never part of KDE SC 4, it's translations
were never installed by kde-l10n, so there's no need to have a blocker.

In addition to not being required, the blocker was encountered by all
KDE 4 users who had kde-apps/kde4-l10n installed and tried to install a
package that requires kde-frameworks/kauth (which pulls in kde-plasma/polkit-kde-agent).

Resolving the blocker manually by enabling the minimal USE flag on kde-apps/kde4-l10n
caused Plasma 4 translations to be removed.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index cb310d7..28aba19 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -147,7 +147,7 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"
 
-		if [[ ${CATEGORY} = kde-plasma ]]; then
+		if [[ ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
 			"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     78db327966222d7845d80f8913aa04d1d8027331
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 29 16:33:42 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 16:47:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=78db3279

kde4-base.eclass: kde-l10n -> kde4-l10n

Fixes https://bugs.gentoo.org/show_bug.cgi?id=559086

 eclass/kde4-base.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 915f2bf..171e6e1 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -339,13 +339,13 @@ if [[ ${PN} != oxygen-icons ]]; then
 	kderdepend+=" kde-apps/oxygen-icons"
 fi
 
-# add a dependency over kde-l10n
+# add a dependency over kde4-l10n
 if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
 	for _lingua in ${KDE_LINGUAS}; do
-		# if our package has linguas, pull in kde-l10n with selected lingua enabled,
+		# if our package has linguas, pull in kde4-l10n with selected lingua enabled,
 		# but only for selected ones.
 		# this can't be done on one line because if user doesn't use any localisation
-		# then he is probably not interested in kde-l10n at all.
+		# then he is probably not interested in kde4-l10n at all.
 		kderdepend+="
 		linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "linguas_${_lingua}(+)") )
 		"
@@ -734,11 +734,11 @@ kde4-base_src_prepare() {
 	fi
 
 	# Enable/disable handbooks for kde4-base packages
-	# kde-l10n inherits kde4-base but is metpackage, so no check for doc
+	# kde4-l10n inherits kde4-base but is metapackage, so no check for doc
 	# kdelibs inherits kde4-base but handle installing the handbook itself
 	if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
 		if [[ ${KDEBASE} == kde-base ]]; then
-			if [[ ${PN} != kde-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
+			if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
 				# documentation in kde4-functions
 				: ${KDE_DOC_DIRS:=doc}
 				local dir

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5b788d26cb1c605f18368ea894029a69cb6bf844
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 17:08:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 17:41:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b788d26

kde5.eclass: don't try to perform linguas operations on kde-apps handbooks.

Doing so was interfering with the handbook directory structure of some
packages, resulting in some handbooks not being installed. The operations
can be skipped completely, as all kde-apps translated handbooks are shipped
with kde-l10n.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 28aba19..672df0d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -461,7 +461,7 @@ kde5_src_prepare() {
 			popd > /dev/null
 		fi
 
-		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} ]] ; then
+		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
 			pushd ${KDE_DOC_DIR} > /dev/null
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e0b1c4fb99d039a9d53042ba2a57dba9500ef4e4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 19:11:22 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 19:11:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0b1c4fb

kde5.eclass: mark plasma-5.4.1 as unreleased.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 672df0d..81fd3b5 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.4.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     887b84b41ee083c8c57c567f27e23ca4ec2693d5
Author:     Manuel Rüger <manuel <AT> rueg <DOT> eu>
AuthorDate: Sun Sep  6 11:20:29 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 11:20:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=887b84b4

eclass: Mark Frameworks 5.14.0 as unreleased.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 81fd3b5..5f8b828 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.4.1 )
+KDE_UNRELEASED=( kde-plasma-5.4.1 kde-frameworks-5.14.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     7f66328c64a055b90c4ece61404220ad3b5674a7
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 15:09:49 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 15:09:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f66328c

eclass: Remove fetch restriction for Plasma 5.4.1

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5f8b828..71bac64 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.4.1 kde-frameworks-5.14.0 )
+KDE_UNRELEASED=( kde-frameworks-5.14.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     99ebea7cf38ade93903ef06c9f1af449363ce18f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 13:31:43 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 13:38:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=99ebea7c

kde5-meta-pkg.eclass: block SLOT 4.

kde-apps/kdeadmin-meta:4 pulls kde-apps/kcron:4, and kde-apps/kdeadmin-meta:5
pulls kde-apps/kcron:5.

Because kde-apps/kdeadmin-meta SLOTS were previously coinstallable but
kde-apps/kcron were not, this caused an unresolvable dependency tree.

 eclass/kde5-meta-pkg.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index 939ce1c..e1abba5 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -18,4 +18,6 @@ HOMEPAGE="https://www.kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 
+RDEPEND+=" !kde-apps/${PN}:4"
+
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     3a578c3c28734bb1c1c621b242f650bb9e9aed15
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep  6 21:49:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 17:48:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a578c3c

kde5.eclass: Block old kde4-l10n for kde-{frameworks,plasma}

Versions older than <kde-apps/kde4-l10n-15.08.0-r1 haven't been updated to keep
up with file collisions in current releases of kde-frameworks and kde-plasma.
Make sure everyone gets what they need. Fixes e.g. kde-plasma/kinfocenter-5.4.0
as reported in IRC but also https://bugs.gentoo.org/show_bug.cgi?id=559740

 eclass/kde5.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 71bac64..9b7b004 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -147,9 +147,10 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"
 
-		if [[ ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
+		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
+				!<kde-apps/kde4-l10n-15.08.0-r1
 			"
 		fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     75d53cc1f74f38a6cec4f4522a87678f0610f540
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 23:35:46 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 23:35:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=75d53cc1

eclass: Mark KDE Applications 15.08.1 as unreleased.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9b7b004..ff9d645 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.14.0 )
+KDE_UNRELEASED=( kde-applications-15.08.1 kde-frameworks-5.14.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     deefeaa09245bd887952b24c5a1003cd8d02a2a4
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 16:00:46 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 16:00:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=deefeaa0

eclass: KDE Frameworks 5.14 is available now. Fix category name.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ff9d645..fb8ea23 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-applications-15.08.1 kde-frameworks-5.14.0 )
+KDE_UNRELEASED=( kde-apps-15.08.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     7b5663c4f1b977696c859e9a91554d2e83d98c29
Author:     Lorenzo Porta <Vindex17 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Sep 16 07:16:23 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 08:34:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b5663c4

eclass: Remove fetch restriction for KDE Applications 15.08.1

WRT https://www.kde.org/announcements/announce-applications-15.08.1.php

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fb8ea23..edb5ca8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-15.08.1 )
+KDE_UNRELEASED=()
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     af7a438a7bbcf2e98edee24a188c7f0c912e84bf
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 00:41:34 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 00:41:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=af7a438a

eclass: Sync with tree.

 eclass/kde4-base.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 171e6e1..35994e3 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -480,7 +480,10 @@ _calculate_src_uri() {
 				4.14.11)
 					# Part of 15.08.0 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
-				??.?.[6-9]? | ??.??.[4-9]?)
+				4.14.12)
+					# Part of 15.08.1 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.1/src/${_kmname_pv}.tar.xz" ;;
+			??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
 				*)

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     9b731dd3f1a820651a710208fbfb7ed806a45dc5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 13:02:37 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 13:02:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b731dd3

kde5.eclass: don't check gcc version for binary merges

 eclass/kde5.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index edb5ca8..2fa0d83 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -367,7 +367,9 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 # Do some basic settings
 kde5_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
-	_check_gcc_version
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		_check_gcc_version
+	fi
 }
 
 # @FUNCTION: kde5_pkg_setup
@@ -375,7 +377,9 @@ kde5_pkg_pretend() {
 # Do some basic settings
 kde5_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
-	_check_gcc_version
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		_check_gcc_version
+	fi
 }
 
 # @FUNCTION: kde5_pkg_nofetch

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     061c734017f67a9ac2417563a9b485b270cd4719
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 23 14:33:59 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 14:50:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=061c7340

kde5-functions.eclass: Make gcc version check configurable

 eclass/kde5-functions.eclass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index e19d7fd..6bebf7f 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,6 +38,11 @@ esac
 # Minimal KDE Applicaions version to require for the package.
 : ${KDE_APPS_MINIMAL:=14.12.0}
 
+# @ECLASS-VARIABLE: KDE_GCC_MINIMAL
+# @DESCRIPTION:
+# Minimal GCC version to require for the package.
+: ${KDE_GCC_MINIMAL:=4.8}
+
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
@@ -79,10 +84,12 @@ _check_gcc_version() {
 		local version=$(gcc-version)
 		local major=${version%.*}
 		local minor=${version#*.}
+		local min_major=${KDE_GCC_MINIMAL%.*}
+		local min_minor=${KDE_GCC_MINIMAL#*.}
 
-		[[ ${major} -lt 4 ]] || \
-				( [[ ${major} -eq 4 && ${minor} -lt 8 ]] ) \
-			&& die "Sorry, but gcc-4.8 or later is required for KDE 5."
+		[[ ${major} -lt ${min_major} ]] || \
+				( [[ ${major} -eq ${min_major} && ${minor} -lt ${min_minor} ]] ) \
+			&& die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package."
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     8f3df5bf67de347b35f85dd7c8a0abb76c83fdae
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 15:41:00 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 15:41:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f3df5bf

kde4-base.eclass: relax blocker

Gentoo-bug: 560698

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 35994e3..3ced13e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -331,7 +331,7 @@ kdedepend="
 kderdepend=""
 
 if [[ ${CATEGORY} == kde-apps ]]; then
-	kderdepend+=" !kde-base/${PN}"
+	kderdepend+=" !kde-base/${PN}:4"
 fi
 
 # all packages needs oxygen icons for basic iconset

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     bddea4c02a06beaaccad0f20601c4969136a0c2b
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 11:59:23 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 11:59:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bddea4c0

eclass: Raise minimal QT version to 5.4.2

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2fa0d83..eef725e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -33,7 +33,7 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_co
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.4.1}
+: ${QT_MINIMAL:=5.4.2}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     1527adf471a3bed7254675859a7b393988519861
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 11:59:49 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 11:59:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1527adf4

eclass: Raise minimal KDE Plasma and Frameworks versions.

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 6bebf7f..74f6a02 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,12 +26,12 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.13.0}
+: ${FRAMEWORKS_MINIMAL:=5.14.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.3.2}
+: ${PLASMA_MINIMAL:=5.4.1}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     18da73690c275518083cc5184f943f910085c72d
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 20:21:23 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 20:21:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=18da7369

eclass: Add Frameworks 5.15.0 to the unreleased packages.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 66c7ae2..d98130d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.4.2 )
+KDE_UNRELEASED=( kde-plasma-5.4.2 kde-frameworks-5.15.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     cfabe6e8b03342bf6a67418151c52d298edcbf9b
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 20:20:58 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 20:20:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cfabe6e8

eclass: Add Plasma 5.4.2 to the unreleased packages.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index eef725e..66c7ae2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=()
+KDE_UNRELEASED=( kde-plasma-5.4.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     acb3b00c2854ba29777fc770c19d7338f6cd9292
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 15:11:12 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 15:11:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=acb3b00c

eclass: KDE Plasma 5.4.2 was released.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d98130d..4ba5a77 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.4.2 kde-frameworks-5.15.0 )
+KDE_UNRELEASED=( kde-frameworks-5.15.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     82765b0cfd1e3c190abbf392cd2215957c453cfa
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct  7 23:13:50 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 13:07:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=82765b0c

kde5.eclass: Add KDE_DOX_DIR variable

Defaults to ".". Otherwise, use alternative KDE doxygen path

 eclass/kde5.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4ba5a77..ecd07a4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -64,6 +64,11 @@ else
 	: ${KDE_DOXYGEN:=false}
 fi
 
+# @ECLASS-VARIABLE: KDE_DOX_DIR
+# @DESCRIPTION:
+# Defaults to ".". Otherwise, use alternative KDE doxygen path.
+: ${KDE_DOX_DIR:=.}
+
 # @ECLASS-VARIABLE: KDE_EXAMPLES
 # @DESCRIPTION:
 # If set to "false", unconditionally ignore a top-level examples subdirectory.
@@ -545,7 +550,7 @@ kde5_src_compile() {
 
 	# Build doxygen documentation if applicable
 	if use_if_iuse doc ; then
-		kgenapidox . || die
+		kgenapidox ${KDE_DOX_DIR} || die
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     46d13e80de0664d3559f6363fa854488066f0457
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 10:56:06 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 10:56:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=46d13e80

eclass: Frameworks 5.15.0 was released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ecd07a4..25b8e77 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -117,7 +117,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.15.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7145eea2045ef483dc2046120ee4e0df9d1d1da2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 12:45:52 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 12:45:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7145eea2

kde5.eclass: nitpicks

 eclass/kde5.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 25b8e77..315779f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -457,7 +457,7 @@ kde5_src_prepare() {
 	# when required
 	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
 		if [[ -d po ]] ; then
-			pushd po > /dev/null
+			pushd po > /dev/null || die
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					if [[ ${lang} != CMakeLists.txt ]] ; then
@@ -468,17 +468,17 @@ kde5_src_prepare() {
 					fi
 				fi
 			done
-			popd > /dev/null
+			popd > /dev/null || die
 		fi
 
 		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
-			pushd ${KDE_DOC_DIR} > /dev/null
+			pushd ${KDE_DOC_DIR} > /dev/null || die
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					comment_add_subdirectory ${lang}
 				fi
 			done
-			popd > /dev/null
+			popd > /dev/null || die
 		fi
 	else
 		rm -rf po

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     94966c2b0ec9051b933228fa2120f45d1ff37d2a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 11:16:42 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 11:33:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=94966c2b

cmake-utils.eclass: make heredocs die

 eclass/cmake-utils.eclass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 89db00d..480cd09 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -375,7 +375,7 @@ _modify-cmakelists() {
 		|| die "${LINENO}: failed to disable hardcoded settings"
 
 	# NOTE Append some useful summary here
-	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_
+	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
 
 		MESSAGE(STATUS "<<< Gentoo configuration >>>
 		Build type      \${CMAKE_BUILD_TYPE}
@@ -456,7 +456,7 @@ enable_cmake-utils_src_configure() {
 
 	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
 	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
-	cat > "${build_rules}" <<- _EOF_
+	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
@@ -467,7 +467,7 @@ enable_cmake-utils_src_configure() {
 	_EOF_
 
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
-	cat > ${toolchain_file} <<- _EOF_
+	cat > ${toolchain_file} <<- _EOF_ || die
 		SET (CMAKE_C_COMPILER $(tc-getCC))
 		SET (CMAKE_CXX_COMPILER $(tc-getCXX))
 		SET (CMAKE_Fortran_COMPILER $(tc-getFC))
@@ -481,21 +481,21 @@ enable_cmake-utils_src_configure() {
 			linux) sysname="Linux" ;;
 			Winnt)
 				sysname="Windows"
-				cat >> "${toolchain_file}" <<- _EOF_
+				cat >> "${toolchain_file}" <<- _EOF_ || die
 					SET (CMAKE_RC_COMPILER $(tc-getRC))
 				_EOF_
 				;;
 			*) sysname="${KERNEL}" ;;
 		esac
 
-		cat >> "${toolchain_file}" <<- _EOF_
+		cat >> "${toolchain_file}" <<- _EOF_ || die
 			SET (CMAKE_SYSTEM_NAME "${sysname}")
 		_EOF_
 
 		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_
+			cat >> "${toolchain_file}" <<- _EOF_ || die
 				set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
 				set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 				set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
@@ -507,7 +507,7 @@ enable_cmake-utils_src_configure() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 
 	if [[ ${EPREFIX} ]]; then
-		cat >> "${build_rules}" <<- _EOF_
+		cat >> "${build_rules}" <<- _EOF_ || die
 			# in Prefix we need rpath and must ensure cmake gets our default linker path
 			# right ... except for Darwin hosts
 			IF (NOT APPLE)
@@ -532,7 +532,7 @@ enable_cmake-utils_src_configure() {
 	# Common configure parameters (invariants)
 	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
 	local libdir=$(get_libdir)
-	cat > "${common_config}" <<- _EOF_
+	cat > "${common_config}" <<- _EOF_ || die
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 	_EOF_

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5ecde7d3920ad0be53d5381b17ed4f1b7bc7f4e5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:21:20 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 18:21:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ecde7d3

cmake-utils.eclass: whitespace

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 480cd09..0f538f1 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -397,7 +397,7 @@ enable_cmake-utils_src_prepare() {
 
 	debug-print "$FUNCNAME: PATCHES=$PATCHES"
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-		
+
 	debug-print "$FUNCNAME: applying user patches"
 	epatch_user
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2eb376eb6d78fe98b0b82e0c8faee89e41e69f5a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 17:34:28 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 17:34:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2eb376eb

cmake-utils.eclass: warn when using mycmakeargs as a string

 eclass/cmake-utils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 0f538f1..9d4e03b 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -542,6 +542,7 @@ enable_cmake-utils_src_configure() {
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).
 	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
+		eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
 		local mycmakeargs_local=(${mycmakeargs})
 	else
 		local mycmakeargs_local=("${mycmakeargs[@]}")

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     c3d374ca264adac473d63ecd10b67a2486027c39
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 11:57:53 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:00:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3d374ca

cmake-utils.eclass: add missing '|| die' on pushd/popd

 eclass/cmake-utils.eclass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 9d4e03b..65950e7 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -393,7 +393,7 @@ _modify-cmakelists() {
 enable_cmake-utils_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	debug-print "$FUNCNAME: PATCHES=$PATCHES"
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
@@ -401,7 +401,7 @@ enable_cmake-utils_src_prepare() {
 	debug-print "$FUNCNAME: applying user patches"
 	epatch_user
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @VARIABLE: mycmakeargs
@@ -574,11 +574,11 @@ enable_cmake-utils_src_configure() {
 		cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
 	fi
 
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
 	echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
 	"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 enable_cmake-utils_src_compile() {
@@ -655,25 +655,25 @@ cmake-utils_src_make() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 
 	${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 enable_cmake-utils_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
 
 	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
 
 	if ctest "${myctestargs[@]}" "$@" ; then
 		einfo "Tests succeeded."
-		popd > /dev/null
+		popd > /dev/null || die
 		return 0
 	else
 		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
@@ -688,7 +688,7 @@ enable_cmake-utils_src_test() {
 		fi
 
 		# die might not die due to nonfatal
-		popd > /dev/null
+		popd > /dev/null || die
 		return 1
 	fi
 }
@@ -697,13 +697,13 @@ enable_cmake-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null || die
 	DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
-	popd > /dev/null
+	popd > /dev/null || die
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 	einstalldocs
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: cmake-utils_src_prepare

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1a1805e4b675fd79113f6c35a8a74bd54e595e6e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:03:23 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:03:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a1805e4

cmake-utils.eclass: die if ninja is enabled but not installed

This could happen if ninja is manually enabled (eg. make.conf) but not installed

Gentoo-bug: 561570

 eclass/cmake-utils.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 65950e7..c92759d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -228,6 +228,11 @@ _generator_to_use() {
 
 	case ${CMAKE_MAKEFILE_GENERATOR} in
 		ninja)
+			# 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 ! has_version dev-util/ninja; then
+				die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+			fi
 			generator_name="Ninja"
 			;;
 		emake)

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4cff5f9603282f0cd5a512914b572438e83039b1
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 11:59:34 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:24:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4cff5f96

kde4-functions.eclass: add missing '|| die' on pushd/popd

 eclass/kde4-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 133fd26..d2fd060 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -351,7 +351,7 @@ _enable_selected_linguas_dir() {
 
 	[[ -d  ${dir} ]] || die "linguas dir \"${dir}\" does not exist"
 	comment_all_add_subdirectory "${dir}"
-	pushd "${dir}" > /dev/null
+	pushd "${dir}" > /dev/null || die
 
 	# fix all various crazy sr@Latn variations
 	# this part is only ease for ebuilds, so there wont be any die when this
@@ -390,7 +390,7 @@ _enable_selected_linguas_dir() {
 	done
 	[[ -n ${linguas} ]] && echo ">>> Enabling languages: ${linguas}"
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: get_kde_version

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0cbcc8a7a13fa35acb55253027e6f282d98c0168
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 11:59:41 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:24:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0cbcc8a7

kde4-meta.eclass: add missing '|| die' on pushd/popd

 eclass/kde4-meta.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index d3aae4e..2e243b0 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -209,7 +209,7 @@ kde4-meta_src_extract() {
 		done
 		extractlist+=" $(_list_needed_subdirectories)"
 
-		pushd "${WORKDIR}" > /dev/null
+		pushd "${WORKDIR}" > /dev/null || die
 
 		# @ECLASS-VARIABLE: KDE4_STRICTER
 		# @DESCRIPTION:
@@ -223,7 +223,7 @@ kde4-meta_src_extract() {
 			mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
 		fi
 
-		popd > /dev/null
+		popd > /dev/null || die
 
 		eend $?
 
@@ -398,7 +398,7 @@ _change_cmakelists_parent_dirs() {
 kde4-meta_change_cmakelists() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null
+	pushd "${S}" > /dev/null || die
 
 	comment_all_add_subdirectory ./
 
@@ -547,7 +547,7 @@ kde4-meta_change_cmakelists() {
 			;;
 	esac
 
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # @FUNCTION: kde4-meta_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e73728beed40f626bc588edd09628d621b5fe456
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:24:42 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:24:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e73728be

kde4-base.eclass: use https

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 3ced13e..20a4f65 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -452,7 +452,7 @@ _calculate_src_uri() {
 				4.4.20*)
 					# KDEPIM 4.4 no-akonadi branch, special case
 					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
-					SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz" ;;
 				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     8234247b4e905a4db63fb315d8ea1c39078afaf9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:28:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:28:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8234247b

kde4-base.eclass: cleanup old SRC_URI

 eclass/kde4-base.eclass | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 20a4f65..2bfa79b 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -456,15 +456,9 @@ _calculate_src_uri() {
 				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.11.14)
-					# Part of 4.14 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;;
 				4.11.19)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
-				4.11.21)
-					# Part of 15.04.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				4.11.22)
 					# Part of 15.08.0 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
@@ -477,12 +471,6 @@ _calculate_src_uri() {
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.11)
-					# Part of 15.08.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
-				4.14.12)
-					# Part of 15.08.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.1/src/${_kmname_pv}.tar.xz" ;;
 			??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a0bfaa204d82aeb5ec83d734fb93619394cef996
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:32:47 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:32:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a0bfaa20

kde4-base.eclass: whitespace

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 68f1d57..01e8009 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -474,7 +474,7 @@ _calculate_src_uri() {
 				4.14.13)
 					# Part of 15.08.2 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.2/src/${_kmname_pv}.tar.xz" ;;
-			??.?.[6-9]? | ??.??.[4-9]?)
+				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
 				*)

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     216c04ae15842e5a177c66b2c9839cac3902e8e8
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 26 17:31:30 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:32:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=216c04ae

kde4-base.eclass: Add 4.14.13 release SRC_URI

 eclass/kde4-base.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 2bfa79b..68f1d57 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -471,6 +471,9 @@ _calculate_src_uri() {
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
+				4.14.13)
+					# Part of 15.08.2 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.2/src/${_kmname_pv}.tar.xz" ;;
 			??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7f03821876f1a7884396057f315013c3622b4609
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  3 12:41:04 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 12:34:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f038218

cmake-utils.eclass: Prepare for cmake-3.4

 eclass/cmake-utils.eclass | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index c92759d..2ebde45 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -121,7 +121,7 @@ case ${WANT_CMAKE} in
 		CMAKEDEPEND+="${WANT_CMAKE}? ( "
 		;;
 esac
-inherit toolchain-funcs multilib flag-o-matic eutils
+inherit toolchain-funcs multilib flag-o-matic eutils versionator
 
 case ${EAPI} in
 	2|3|4|5) : ;;
@@ -461,12 +461,22 @@ enable_cmake-utils_src_configure() {
 
 	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
 	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
+	# Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus
+	# we need to add "<INCLUDES>"
+	local includes=
+	if [[ ${PN} == cmake ]] ; then
+		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
+			includes="<INCLUDES>"
+		fi
+	elif has_version \>=dev-util/cmake-3.4.0_rc1 ; then
+		includes="<INCLUDES>"
+	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
+		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
+		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
+		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
 		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
 		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
 	_EOF_

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a987517f8c83ba8028d8dae005f11b0466a32a55
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 17:20:02 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 17:22:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a987517f

kde5.eclass: introduce "forceoptional" value for KDE_HANDBOOK

 eclass/kde5.eclass | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 315779f..4ddcea7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -80,6 +80,8 @@ fi
 # If set to "false", do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
 # generate and install KDE handbook.
+# If set to "forceoptional", remove a KF5DocTools dependency from the root
+# CMakeLists.txt in addition to the above.
 : ${KDE_HANDBOOK:=false}
 
 # @ECLASS-VARIABLE: KDE_DOC_DIR
@@ -471,7 +473,7 @@ kde5_src_prepare() {
 			popd > /dev/null || die
 		fi
 
-		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
+		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
 			pushd ${KDE_DOC_DIR} > /dev/null || die
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
@@ -511,6 +513,12 @@ kde5_src_prepare() {
 			;;
 	esac
 
+	if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+		if ! use_if_iuse handbook ; then
+			punt_bogus_dep KF5 DocTools
+		fi
+	fi
+
 	cmake-utils_src_prepare
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     81cb1f69c7df360f7bd6a636caca1ae59ba9c820
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 18:52:29 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 18:56:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=81cb1f69

kde5.eclass: introduce forceoptional value for KDE_TEST

 eclass/kde5.eclass | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4ddcea7..aad8416 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -93,6 +93,8 @@ fi
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5.
+# If set to "forceoptional", remove a Qt5Test dependency from the root
+# CMakeLists.txt in addition to the above.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_TEST:=true}
 else
@@ -415,6 +417,11 @@ kde5_pkg_nofetch() {
 	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
 	eerror ""
 	eerror "Please consult the upstream release schedule to see when this "
+	if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+		if ! use_if_iuse handbook ; then
+			punt_bogus_dep KF5 DocTools
+		fi
+	fi
 	eerror "package is scheduled to be released:"
 	eerror "https://techbase.kde.org/Schedules"
 }
@@ -519,6 +526,12 @@ kde5_src_prepare() {
 		fi
 	fi
 
+	if [[ ${KDE_TEST} = forceoptional ]] ; then
+		if ! use_if_iuse test ; then
+			punt_bogus_dep Qt5 Test
+		fi
+	fi
+
 	cmake-utils_src_prepare
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4c4eaf325a794e1995ce4f9039e774db14c664cf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 14:27:09 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 14:27:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4c4eaf32

eclass: mark Plasma 5.4.3 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index aad8416..f6f7044 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( plasma-5.4.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     0c91b443bb9a51adf78e3713069b62e51f2669c9
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 21:47:03 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 21:47:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c91b443

eclass: Plasma 5.4.3 has been released.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f6f7044..aad8416 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( plasma-5.4.3 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1a074eecdc0ce0c855487f9db1cc79b89d5c15d9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Nov 10 21:21:39 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 10:25:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a074eec

kde4-base.eclass: Add 4.14.14 SRC_URI

 eclass/kde4-base.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 01e8009..2cc0c3f 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -474,6 +474,9 @@ _calculate_src_uri() {
 				4.14.13)
 					# Part of 15.08.2 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.2/src/${_kmname_pv}.tar.xz" ;;
+				4.14.14)
+					# Part of 15.08.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.08.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     83c0b253f13fb33444a94697e41710e4faae00bf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 17:08:14 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 17:10:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=83c0b253

eclass: kde-apps/oxygen-icons -> kde-frameworks

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 2cc0c3f..cc13d9f 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -336,7 +336,7 @@ fi
 
 # all packages needs oxygen icons for basic iconset
 if [[ ${PN} != oxygen-icons ]]; then
-	kderdepend+=" kde-apps/oxygen-icons"
+	kderdepend+=" kde-frameworks/oxygen-icons"
 fi
 
 # add a dependency over kde4-l10n

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     304bc81cd9f7e4c7741b3f00358d5a20d128576e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 17:21:12 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 17:21:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=304bc81c

eclass: remove code that appeared out of nowhere

 eclass/kde5.eclass | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index aad8416..4253da9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -417,11 +417,6 @@ kde5_pkg_nofetch() {
 	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
 	eerror ""
 	eerror "Please consult the upstream release schedule to see when this "
-	if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
-		if ! use_if_iuse handbook ; then
-			punt_bogus_dep KF5 DocTools
-		fi
-	fi
 	eerror "package is scheduled to be released:"
 	eerror "https://techbase.kde.org/Schedules"
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     53b24b21213a2b765e1af674412feb2f8401069f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 07:24:36 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 07:56:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=53b24b21

kde5-functions.eclass: add intial EAPI 6 support

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 74f6a02..db460d5 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -19,7 +19,7 @@ inherit toolchain-funcs versionator
 # @DESCRIPTION:
 # Currently EAPI 5 is supported.
 case ${EAPI} in
-	5) ;;
+	5|6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a7e42401bf8048469326bdb75eaf3195e895d9cd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 07:35:13 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 07:56:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7e42401

kde5.eclass: call default_src_prepare instead of cmake-utils_src_prepare for EAPI 6 and later

 eclass/kde5.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4253da9..0eb8951 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -527,7 +527,11 @@ kde5_src_prepare() {
 		fi
 	fi
 
-	cmake-utils_src_prepare
+	if [[ ${EAPI} == 5 ]]; then
+		cmake-utils_src_prepare
+	else
+		default_src_prepare
+	fi
 }
 
 # @FUNCTION: kde5_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4a246814040981732fc02302092dccfe99c6632d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 08:06:39 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 08:06:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a246814

cmake-utils.eclass: add intial EAPI 6 support

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 2ebde45..d6ab599 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -124,7 +124,7 @@ esac
 inherit toolchain-funcs multilib flag-o-matic eutils versionator
 
 case ${EAPI} in
-	2|3|4|5) : ;;
+	2|3|4|5|6) : ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6017849b497d96ff17184ec3c3211665bc7e1a1e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 08:09:42 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 08:09:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6017849b

Revert "kde5.eclass: call default_src_prepare instead of cmake-utils_src_prepare for EAPI 6 and later"

cmake-utils.eclass will move toolchain preparatione etc. into src_prepare from EAPI 6

This reverts commit a7e42401bf8048469326bdb75eaf3195e895d9cd.

 eclass/kde5.eclass | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0eb8951..4253da9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -527,11 +527,7 @@ kde5_src_prepare() {
 		fi
 	fi
 
-	if [[ ${EAPI} == 5 ]]; then
-		cmake-utils_src_prepare
-	else
-		default_src_prepare
-	fi
+	cmake-utils_src_prepare
 }
 
 # @FUNCTION: kde5_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6dab4561042befee93291757c3639064e58a10cf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 08:41:19 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 08:41:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6dab4561

cmake-utils.eclass: reorder a bit

 eclass/cmake-utils.eclass | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d6ab599..7810a26 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -112,6 +112,15 @@ CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
+case ${EAPI} in
+	2|3|4|5|6) : ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+inherit toolchain-funcs multilib flag-o-matic eutils versionator
+
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+
 CMAKEDEPEND=""
 case ${WANT_CMAKE} in
 	always)
@@ -121,14 +130,6 @@ case ${WANT_CMAKE} in
 		CMAKEDEPEND+="${WANT_CMAKE}? ( "
 		;;
 esac
-inherit toolchain-funcs multilib flag-o-matic eutils versionator
-
-case ${EAPI} in
-	2|3|4|5|6) : ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     932db652b0e2a855f70d0fa2f1ed1e1efd3e0127
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 08:47:13 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 08:47:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=932db652

cmake-utils.eclass: ban WANT_CMAKE in EAPI 6 and later

It is basically unused across the tree and complicates the eclass. If it were
needed, it might be better to write custom ebuild phase functions instead.

 eclass/cmake-utils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7810a26..c3184bd 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -126,6 +126,7 @@ case ${WANT_CMAKE} in
 	always)
 		;;
 	*)
+		! has "${EAPI:-0}" 2 3 4 5 && die "WANT_CMAKE is banned in EAPI 6 and later"
 		IUSE+=" ${WANT_CMAKE}"
 		CMAKEDEPEND+="${WANT_CMAKE}? ( "
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     28ab4b2c0a74db3800bb8d2796644bed7b5b89fd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 09:26:52 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 09:26:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=28ab4b2c

cmake-utils.eclass: move $S modifications to src_prepare in EAPI 6 and later

This is the correct phase for source modifications, and additionally avoids a
multilib race condition.

Gentoo-bug: 513170

 eclass/cmake-utils.eclass | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index c3184bd..b726589 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -397,11 +397,37 @@ _modify-cmakelists() {
 	_EOF_
 }
 
+# temporary function for moving cmake cleanups from from src_configure -> src_prepare.
+# bug #378850
+_cleanup_cmake() {
+	: ${CMAKE_USE_DIR:=${S}}
+
+	[[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && {
+		local name
+		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
+			find "${S}" -name ${name}.cmake -exec rm -v {} +
+		done
+	}
+
+	# check if CMakeLists.txt exist and if no then die
+	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
+		eerror "Unable to locate CMakeLists.txt under:"
+		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
+		eerror "Consider not inheriting the cmake eclass."
+		die "FATAL: Unable to find CMakeLists.txt"
+	fi
+
+	# Remove dangerous things.
+	_modify-cmakelists
+}
+
 enable_cmake-utils_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	pushd "${S}" > /dev/null || die
 
+	has "${EAPI:-0}" 6 && _cleanup_cmake
+
 	debug-print "$FUNCNAME: PATCHES=$PATCHES"
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
@@ -429,26 +455,10 @@ enable_cmake-utils_src_prepare() {
 enable_cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && {
-		local name
-		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} +
-		done
-	}
+	has "${EAPI:-0}" 2 3 4 5 && _cleanup_cmake
 
 	_check_build_dir
 
-	# check if CMakeLists.txt exist and if no then die
-	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
-		eerror "Unable to locate CMakeLists.txt under:"
-		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
-		eerror "Consider not inheriting the cmake eclass."
-		die "FATAL: Unable to find CMakeLists.txt"
-	fi
-
-	# Remove dangerous things.
-	_modify-cmakelists
-
 	# Fix xdg collision with sandbox
 	export XDG_CONFIG_HOME="${T}"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e33467b4473aa822964423b97eb7bf424ff3420a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 09:29:54 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 09:29:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e33467b4

cmake-utils.eclass: declare some variables local

Prevents them from spanning multilibs.

Gentoo-bug: 513170

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b726589..82e2f19 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -460,7 +460,7 @@ enable_cmake-utils_src_configure() {
 	_check_build_dir
 
 	# Fix xdg collision with sandbox
-	export XDG_CONFIG_HOME="${T}"
+	local -x XDG_CONFIG_HOME="${T}"
 
 	# @SEE CMAKE_BUILD_TYPE
 	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
@@ -531,7 +531,7 @@ enable_cmake-utils_src_configure() {
 		fi
 	fi
 
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && local EPREFIX=
 
 	if [[ ${EPREFIX} ]]; then
 		cat >> "${build_rules}" <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     95319bfc481d1f5e69738aa69a1cce005d1dd91d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 09:35:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 09:35:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=95319bfc

cmake-utils.eclass: use default_src_prepare in EAPI 6 and later

 eclass/cmake-utils.eclass | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 82e2f19..f6bb9dd 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -426,13 +426,18 @@ enable_cmake-utils_src_prepare() {
 
 	pushd "${S}" > /dev/null || die
 
-	has "${EAPI:-0}" 6 && _cleanup_cmake
+	if has "${EAPI:-0}" 6 ; then
+		_cleanup_cmake
+		default_src_prepare
+	fi
 
-	debug-print "$FUNCNAME: PATCHES=$PATCHES"
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	if has "${EAPI:-0}" 2 3 4 5 ; then
+		debug-print "$FUNCNAME: PATCHES=$PATCHES"
+		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-	debug-print "$FUNCNAME: applying user patches"
-	epatch_user
+		debug-print "$FUNCNAME: applying user patches"
+		epatch_user
+	fi
 
 	popd > /dev/null || die
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     636d81ebda2671867e2015d15faa3e818b32604b
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Wed Nov 18 09:54:40 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 09:54:40 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=636d81eb

cmake-utils.eclass: check exit codes of executed commands

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index f6bb9dd..2b858cc 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -220,7 +220,7 @@ _check_build_dir() {
 	# Backwards compatibility for getting the value.
 	CMAKE_BUILD_DIR=${BUILD_DIR}
 
-	mkdir -p "${BUILD_DIR}"
+	mkdir -p "${BUILD_DIR}" || die
 	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
 }
 
@@ -405,7 +405,7 @@ _cleanup_cmake() {
 	[[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && {
 		local name
 		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} +
+			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
 		done
 	}
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     8294f8afba1433e3bc26498a67bed2884d8b7fee
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 17:41:53 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 17:41:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8294f8af

kde4-functions.eclass: recognise KDEBASE in kde-frameworks

For the kde-apps/oxygen-icons -> kde-frameworks/oxygen-icons pkgmove.

 eclass/kde4-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index d2fd060..7319bc5 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -36,7 +36,7 @@ esac
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
 # kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]]; then
+if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	KDEBASE=kde-base
 elif [[ ${KMNAME-${PN}} = kdevelop ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     db1329dc44de41c8438dd0f7a3ac6a867e492e14
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 17:46:05 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 17:46:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db1329dc

cmake-utils.eclass: ban non-array usage of mycmakeargs in EAPI 6 and later

 eclass/cmake-utils.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index df7d643..dd46275 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -576,7 +576,11 @@ enable_cmake-utils_src_configure() {
 	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
 	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
 		if [[ -n "${mycmakeargstype}" ]] ; then
-			eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+			if has "${EAPI:-0}" 2 3 4 5 ; then
+				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+			else
+				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
+			fi
 		fi
 		local mycmakeargs_local=(${mycmakeargs})
 	else

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     edc5db6221dae6af6ddbea71ae9b36756e634f1f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 17:44:00 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 17:44:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=edc5db62

cmake-utils.eclass: don't warn about deprecated usage when not defined

 eclass/cmake-utils.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 2b858cc..df7d643 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -573,8 +573,11 @@ enable_cmake-utils_src_configure() {
 	# Convert mycmakeargs to an array, for backwards compatibility
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).
-	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
-		eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
+	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
+		if [[ -n "${mycmakeargstype}" ]] ; then
+			eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+		fi
 		local mycmakeargs_local=(${mycmakeargs})
 	else
 		local mycmakeargs_local=("${mycmakeargs[@]}")

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5fe4b852ed90c8fc137386b5e0c8d3dff47f212e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Nov 22 15:15:16 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 15:53:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5fe4b852

kde5.eclass: Extend KDE_TEST=forceoptional functionality, simplify

If KDE_TEST=forceoptional, it makes sense to disable test subdirs also
outside KDE categories. No change for misc ebuilds using kde5.eclass.

 eclass/kde5.eclass | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4253da9..ae5f394 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -455,6 +455,10 @@ kde5_src_prepare() {
 	# only enable handbook when required
 	if ! use_if_iuse handbook ; then
 		comment_add_subdirectory ${KDE_DOC_DIR}
+
+		if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+			punt_bogus_dep KF5 DocTools
+		fi
 	fi
 
 	# enable only the requested translations
@@ -488,21 +492,11 @@ kde5_src_prepare() {
 		rm -rf po
 	fi
 
-	# in frameworks, tests = manual tests so never
-	# build them
+	# in frameworks, tests = manual tests so never build them
 	if [[ ${CATEGORY} = kde-frameworks ]]; then
 		comment_add_subdirectory tests
 	fi
 
-	if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
-		# only build unit tests when required
-		if ! use_if_iuse test ; then
-			comment_add_subdirectory autotests
-			comment_add_subdirectory test
-			comment_add_subdirectory tests
-		fi
-	fi
-
 	case ${KDE_PUNT_BOGUS_DEPS} in
 		false)	;;
 		*)
@@ -515,15 +509,18 @@ kde5_src_prepare() {
 			;;
 	esac
 
-	if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
-		if ! use_if_iuse handbook ; then
-			punt_bogus_dep KF5 DocTools
-		fi
-	fi
-
-	if [[ ${KDE_TEST} = forceoptional ]] ; then
-		if ! use_if_iuse test ; then
+	# only build unit tests when required
+	if ! use_if_iuse test ; then
+		if [[ ${KDE_TEST} = forceoptional ]] ; then
 			punt_bogus_dep Qt5 Test
+			# if forceoptional, also cover non-kde categories
+			comment_add_subdirectory autotests
+			comment_add_subdirectory test
+			comment_add_subdirectory tests
+		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
+			comment_add_subdirectory autotests
+			comment_add_subdirectory test
+			comment_add_subdirectory tests
 		fi
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     ed4f3e135c2c401ce26dddb4c1108efef5891d82
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov 30 22:55:00 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 11:06:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed4f3e13

kde5-functions.eclass: Make punt_bogus_dep() case insensitive

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index db460d5..eb0cc16 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -229,7 +229,7 @@ punt_bogus_dep() {
 	local prefix=${1}
 	local dep=${2}
 
-	pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 
 	# pcregrep returns non-zero on no matches/error
 	if [[ $? != 0 ]] ; then
@@ -243,7 +243,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/I d" -i CMakeLists.txt || die
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     20fdf2735545d80ffa532cee9e81dd4c77abf99a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 15:04:26 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 15:05:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=20fdf273

kde5.eclass: mask Plasma 5.5.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ae5f394..b4b72b8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.5.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b76c33e03f5681f472d34cce35e8a01c4ddcb06b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 14:05:07 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 14:08:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b76c33e0

kde5.eclass: mask kde-frameworks-5.17.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b4b72b8..303f83d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.5.0 )
+KDE_UNRELEASED=( kde-frameworks-5.17.0 kde-plasma-5.5.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     863813e5b451c102944065b3a4562270438fee68
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 15:27:57 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec  8 15:27:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=863813e5

kde5.eclass: kde-plasma-5.5 is released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 303f83d..40738b3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.17.0 kde-plasma-5.5.0 )
+KDE_UNRELEASED=( kde-frameworks-5.17.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     f898baed4661e93c2686e34baf46068b14066244
Author:     Daniel Scharrer <daniel <AT> constexpr <DOT> org>
AuthorDate: Fri Dec  4 23:27:08 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 15:13:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f898baed

cmake-utils.eclass: Fix cross-compiling with cmake-3.4

We are interested in the CMake version on the host system, the sysroot
might not even have CMake installed at all.

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index dd46275..d5d06c5 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -485,7 +485,7 @@ enable_cmake-utils_src_configure() {
 		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
 			includes="<INCLUDES>"
 		fi
-	elif has_version \>=dev-util/cmake-3.4.0_rc1 ; then
+	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     647cf5985d0448dba2e3a395169a908095e0d1c5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 17:11:26 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 17:11:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=647cf598

cmake-utils.eclass: Case insensitive comment_add_subdirectory

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d5d06c5..f2c7e26 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -259,7 +259,7 @@ comment_add_subdirectory() {
         fi
 
         if [[ -e "CMakeLists.txt" ]]; then
-                sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1//\//\\/}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
+                sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
                         -i CMakeLists.txt || die "failed to comment add_subdirectory(${1})"
         fi
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     58cb723e23a78ca2c5b292aee28b079be095af37
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 01:34:15 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 01:34:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58cb723e

eclass: Drop fetch restriction for KDE Frameworks 5.17

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 40738b3..ae5f394 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.17.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     10f395cd9cdbd1657a1f684b5342e620e17db64c
Author:     Lorenzo Porta <vindex17 <AT> outlook <DOT> it>
AuthorDate: Sun Dec 13 14:17:16 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 17:33:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=10f395cd

eclass: add fetch restriction for KDE Applications 15.12

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ae5f394..2bfe335 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-15.12.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d5ac2dd224f7402cb95c81073777e17ef59c16b4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 12:55:25 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 12:55:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d5ac2dd2

kde5.eclass: enable automatic fetching for out-of-band point releases

 eclass/kde5.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2bfe335..13ae56b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -277,15 +277,17 @@ _calculate_src_uri() {
 		kde-frameworks)
 			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
 		kde-plasma)
+			local plasmapv=$(get_version_component_range 1-3)
+
 			case ${PV} in
 				5.?.[6-9]? )
 					# Plasma 5 beta releases
-					SRC_URI="mirror://kde/unstable/plasma/${PV}/${_kmname}-${PV}.tar.xz"
+					SRC_URI="mirror://kde/unstable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"
 					;;
 				*)
 					# Plasma 5 stable releases
-					SRC_URI="mirror://kde/stable/plasma/${PV}/${_kmname}-${PV}.tar.xz" ;;
+					SRC_URI="mirror://kde/stable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz" ;;
 			esac
 			;;
 	esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2246ce467de9ac1a3fca66eba062a8029ce3c010
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 17:57:31 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 17:57:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2246ce46

kde5.eclass: kde-applications-15.12 is released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 13ae56b..fdc5128 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-15.12.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d8400f7bbbb79f5c58e35cd99a7a941190096cc7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 16:14:23 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 16:18:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8400f7b

kde4-base.eclass: add SRC_URI for 4.14.15

 eclass/kde4-base.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index cc13d9f..3080ed9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -477,6 +477,9 @@ _calculate_src_uri() {
 				4.14.14)
 					# Part of 15.08.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.3/src/${_kmname_pv}.tar.xz" ;;
+				4.14.15)
+					# Part of 15.12.0 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.12.0/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     353ad5d3f1b050127d8bf56addfc6dcd045c1ca2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 18:44:46 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 18:44:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=353ad5d3

freedesktop.eclass: remove unused experiment

Gentoo-bug: 569084

 eclass/freedesktop.eclass | 70 -----------------------------------------------
 1 file changed, 70 deletions(-)

diff --git a/eclass/freedesktop.eclass b/eclass/freedesktop.eclass
deleted file mode 100644
index 1fe7a91..0000000
--- a/eclass/freedesktop.eclass
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: freedesktop
-# @MAINTAINER:
-# freedesktop-bugs@gentoo.org
-# @BLURB: Useful functions for working with freedesktop-compliant applications
-# @DESCRIPTION:
-# Set up directories according to the XDG Base Directory Specification.
-# Also provides functions for updating desktop, mime, and icon caches.
-# @EXAMPLE:
-# @CODE
-# inherit freedesktop
-#
-# pkg_setup() {
-# 	freedesktop_setup
-# }
-# pkg_postinst() {
-# 	freedesktop_desktop_database_update
-# 	freedesktop_mime_database_update
-# }
-# @CODE
-
-# Unset these globally to avoid leaking values from the calling environment.
-unset XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME XDG_RUNTIME_DIR
-
-# @FUNCTION: freedesktop_setup
-# @DESCRIPTION:
-# Creates sensible locations for the following environment variables:
-# XDG_DATA_HOME
-# XDG_CONFIG_HOME
-# XDG_CACHE_HOME
-# XDG_RUNTIME_DIR
-freedesktop_setup() {
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_CACHE_HOME="${HOME}/.cache"
-	export XDG_RUNTIME_DIR="${T}/run"
-	mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" || die
-	mkdir -p -m 0700 "${XDG_RUNTIME_DIR}" || die
-}
-
-# @FUNCTION: freedesktop_desktop_database_update
-# @DESCRIPTION:
-# Updates the desktop database.
-# Generates a list of mimetypes linked to applications that can handle them
-freedesktop_desktop_database_update() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ]
-	then
-		einfo "Updating desktop mime database ..."
-		"${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}usr/share/applications"
-	fi
-}
-
-# @FUNCTION: freedesktop_mime_database_update
-# @DESCRIPTION:
-# Update the mime database.
-# Creates a general list of mime types from several sources
-freedesktop_mime_database_update() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	if [ -x "${EPREFIX}/usr/bin/update-mime-database" ]
-	then
-		einfo "Updating shared mime info database ..."
-		"${EPREFIX}/usr/bin/update-mime-database" "${EROOT}usr/share/mime"
-	fi
-}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b56904fffadd50e7f13d49d47797604fd0ecbc87
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 01:36:11 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 01:36:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b56904ff

kde5.eclass: In kde5_src_prepare, place cmake-utils_src_prepare on top

This change makes PATCHES handling less error prone, as epatch will find
a pristine directory before there is punting and commenting.

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fdc5128..1e429f2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -449,6 +449,8 @@ kde5_src_unpack() {
 kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	cmake-utils_src_prepare
+
 	# only build examples when required
 	if ! use_if_iuse examples || ! use examples ; then
 		comment_add_subdirectory examples
@@ -525,8 +527,6 @@ kde5_src_prepare() {
 			comment_add_subdirectory tests
 		fi
 	fi
-
-	cmake-utils_src_prepare
 }
 
 # @FUNCTION: kde5_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     6f3024821de970e4ebe6a9a5b2dea4d9a8ed484e
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 17:57:34 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 17:57:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6f302482

eclass: Mark KDE Frameworks 5.18 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1e429f2..66dbc5d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.18.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     8ee7d85a98bfd8c4d6fc38dfc178777fee9c0474
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 16:53:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 16:53:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ee7d85a

kde5-functions.eclass: raise minimal frameworks version

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 844e913..7b021d2 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.14.0}
+: ${FRAMEWORKS_MINIMAL:=5.15.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     180f69882ead17458b92d89040329d543a1afa3c
Author:     Lorenzo Porta <vindex17 <AT> outlook <DOT> it>
AuthorDate: Sat Jan  9 14:24:20 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 15:16:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=180f6988

eclass: KDE Frameworks 5.18 has been released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7b2936e..27bebb4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.18.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     1670a634382e82b240609f4085e119a4d3be83f1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 08:17:23 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 08:17:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1670a634

Revert "eclass: KDE Frameworks 5.18 has been released"

This reverts commit 180f69882ead17458b92d89040329d543a1afa3c.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 27bebb4..7b2936e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.18.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a48fe76547f79fed5d6d0fe3ef1030531c651143
Author:     Lorenzo Porta <vindex17 <AT> outlook <DOT> it>
AuthorDate: Sat Jan  9 14:24:20 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 15:09:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a48fe765

eclass: KDE Frameworks 5.18 has been released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7b2936e..27bebb4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.18.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     cc3b79128aafe55f48ac7b13882e2a503be45cac
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 09:33:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 09:33:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc3b7912

cmake-utils.eclass: use a proper if statement

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b9d11e9..ee08380 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -404,12 +404,12 @@ _modify-cmakelists() {
 _cleanup_cmake() {
 	: ${CMAKE_USE_DIR:=${S}}
 
-	[[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] && {
+	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
 		local name
 		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
 			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
 		done
-	}
+	fi
 
 	# check if CMakeLists.txt exist and if no then die
 	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     8a574293f723db5bca4f2823ffb333d6b32b8c3e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 10:04:41 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 10:04:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a574293

cmake-utils.eclass: simplify

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d0df4a2..5910360 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -128,7 +128,7 @@ case ${WANT_CMAKE} in
 	always)
 		;;
 	*)
-		! has "${EAPI:-0}" 2 3 4 5 && die "WANT_CMAKE is banned in EAPI 6 and later"
+		has "${EAPI:-0}" 2 3 4 5 || die "WANT_CMAKE is banned in EAPI 6 and later"
 		IUSE+=" ${WANT_CMAKE}"
 		CMAKEDEPEND+="${WANT_CMAKE}? ( "
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     546b40181517adf67e0da07c95cb784c1cb5c857
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 09:41:22 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 09:41:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=546b4018

cmake-utils.eclass: cleanup after applying patches

This avoids issues with patches not applying cleanly to vanilla sources when
backporting or upstreaming.

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ee08380..c0f9cc8 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -429,8 +429,8 @@ enable_cmake-utils_src_prepare() {
 	pushd "${S}" > /dev/null || die
 
 	if has "${EAPI:-0}" 6 ; then
-		_cleanup_cmake
 		default_src_prepare
+		_cleanup_cmake
 	fi
 
 	if has "${EAPI:-0}" 2 3 4 5 ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     793a6eb4cc71310ec882d072e67341269eab2607
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 09:56:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 09:56:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=793a6eb4

cmake-utils.eclass: reverse EAPI logic

Otherwise it will need updating for any new EAPI.

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index c0f9cc8..d0df4a2 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -428,7 +428,7 @@ enable_cmake-utils_src_prepare() {
 
 	pushd "${S}" > /dev/null || die
 
-	if has "${EAPI:-0}" 6 ; then
+	if ! has "${EAPI:-0}" 2 3 4 5 ; then
 		default_src_prepare
 		_cleanup_cmake
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d1240fd3f1d728761ab267ae474e77793ce72bf7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 09:29:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 09:29:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1240fd3

cmake-utils.eclass: update docs wrt WANT_CMAKE being banned in EAPI 6 and later

 eclass/cmake-utils.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 652cf53..b9d11e9 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -104,6 +104,8 @@ CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
 # This is useful when only part of application is using cmake build system.
 # Valid values are: always [default], optional (where the value is the useflag
 # used for optionality)
+#
+# This is banned in EAPI 6 and later.
 : ${WANT_CMAKE:=always}
 
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b54d1207a26c3688d00909812b51666e546c2fea
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 10:17:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 10:17:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b54d1207

cmake-utils.eclass: simplify

 eclass/cmake-utils.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5910360..4a72306 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -431,9 +431,7 @@ enable_cmake-utils_src_prepare() {
 	if ! has "${EAPI:-0}" 2 3 4 5 ; then
 		default_src_prepare
 		_cleanup_cmake
-	fi
-
-	if has "${EAPI:-0}" 2 3 4 5 ; then
+	else
 		debug-print "$FUNCNAME: PATCHES=$PATCHES"
 		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2877de01c0c22ff813972b5bef920c4a1a274f17
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 11:07:59 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:07:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2877de01

cmake-utils.eclass: require two arguments for cmake-utils_use_find_package in EAPI 6 and later

This will allow us to remove the capitalisation variants code later.

 eclass/cmake-utils.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 4a72306..bd5b448 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -285,14 +285,20 @@ cmake-utils_use_with() { _use_me_now WITH_ "$@" ; }
 cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_find_package
-# @USAGE: <USE flag> [flag name]
+# @USAGE: <USE flag> <package name>
 # @DESCRIPTION:
 # Based on use_enable. See ebuild(5).
 #
 # `cmake-utils_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
 # This can be used to make find_package optional.
-cmake-utils_use_find_package() { _use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ; }
+cmake-utils_use_find_package() {
+	if ! has "${EAPI:-0}" 2 3 4 5 && [[ "$#" != 2 ]] ; then
+		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
+	fi
+
+	_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
+}
 
 # @FUNCTION: cmake-utils_use_disable
 # @USAGE: <USE flag> [flag name]

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     888d393fddc51f57cff2457403f738fa37f3ed44
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 11:08:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:08:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=888d393f

cmake-utils.eclass: remove duplicate CMAKE_REMOVE_MODULES

 eclass/cmake-utils.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index bd5b448..ee6098e 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -64,7 +64,6 @@ _CMAKE_UTILS_ECLASS=1
 # @DESCRIPTION:
 # Do we want to remove anything? yes or whatever else for no
 : ${CMAKE_REMOVE_MODULES:=yes}
-CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     27d9b2c35be819c77cc42edea9f894a4ef04782b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 11:48:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:48:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=27d9b2c3

cmake-utils.eclass: ban helper functions in EAPI 6 and later

 eclass/cmake-utils.eclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ee6098e..0190ae4 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -161,6 +161,11 @@ unset CMAKEDEPEND
 _use_me_now() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	local arg=$2
+	[[ ! -z $3 ]] && arg=$3
+
+	has "${EAPI:-0}" 2 3 4 5 || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead"
+
 	local uper capitalised x
 	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
 	if [[ ! -z $3 ]]; then
@@ -178,6 +183,13 @@ _use_me_now() {
 _use_me_now_inverted() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	local arg=$2
+	[[ ! -z $3 ]] && arg=$3
+
+	if ! has "${EAPI:-0}" 2 3 4 5 && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
+		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss"
+	fi
+
 	local uper capitalised x
 	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
 	if [[ ! -z $3 ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7004cb2a9495df36057a8add504b61103dfc838a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 12:01:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 12:01:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7004cb2a

cmake-utils.eclass: replace replace comment_add_subdirectory with a namespaced version

 eclass/cmake-utils.eclass | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 0190ae4..dea35fd 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -262,11 +262,11 @@ _generator_to_use() {
 	echo ${generator_name}
 }
 
-# @FUNCTION: comment_add_subdirectory
+# @FUNCTION: cmake_comment_add_subdirectory
 # @USAGE: <subdirectory>
 # @DESCRIPTION:
 # Comment out an add_subdirectory call in CMakeLists.txt in the current directory
-comment_add_subdirectory() {
+cmake_comment_add_subdirectory() {
         if [[ -z ${1} ]]; then
                 die "comment_add_subdirectory must be passed the directory name to comment"
         fi
@@ -277,6 +277,17 @@ comment_add_subdirectory() {
         fi
 }
 
+# @FUNCTION: comment_add_subdirectory
+# @USAGE: <subdirectory>
+# @DESCRIPTION:
+# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
+# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
+comment_add_subdirectory() {
+	has "${EAPI:-0}" 2 3 4 5 || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
+
+	cmake_comment_add_subdirectory "$@"
+}
+
 # @FUNCTION: cmake-utils_use_with
 # @USAGE: <USE flag> [flag name]
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a3f4587c3248f4def9a667303dec55df3d6012f8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 12:32:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 12:32:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3f4587c

cmake-utils.eclass: namespace some functions

 eclass/cmake-utils.eclass | 70 +++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index dea35fd..63ab8e6 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -158,7 +158,7 @@ DEPEND="${CMAKEDEPEND}"
 unset CMAKEDEPEND
 
 # Internal functions used by cmake-utils_use_*
-_use_me_now() {
+_cmake_use_me_now() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local arg=$2
@@ -180,7 +180,7 @@ _use_me_now() {
 		done
 	fi
 }
-_use_me_now_inverted() {
+_cmake_use_me_now_inverted() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local arg=$2
@@ -206,7 +206,7 @@ _use_me_now_inverted() {
 }
 
 # Determine using IN or OUT source build
-_check_build_dir() {
+_cmake_check_build_dir() {
 	: ${CMAKE_USE_DIR:=${S}}
 	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
 		# we build in source dir
@@ -238,7 +238,7 @@ _check_build_dir() {
 }
 
 # Determine which generator to use
-_generator_to_use() {
+_cmake_generator_to_use() {
 	local generator_name
 
 	case ${CMAKE_MAKEFILE_GENERATOR} in
@@ -295,7 +295,7 @@ comment_add_subdirectory() {
 #
 # `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
 # and -DWITH_FOO=OFF if it is disabled.
-cmake-utils_use_with() { _use_me_now WITH_ "$@" ; }
+cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_enable
 # @USAGE: <USE flag> [flag name]
@@ -304,7 +304,7 @@ cmake-utils_use_with() { _use_me_now WITH_ "$@" ; }
 #
 # `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
 # and -DENABLE_FOO=OFF if it is disabled.
-cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; }
+cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_find_package
 # @USAGE: <USE flag> <package name>
@@ -319,7 +319,7 @@ cmake-utils_use_find_package() {
 		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
 	fi
 
-	_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
+	_cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
 }
 
 # @FUNCTION: cmake-utils_use_disable
@@ -329,7 +329,7 @@ cmake-utils_use_find_package() {
 #
 # `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
 # and -DDISABLE_FOO=ON if it is disabled.
-cmake-utils_use_disable() { _use_me_now_inverted DISABLE_ "$@" ; }
+cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_no
 # @USAGE: <USE flag> [flag name]
@@ -338,7 +338,7 @@ cmake-utils_use_disable() { _use_me_now_inverted DISABLE_ "$@" ; }
 #
 # `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
 # and -DNO_FOO=ON if it is disabled.
-cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; }
+cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_want
 # @USAGE: <USE flag> [flag name]
@@ -347,7 +347,7 @@ cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; }
 #
 # `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
 # and -DWANT_FOO=OFF if it is disabled.
-cmake-utils_use_want() { _use_me_now WANT_ "$@" ; }
+cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_build
 # @USAGE: <USE flag> [flag name]
@@ -356,7 +356,7 @@ cmake-utils_use_want() { _use_me_now WANT_ "$@" ; }
 #
 # `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
 # and -DBUILD_FOO=OFF if it is disabled.
-cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; }
+cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_has
 # @USAGE: <USE flag> [flag name]
@@ -365,7 +365,7 @@ cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; }
 #
 # `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
 # and -DHAVE_FOO=OFF if it is disabled.
-cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; }
+cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_use
 # @USAGE: <USE flag> [flag name]
@@ -374,7 +374,7 @@ cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; }
 #
 # `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
 # and -DUSE_FOO=OFF if it is disabled.
-cmake-utils_use_use() { _use_me_now USE_ "$@" ; }
+cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use
 # @USAGE: <USE flag> [flag name]
@@ -383,7 +383,7 @@ cmake-utils_use_use() { _use_me_now USE_ "$@" ; }
 #
 # `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
 # and -DFOO=OFF if it is disabled.
-cmake-utils_use() { _use_me_now "" "$@" ; }
+cmake-utils_use() { _cmake_use_me_now "" "$@" ; }
 
 # @FUNCTION: cmake-utils_useno
 # @USAGE: <USE flag> [flag name]
@@ -392,11 +392,11 @@ cmake-utils_use() { _use_me_now "" "$@" ; }
 #
 # `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
 # and -DNOFOO=ON if it is disabled.
-cmake-utils_useno() { _use_me_now_inverted "" "$@" ; }
+cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; }
 
 # Internal function for modifying hardcoded definitions.
 # Removes dangerous definitions that override Gentoo settings.
-_modify-cmakelists() {
+_cmake_modify-cmakelists() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# Only edit the files once
@@ -429,7 +429,7 @@ _modify-cmakelists() {
 
 # temporary function for moving cmake cleanups from from src_configure -> src_prepare.
 # bug #378850
-_cleanup_cmake() {
+_cmake_cleanup_cmake() {
 	: ${CMAKE_USE_DIR:=${S}}
 
 	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
@@ -448,7 +448,7 @@ _cleanup_cmake() {
 	fi
 
 	# Remove dangerous things.
-	_modify-cmakelists
+	_cmake_modify-cmakelists
 }
 
 enable_cmake-utils_src_prepare() {
@@ -458,7 +458,7 @@ enable_cmake-utils_src_prepare() {
 
 	if ! has "${EAPI:-0}" 2 3 4 5 ; then
 		default_src_prepare
-		_cleanup_cmake
+		_cmake_cleanup_cmake
 	else
 		debug-print "$FUNCNAME: PATCHES=$PATCHES"
 		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
@@ -488,9 +488,9 @@ enable_cmake-utils_src_prepare() {
 enable_cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	has "${EAPI:-0}" 2 3 4 5 && _cleanup_cmake
+	has "${EAPI:-0}" 2 3 4 5 && _cmake_cleanup_cmake
 
-	_check_build_dir
+	_cmake_check_build_dir
 
 	# Fix xdg collision with sandbox
 	local -x XDG_CONFIG_HOME="${T}"
@@ -627,7 +627,7 @@ enable_cmake-utils_src_configure() {
 	local cmakeargs=(
 		${warn_unused_cli}
 		-C "${common_config}"
-		-G "$(_generator_to_use)"
+		-G "$(_cmake_generator_to_use)"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
@@ -676,11 +676,11 @@ _ninjaopts_from_makeopts() {
 	export NINJAOPTS="${ninjaopts[*]}"
 }
 
-# @FUNCTION: ninja_src_make
+# @FUNCTION: _cmake_ninja_src_make
 # @INTERNAL
 # @DESCRIPTION:
 # Build the package using ninja generator
-ninja_src_make() {
+_cmake_ninja_src_make() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
@@ -697,11 +697,11 @@ ninja_src_make() {
 	"$@" || die
 }
 
-# @FUNCTION: emake_src_make
+# @FUNCTION: _cmake_emake_src_make
 # @INTERNAL
 # @DESCRIPTION:
 # Build the package using make generator
-emake_src_make() {
+_cmake_emake_src_make() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
@@ -721,7 +721,7 @@ emake_src_make() {
 cmake-utils_src_make() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	_check_build_dir
+	_cmake_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 
 	${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
@@ -732,7 +732,7 @@ cmake-utils_src_make() {
 enable_cmake-utils_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	_check_build_dir
+	_cmake_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
 
@@ -763,7 +763,7 @@ enable_cmake-utils_src_test() {
 enable_cmake-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	_check_build_dir
+	_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
@@ -777,7 +777,7 @@ enable_cmake-utils_src_install() {
 # @DESCRIPTION:
 # Apply ebuild and user patches.
 cmake-utils_src_prepare() {
-	_execute_optionally "src_prepare" "$@"
+	_cmake_execute_optionally "src_prepare" "$@"
 }
 
 # @FUNCTION: cmake-utils_src_configure
@@ -785,7 +785,7 @@ cmake-utils_src_prepare() {
 # General function for configuring with cmake. Default behaviour is to start an
 # out-of-source build.
 cmake-utils_src_configure() {
-	_execute_optionally "src_configure" "$@"
+	_cmake_execute_optionally "src_configure" "$@"
 }
 
 # @FUNCTION: cmake-utils_src_compile
@@ -793,25 +793,25 @@ cmake-utils_src_configure() {
 # General function for compiling with cmake.
 # Automatically detects the build type. All arguments are passed to emake.
 cmake-utils_src_compile() {
-	_execute_optionally "src_compile" "$@"
+	_cmake_execute_optionally "src_compile" "$@"
 }
 
 # @FUNCTION: cmake-utils_src_test
 # @DESCRIPTION:
 # Function for testing the package. Automatically detects the build type.
 cmake-utils_src_test() {
-	_execute_optionally "src_test" "$@"
+	_cmake_execute_optionally "src_test" "$@"
 }
 
 # @FUNCTION: cmake-utils_src_install
 # @DESCRIPTION:
 # Function for installing the package. Automatically detects the build type.
 cmake-utils_src_install() {
-	_execute_optionally "src_install" "$@"
+	_cmake_execute_optionally "src_install" "$@"
 }
 
 # Optionally executes phases based on WANT_CMAKE variable/USE flag.
-_execute_optionally() {
+_cmake_execute_optionally() {
 	local phase="$1" ; shift
 	if [[ ${WANT_CMAKE} = always ]]; then
 		enable_cmake-utils_${phase} "$@"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     f8aa9aee095d9fe8965e6b7bf0e6f646f1caf807
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 07:37:06 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 07:37:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8aa9aee

cmake-utils.eclass: fix function call

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 63ab8e6..9e8e71e 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -724,7 +724,7 @@ cmake-utils_src_make() {
 	_cmake_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 
-	${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
+	_cmake_${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
 
 	popd > /dev/null || die
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a2bc47560788d337ca67c6d31981670885fa3a4a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 13:19:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 13:19:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2bc4756

kde5.eclass: comment_add_subdirectory -> cmake_comment_add_subdirectory

 eclass/kde5.eclass | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 27bebb4..2bee51d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -453,12 +453,12 @@ kde5_src_prepare() {
 
 	# only build examples when required
 	if ! use_if_iuse examples || ! use examples ; then
-		comment_add_subdirectory examples
+		cmake_comment_add_subdirectory examples
 	fi
 
 	# only enable handbook when required
 	if ! use_if_iuse handbook ; then
-		comment_add_subdirectory ${KDE_DOC_DIR}
+		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
 
 		if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
 			punt_bogus_dep KF5 DocTools
@@ -476,7 +476,7 @@ kde5_src_prepare() {
 						rm -rf ${lang}
 					fi
 					if [[ -e CMakeLists.txt ]] ; then
-						comment_add_subdirectory ${lang}
+						cmake_comment_add_subdirectory ${lang}
 					fi
 				fi
 			done
@@ -487,7 +487,7 @@ kde5_src_prepare() {
 			pushd ${KDE_DOC_DIR} > /dev/null || die
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
-					comment_add_subdirectory ${lang}
+					cmake_comment_add_subdirectory ${lang}
 				fi
 			done
 			popd > /dev/null || die
@@ -498,7 +498,7 @@ kde5_src_prepare() {
 
 	# in frameworks, tests = manual tests so never build them
 	if [[ ${CATEGORY} = kde-frameworks ]]; then
-		comment_add_subdirectory tests
+		cmake_comment_add_subdirectory tests
 	fi
 
 	case ${KDE_PUNT_BOGUS_DEPS} in
@@ -518,13 +518,13 @@ kde5_src_prepare() {
 		if [[ ${KDE_TEST} = forceoptional ]] ; then
 			punt_bogus_dep Qt5 Test
 			# if forceoptional, also cover non-kde categories
-			comment_add_subdirectory autotests
-			comment_add_subdirectory test
-			comment_add_subdirectory tests
+			cmake_comment_add_subdirectory autotests
+			cmake_comment_add_subdirectory test
+			cmake_comment_add_subdirectory tests
 		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
-			comment_add_subdirectory autotests
-			comment_add_subdirectory test
-			comment_add_subdirectory tests
+			cmake_comment_add_subdirectory autotests
+			cmake_comment_add_subdirectory test
+			cmake_comment_add_subdirectory tests
 		fi
 	fi
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e6f44a0b54f1dcdd5585cb136ebf57ffad956a4b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 13:22:06 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 13:22:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6f44a0b

kde5.eclass: VIRTUALX_COMMAND -> virtx

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2bee51d..a5451db 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -590,7 +590,7 @@ kde5_src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
 
 	if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then
-		VIRTUALX_COMMAND="_test_runner" virtualmake
+		virtx _test_runner
 	else
 		_test_runner
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b4bdbde037b8e65eaa694f1d59aab7772149386a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 20:16:56 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 16:29:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b4bdbde0

cmake-utils.eclass: Use bash internal testing instead of has()

 eclass/cmake-utils.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 9e8e71e..292d0ae 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -127,7 +127,7 @@ case ${WANT_CMAKE} in
 	always)
 		;;
 	*)
-		has "${EAPI:-0}" 2 3 4 5 || die "WANT_CMAKE is banned in EAPI 6 and later"
+		[[ ${EAPI} == [2345] ]] || die "WANT_CMAKE is banned in EAPI 6 and later"
 		IUSE+=" ${WANT_CMAKE}"
 		CMAKEDEPEND+="${WANT_CMAKE}? ( "
 		;;
@@ -164,7 +164,7 @@ _cmake_use_me_now() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	has "${EAPI:-0}" 2 3 4 5 || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead"
+	[[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead"
 
 	local uper capitalised x
 	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
@@ -186,7 +186,7 @@ _cmake_use_me_now_inverted() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	if ! has "${EAPI:-0}" 2 3 4 5 && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
+	if [[ ${EAPI} != [2345] ]] && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
 		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss"
 	fi
 
@@ -283,7 +283,7 @@ cmake_comment_add_subdirectory() {
 # Comment out an add_subdirectory call in CMakeLists.txt in the current directory
 # Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
 comment_add_subdirectory() {
-	has "${EAPI:-0}" 2 3 4 5 || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
+	[[ ${EAPI} == [2345] ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
 
 	cmake_comment_add_subdirectory "$@"
 }
@@ -315,7 +315,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
 # This can be used to make find_package optional.
 cmake-utils_use_find_package() {
-	if ! has "${EAPI:-0}" 2 3 4 5 && [[ "$#" != 2 ]] ; then
+	if [[ ${EAPI} != [2345] ]] && [[ "$#" != 2 ]] ; then
 		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
 	fi
 
@@ -456,7 +456,7 @@ enable_cmake-utils_src_prepare() {
 
 	pushd "${S}" > /dev/null || die
 
-	if ! has "${EAPI:-0}" 2 3 4 5 ; then
+	if [[ ${EAPI} != [2345] ]]; then
 		default_src_prepare
 		_cmake_cleanup_cmake
 	else
@@ -488,7 +488,7 @@ enable_cmake-utils_src_prepare() {
 enable_cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	has "${EAPI:-0}" 2 3 4 5 && _cmake_cleanup_cmake
+	[[ ${EAPI} == [2345] ]] && _cmake_cleanup_cmake
 
 	_cmake_check_build_dir
 
@@ -564,7 +564,7 @@ enable_cmake-utils_src_configure() {
 		fi
 	fi
 
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && local EPREFIX=
+	[[ ${EAPI} == 2 ]] && ! use prefix && local EPREFIX=
 
 	if [[ ${EPREFIX} ]]; then
 		cat >> "${build_rules}" <<- _EOF_ || die
@@ -604,7 +604,7 @@ enable_cmake-utils_src_configure() {
 	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
 	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
 		if [[ -n "${mycmakeargstype}" ]] ; then
-			if has "${EAPI:-0}" 2 3 4 5 ; then
+			if [[ ${EAPI} == [2345] ]]; then
 				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
 			else
 				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     62beda086e835d7f6f2d0e2176cd0cedb2e72e94
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 07:50:20 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 16:30:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=62beda08

cmake-utils.eclass: Merge consecutive [[ ]] into single [[ ]]

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 99c0f76..a5704c1 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -185,7 +185,7 @@ _cmake_use_me_now_inverted() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	if [[ ${EAPI} != [2345] ]] && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
+	if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
 		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss"
 	fi
 
@@ -314,7 +314,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
 # This can be used to make find_package optional.
 cmake-utils_use_find_package() {
-	if [[ ${EAPI} != [2345] ]] && [[ "$#" != 2 ]] ; then
+	if [[ ${EAPI} != [2345] && "$#" != 2 ]] ; then
 		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5014d233d76af82abf48b40715b3ea4c899e4180
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 20:21:41 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 16:30:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5014d233

cmake-utils.eclass: Drop empty line

 eclass/cmake-utils.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 292d0ae..99c0f76 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -20,7 +20,6 @@
 if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
 _CMAKE_UTILS_ECLASS=1
 
-
 # @ECLASS-VARIABLE: BUILD_DIR
 # @DESCRIPTION:
 # Build directory where all cmake processed files should be generated.

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     09550eaa2c31fd1723fe79f6cd005411d611880b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 10:00:43 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 10:00:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=09550eaa

kde5.eclass: sort eclass inherits

This should be safe because we already export almost every phase function.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a5451db..2218212 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -19,7 +19,7 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit kde5-functions fdo-mime flag-o-matic gnome2-utils versionator virtualx eutils cmake-utils
+inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     82b1bdcc1fe9c333b7cf2e3990badb4ee5229c22
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 10:04:24 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 10:04:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=82b1bdcc

kde5.eclass: port from fdo-mime to xdg

This will ensure that both the desktop database and the mime database will
always be updated, with the added benefit that the update will only be
triggered if the relevant files are installed.

 eclass/kde5.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2218212..70437b1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -19,7 +19,7 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx
+inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@@ -627,6 +627,7 @@ kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 # @FUNCTION: kde5_pkg_postinst
@@ -636,7 +637,7 @@ kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_pkg_postinst
 }
 
 # @FUNCTION: kde5_pkg_postrm
@@ -646,7 +647,7 @@ kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_pkg_postrm
 }
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7e4a53919ff347857cb86bddc887f686185831cb
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jan  7 17:40:12 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 16:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e4a5391

kde5-functions.eclass: Introduce add_qt_dep for consistent Qt version deps

_add_kdecategory_dep -> _add_category_dep

 eclass/kde5-functions.eclass | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7b021d2..f8b3b30 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -93,11 +93,12 @@ _check_gcc_version() {
 	fi
 }
 
-# @FUNCTION: _add_kdecategory_dep
+# @FUNCTION: _add_category_dep
 # @INTERNAL
 # @DESCRIPTION:
-# Implementation of add_plasma_dep and add_frameworks_dep.
-_add_kdecategory_dep() {
+# Implementation of add_plasma_dep, add_frameworks_dep, add_kdeapps_dep,
+# and finally, add_qt_dep.
+_add_category_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local category=${1}
@@ -145,7 +146,7 @@ add_frameworks_dep() {
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
-	_add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}"
+	_add_category_dep kde-frameworks "${1}" "${2}" "${version}"
 }
 
 # @FUNCTION: add_plasma_dep
@@ -171,7 +172,7 @@ add_plasma_dep() {
 		version=${PLASMA_MINIMAL}
 	fi
 
-	_add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}"
+	_add_category_dep kde-plasma "${1}" "${2}" "${version}"
 }
 
 # @FUNCTION: add_kdeapps_dep
@@ -202,7 +203,31 @@ add_kdeapps_dep() {
 		fi
 	fi
 
-	_add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"
+	_add_category_dep kde-apps "${1}" "${2}" "${version}"
+}
+
+# @FUNCTION: add_qt_dep
+# @USAGE: <package> [USE flags] [minimum version]
+# @DESCRIPTION:
+# Create proper dependency for dev-qt/ dependencies.
+# This takes 1 to 3 arguments. The first being the package name, the optional
+# second is additional USE flags to append, and the optional third is the
+# version to use instead of the automatic version (use sparingly).
+# The output of this should be added directly to DEPEND/RDEPEND, and may be
+# wrapped in a USE conditional (but not an || conditional without an extra set
+# of parentheses).
+add_qt_dep() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local version
+
+	if [[ -n ${3} ]]; then
+		version=${3}
+	elif [[ -z "${version}" ]] ; then
+		version=${QT_MINIMAL}
+	fi
+
+	_add_category_dep dev-qt "${1}" "${2}" "${version}"
 }
 
 # @FUNCTION: get_kde_version

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5154158068ef1eba7e5b4f5f52ee0f1370eff7b5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jan  7 17:59:00 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 16:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=51541580

kde5.eclass: Set QT_MINIMAL=5.5.0 for >=Plasma-5.5 globally

 eclass/kde5.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 70437b1..46ac15e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,6 +152,12 @@ case ${KDE_AUTODEPS} in
 			esac
 		fi
 
+		if [[ ${CATEGORY} = kde-plasma ]]; then
+			if [[ ${PV} = 5.5* || ${PV} = 9999 ]]; then
+				QT_MINIMAL=5.5.0
+			fi
+		fi
+
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     87f295e2e641ffb819c6746e35e6ba9a87d108a0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jan  7 17:12:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 16:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=87f295e2

kde4-meta.eclass: Synchronise with tree

 eclass/kde4-meta.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 3a90f50..816f20a 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -28,7 +28,7 @@ case ${KMNAME} in
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
 				IUSE+=" +kontact"
-				RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact) )"
+				RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact '' ${PV}) )"
 				;;
 		esac
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b99f8c46537a20bd6ad08b56007a193fb2e5627e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 22:50:20 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 16:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b99f8c46

kde5-functions.eclass: add_category_dep: Implement slot/op override

Also fixes subslot awareness.

 eclass/kde5-functions.eclass | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f8b3b30..932c2b8 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -105,7 +105,7 @@ _add_category_dep() {
 	local package=${2}
 	local use=${3}
 	local version=${4}
-	local slot=
+	local slot=${5}
 
 	if [[ -n ${use} ]] ; then
 		local use="[${use}]"
@@ -116,8 +116,10 @@ _add_category_dep() {
 		local version="-$(get_version_component_range 1-3 ${version})"
 	fi
 
-	if [[ ${SLOT} = 4 || ${SLOT} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
-		slot=":${SLOT}"
+	if [[ -n ${slot} ]] ; then
+		slot=":${slot}"
+	elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
+		slot=":${SLOT%\/*}"
 	fi
 
 	echo " ${operator}${category}/${package}${version}${slot}${use}"
@@ -210,9 +212,11 @@ add_kdeapps_dep() {
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for dev-qt/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -227,7 +231,7 @@ add_qt_dep() {
 		version=${QT_MINIMAL}
 	fi
 
-	_add_category_dep dev-qt "${1}" "${2}" "${version}"
+	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: get_kde_version

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     92872d197f5987e8db47c109c91b49930dfbc813
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 23:16:58 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:16:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=92872d19

kde5-functions.eclass: add_{frameworks,plasma,kdeapps}_dep slot overrides

 eclass/kde5-functions.eclass | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 932c2b8..d87ca20 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -129,9 +129,11 @@ _add_category_dep() {
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-frameworks/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -148,16 +150,18 @@ add_frameworks_dep() {
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
-	_add_category_dep kde-frameworks "${1}" "${2}" "${version}"
+	_add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_plasma_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-base/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -174,16 +178,18 @@ add_plasma_dep() {
 		version=${PLASMA_MINIMAL}
 	fi
 
-	_add_category_dep kde-plasma "${1}" "${2}" "${version}"
+	_add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_kdeapps_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
 # Create proper dependency for kde-apps/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
+# This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
+# version to use instead of the automatic version (use sparingly). In addition,
+# the optional fourth argument defines slot+operator instead of automatic slot
+# (use even more sparingly).
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
@@ -205,7 +211,7 @@ add_kdeapps_dep() {
 		fi
 	fi
 
-	_add_category_dep kde-apps "${1}" "${2}" "${version}"
+	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_qt_dep

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     087c0e5e2cf57727544c0341c62cf36e5a455016
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb  7 02:27:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 12:32:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=087c0e5e

kde5.eclass: Mark KDE Frameworks 5.19 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 46ac15e..f7d3f9d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.19.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     f7652f74c8d8f829331abee94224b93f225f4857
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 19:30:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 02:30:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f7652f74

cmake-utils.eclass: drop findutils dep #262965

The forced upgrade has been moved to @system now.

 eclass/cmake-utils.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index a5704c1..b607132 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -149,8 +149,6 @@ if [[ ${PN} != cmake ]]; then
 	CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
 fi
 
-CMAKEDEPEND+=" userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
 [[ ${WANT_CMAKE} = always ]] || CMAKEDEPEND+=" )"
 
 DEPEND="${CMAKEDEPEND}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     045255f14351b361533e88f43ea8417442db940a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 16:13:33 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 16:13:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=045255f1

kde5.eclass: kde-frameworks-5.19.0 has been released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f7d3f9d..46ac15e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -121,7 +121,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.19.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     12e2d26591873fad08b40ec6a4f274771bc9cc76
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb  3 15:04:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:09:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=12e2d265

kde4-base.eclass: Sync with tree

 eclass/kde4-base.eclass | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 5ca6083..139163a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -366,7 +366,11 @@ case ${KDE_HANDBOOK} in
 		[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
 		;;
 	optional)
-		IUSE+=" +handbook"
+		if [[ ${PN} == kdesu ]] ; then
+			IUSE+=" handbook"
+		else
+			IUSE+=" +handbook"
+		fi
 		kdedepend+=" handbook? ( ${kdehandbookdepend} )"
 		[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
 		;;
@@ -458,7 +462,7 @@ _calculate_src_uri() {
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
 				4.11.19)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
 				4.11.22)
 					# Part of 15.08.0 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
@@ -467,19 +471,19 @@ _calculate_src_uri() {
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
 				4.14.8)
 					# Part of 15.04.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.13)
-					# Part of 15.08.2 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.2/src/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				4.14.14)
 					# Part of 15.08.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.3/src/${_kmname_pv}.tar.xz" ;;
 				4.14.15)
 					# Part of 15.12.0 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.0/src/${_kmname_pv}.tar.xz" ;;
+				4.14.16)
+					# Part of 15.12.1 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d95367385c236196261aa4fb105d11423d9e7e3b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb  3 16:18:34 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:09:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9536738

kde4-meta.eclass: Support tar.gz snapshot from git

 eclass/kde4-meta.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 816f20a..ba7114d 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -185,6 +185,9 @@ kde4-meta_src_extract() {
 		if [[ ${PV} =~ 4.4.11 ]]; then
 			postfix="bz2"
 			KMTARPARAMS+=" --bzip2"
+		elif [[ ${PV} =~ _pre ]]; then
+			postfix="gz"
+			KMTARPARAMS+=" --gz"
 		else
 			postfix="xz"
 			KMTARPARAMS+=" --xz"
@@ -198,6 +201,9 @@ kde4-meta_src_extract() {
 		# Detect real toplevel dir from tarball name - it will be used upon extraction
 		# and in _list_needed_subdirectories
 		topdir="${tarball%.tar.*}/"
+		if [[ ${topdir} =~ _pre ]]; then
+			topdir="${topdir%-$PV*}/"
+		fi
 
 		ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7ffc412e866dee9dec52adb91660878b9ef83fd3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb  3 15:04:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:09:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ffc412e

kde4-functions.eclass: Sync with tree

 eclass/kde4-functions.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 917f04b..174cc93 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -294,7 +294,8 @@ add_kdeapps_dep() {
 		ver=${KDE_MINIMAL}
 	# if building kde-apps, live master or stable-live branch,
 	# use the final SC version since there are no further general releases.
-	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
+	# except when it is kdepim split packages, which rely on same-version deps
+	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]] && [[ ${KMNAME} != "kdepim" ]]; then
 		ver=4.14.3
 	else
 		ver=${PV}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e538c7d3f2c9c7de1d9e8b49abaf8670c6bc980c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 16:35:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:35:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e538c7d3

kde5-functions.eclass: sync with main tree

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d87ca20..ffdac91 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.15.0}
+: ${FRAMEWORKS_MINIMAL:=5.17.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d97ec781672da62b186a74122c1bee149852b3ba
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 23:06:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 14:23:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d97ec781

kde5.eclass: Implement split kdepim.git handling

 eclass/kde5.eclass | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 46ac15e..db3d440 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -101,6 +101,19 @@ else
 	: ${KDE_TEST:=false}
 fi
 
+# @ECLASS-VARIABLE: KDE_PIM_KEEP_SUBDIR
+# @DESCRIPTION:
+# If building a split package from KMNAME="kdepim", provide a list of
+# subdirectories that need to be present for a successful build.
+: ${KDE_PIM_KEEP_SUBDIR:=}
+
+# @ECLASS-VARIABLE: KDE_PIM_KONTACTPLUGIN
+# @DESCRIPTION:
+# This variable is used when building a split package from KMNAME="kdepim".
+# If set to "true", add "+kontact" to IUSE and add the appropriate dependency.
+# If set to "false", find plugin subdir and remove it from build.
+: ${KDE_PIM_KONTACTPLUGIN:=false}
+
 # @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -208,6 +221,14 @@ case ${KDE_HANDBOOK} in
 		;;
 esac
 
+case ${KDE_PIM_KONTACTPLUGIN} in
+	true)
+		IUSE+=" +kontact"
+		DEPEND+=" $(add_kdeapps_dep kontactinterface)"
+		;;
+	*)	;;
+esac
+
 case ${KDE_TEST} in
 	false)	;;
 	*)
@@ -533,6 +554,63 @@ kde5_src_prepare() {
 			cmake_comment_add_subdirectory tests
 		fi
 	fi
+
+	# kdepim split packaging handling (drop other applications != {PN})
+	if [[ ${KMNAME} = "kdepim" && $(basename "${S}") != ${PN} ]] || [[ ${PN} = "kdepim" ]] ; then
+		# make optional a lot of otherwise required dependencies in root CMakeLists.txt
+		sed -e "/find_package(KF5/ s/ REQUIRED//" \
+			-e "/find_package(Qt5 / s/ REQUIRED/ OPTIONAL_COMPONENTS/" \
+			-i CMakeLists.txt || die "Failed to make dependencies optional"
+		# FIXME: try to push these down into subdirs @upstream
+		# AkonadiSearch:	kaddressbook, knotes, kdepim (kmail, korganizer)
+		# Boost: 			kleopatra, kdepim (kmail, agents)
+		# Gpgme: 			kleopatra
+		# Grantlee:			akregator, kaddressbook, knotes, kdepim (grantleeeditor, kmail, kontact)
+		# MailTransportDBusService: kdepim (kmail)
+		# Phonon4Qt5:		kdepim (kalarm, korgac)
+		sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
+			-e "/set_package_properties(Boost/ s/ REQUIRED/ OPTIONAL/" \
+			-e "/find_package(Gpgme/ s/ REQUIRED//" \
+			-e "/find_package(Grantlee5/ s/ REQUIRED//" \
+			-e "/find_package(MailTransportDBusService/ s/ REQUIRED//" \
+			-e "/find_package(Phonon4Qt5/ s/ REQUIRED//" \
+			-i CMakeLists.txt || die "Failed to make dependencies optional"
+
+		# remove anything else not listed here
+		local _pim_keep_subdir="${PN} ${KDE_PIM_KEEP_SUBDIR}"
+		einfo "Building: ${_pim_keep_subdir}"
+		_pim_keep_subdir="cmake doc examples grantlee-extractor-pot-scripts ${_pim_keep_subdir}"
+
+		einfo "Removing other subdirectories:"
+		pushd "${S}" > /dev/null || die
+		for subdir in *; do
+			if ! has ${subdir} ${_pim_keep_subdir} ; then
+				if [[ -d "${subdir}" ]] ; then
+					einfo "   ${subdir}"
+					rm -r ${subdir} || die "Failed to remove ${subdir} application"
+					cmake_comment_add_subdirectory ${subdir}
+				fi
+			fi
+		done
+		popd > /dev/null || die
+
+		# disable build of kontactplugin in kdepim and split kdepim packages
+		if ! use_if_iuse kontact ; then
+			for x in $(find ./ -name CMakeLists.txt -exec grep -l "add_subdirectory.*kontactplugin" "{}" ";"); do
+				einfo "Disabling kontactplugin in: ${x}"
+				pushd $(dirname "${x}") > /dev/null || die
+				cmake_comment_add_subdirectory kontactplugin
+				popd > /dev/null || die
+			done
+		fi
+	fi
+
+	# only build select handbook
+	if [[ ${KMNAME} = "kdepim" && $(basename "${S}") != ${PN} ]] ; then
+		if use_if_iuse handbook && [[ -e doc/CMakeLists.txt ]] ; then
+			echo "add_subdirectory(${PN})" > doc/CMakeLists.txt
+		fi
+	fi
 }
 
 # @FUNCTION: kde5_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     69fcc8953aadc6eefd7650ef02fafe1b30235017
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb 24 21:16:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 21:18:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=69fcc895

cmake-utils.eclass: Fix typo

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b607132..12b8dff 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -184,7 +184,7 @@ _cmake_use_me_now_inverted() {
 	[[ ! -z $3 ]] && arg=$3
 
 	if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
-		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss"
+		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead"
 	fi
 
 	local uper capitalised x

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     bb5339a52c9cee5767dad0b294fb2f8a08074bdb
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Feb 29 17:19:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 17:19:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb5339a5

kde5.eclass: Split KDE PIM: Take out xsltproc requirement

 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index db3d440..c8d4b5e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -570,6 +570,7 @@ kde5_src_prepare() {
 		# Phonon4Qt5:		kdepim (kalarm, korgac)
 		sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
 			-e "/set_package_properties(Boost/ s/ REQUIRED/ OPTIONAL/" \
+			-e "/set_package_properties(Xsltproc/ s/ REQUIRED/ OPTIONAL/" \
 			-e "/find_package(Gpgme/ s/ REQUIRED//" \
 			-e "/find_package(Grantlee5/ s/ REQUIRED//" \
 			-e "/find_package(MailTransportDBusService/ s/ REQUIRED//" \

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     3bb4a6ac957e45757ed2077b9d003dd5cc9810c6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar  2 00:19:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 00:19:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bb4a6ac

kde5.eclass: Drop KDE_SCM=svn support

It's not used by any kf5 based ebuild anymore.

 eclass/kde5-functions.eclass |  2 +-
 eclass/kde5.eclass           | 31 -------------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ffdac91..ea894ad 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -63,7 +63,7 @@ debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
 : ${KDE_SCM:=git}
 
 case ${KDE_SCM} in
-	svn|git) ;;
+	git) ;;
 	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
 esac
 

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c8d4b5e..7d764b2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -23,7 +23,6 @@ inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
-		svn) inherit subversion ;;
 		git) inherit git-r3 ;;
 	esac
 fi
@@ -331,33 +330,6 @@ _calculate_live_repo() {
 	SRC_URI=""
 
 	case ${KDE_SCM} in
-		svn)
-			# @ECLASS-VARIABLE: ESVN_MIRROR
-			# @DESCRIPTION:
-			# This variable allows easy overriding of default kde mirror service
-			# (anonsvn) with anything else you might want to use.
-			ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
-
-			local branch_prefix="trunk/KDE"
-
-			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-				branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
-			fi
-
-			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-				branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
-			fi
-
-			local _kmname
-
-			if [[ -n ${KMNAME} ]]; then
-				_kmname=${KMNAME}
-			else
-				_kmname=${PN}
-			fi
-
-			ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
-			;;
 		git)
 			# @ECLASS-VARIABLE: EGIT_MIRROR
 			# @DESCRIPTION:
@@ -458,9 +430,6 @@ kde5_src_unpack() {
 
 	if [[ ${KDE_BUILD_TYPE} = live ]]; then
 		case ${KDE_SCM} in
-			svn)
-				subversion_src_unpack
-				;;
 			git)
 				git-r3_src_unpack
 				;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     574f419bdcee365eded0da7ac35960abe0bab35a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar  2 00:38:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 00:57:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=574f419b

kde5.eclass: Convert to add_qt_dep

 eclass/kde5.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7d764b2..10ae0dd 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -43,7 +43,7 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_co
 # @ECLASS-VARIABLE: KDE_BLOCK_SLOT4
 # @DESCRIPTION:
 # This variable is used when KDE_AUTODEPS is set.
-# If set to "true", add RDEPEND block on kde-{base,apps}/${PN}:4
+# If set to "true", add RDEPEND block on kde-apps/${PN}:4
 : ${KDE_BLOCK_SLOT4:=true}
 
 # @ECLASS-VARIABLE: KDE_DEBUG
@@ -172,7 +172,7 @@ case ${KDE_AUTODEPS} in
 
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
-		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"
+		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
@@ -232,7 +232,7 @@ case ${KDE_TEST} in
 	false)	;;
 	*)
 		IUSE+=" test"
-		DEPEND+=" test? ( >=dev-qt/qttest-${QT_MINIMAL}:5 )"
+		DEPEND+=" test? ( $(add_qt_dep qttest) )"
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     20444166ed5f3f0c2caf9ca6906ebaccaca251d3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar  2 00:30:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 00:56:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=20444166

kde5-functions.eclass: Drop KDEBASE for other than kdevelop

- No kde-base/ package is using kde5.eclass
- CATEGORY is used as distinction between kde-{apps,frameworks.plasma}

 eclass/kde5-functions.eclass | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ea894ad..0a6a434 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,13 +45,9 @@ esac
 
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
-# This gets set to a non-zero value when a package is considered a kde or
+# This gets set to a non-zero value when a package is considered a
 # kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base ]]; then
-	KDEBASE=kde-base
-elif [[ ${CATEGORY} = kde-frameworks ]]; then
-	KDEBASE=kde-frameworks
-elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
+if [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	KDEBASE=kdevelop
 fi
 
@@ -156,7 +152,7 @@ add_frameworks_dep() {
 # @FUNCTION: add_plasma_dep
 # @USAGE: <package> [USE flags] [minimum version]
 # @DESCRIPTION:
-# Create proper dependency for kde-base/ dependencies.
+# Create proper dependency for kde-plasma/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
 # second is additional USE flags to append, and the optional third is the
 # version to use instead of the automatic version (use sparingly). In addition,

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     ee7c14f190336bedc2648a26fceb137fc5ead728
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar  2 01:40:00 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 02:16:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee7c14f1

kde5.eclass: Don't delete po/*.po files, only when not in LINGUAS

 eclass/kde5.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 10ae0dd..b065315 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -467,13 +467,13 @@ kde5_src_prepare() {
 		if [[ -d po ]] ; then
 			pushd po > /dev/null || die
 			for lang in *; do
-				if ! has ${lang} ${LINGUAS} ; then
-					if [[ ${lang} != CMakeLists.txt ]] ; then
-						rm -rf ${lang}
-					fi
+				if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
+					rm -r ${lang} || die
 					if [[ -e CMakeLists.txt ]] ; then
 						cmake_comment_add_subdirectory ${lang}
 					fi
+				elif ! has ${lang/.po/} ${LINGUAS} ; then
+					rm ${lang} || die
 				fi
 			done
 			popd > /dev/null || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     f66fd822d05eebd2bbfc1f0870b89047d5e81c11
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Feb 29 23:42:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 15:13:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f66fd822

kde5.eclass: Split KDE PIM: Do more forcefully remove deps

 eclass/kde5.eclass | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b065315..2ccbf6e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -532,20 +532,25 @@ kde5_src_prepare() {
 			-i CMakeLists.txt || die "Failed to make dependencies optional"
 		# FIXME: try to push these down into subdirs @upstream
 		# AkonadiSearch:	kaddressbook, knotes, kdepim (kmail, korganizer)
-		# Boost: 			kleopatra, kdepim (kmail, agents)
-		# Gpgme: 			kleopatra
+		# Gpgme: 			kleopatra (removed in >= 16.03.80)
 		# Grantlee:			akregator, kaddressbook, knotes, kdepim (grantleeeditor, kmail, kontact)
-		# MailTransportDBusService: kdepim (kmail)
-		# Phonon4Qt5:		kdepim (kalarm, korgac)
 		sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
-			-e "/set_package_properties(Boost/ s/ REQUIRED/ OPTIONAL/" \
 			-e "/set_package_properties(Xsltproc/ s/ REQUIRED/ OPTIONAL/" \
 			-e "/find_package(Gpgme/ s/ REQUIRED//" \
 			-e "/find_package(Grantlee5/ s/ REQUIRED//" \
-			-e "/find_package(MailTransportDBusService/ s/ REQUIRED//" \
-			-e "/find_package(Phonon4Qt5/ s/ REQUIRED//" \
 			-i CMakeLists.txt || die "Failed to make dependencies optional"
 
+		# Boost: kdepim (kmail, mailfilteragent)
+		# MailTransportDBusService: kdepim (kmail)
+		# Phonon4Qt5: kdepim (kalarm, korgac)
+		if [[ ${PN} != "kdepim" ]] ; then
+			sed -e "/find_package(Boost/ s/^/#DONT/" \
+				-e "/set_package_properties(Boost/ s/^/#DONT/" \
+				-e "/find_package(MailTransportDBusService/ s/^/#DONT/" \
+				-e "/find_package(Phonon4Qt5/ s/^/#DONT/" \
+				-i CMakeLists.txt || die "Failed to disable dependencies"
+		fi
+
 		# remove anything else not listed here
 		local _pim_keep_subdir="${PN} ${KDE_PIM_KEEP_SUBDIR}"
 		einfo "Building: ${_pim_keep_subdir}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     722d9edd91e0e9d466a2a2be7fe967ee14bfb951
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 11:55:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 11:58:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=722d9edd

kde5.eclass: mark kde-frameworks-5.20.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2ccbf6e..bddb0bc 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -133,7 +133,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.20.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     aeb762f669db6537a11fbad31d0ebaf337d019a6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 19:03:57 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 19:04:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aeb762f6

kde5-functions.eclass: improve punt_bogus_deps

This extends coverage to individual components such as find_package(KF5DocTools).
It also improves cleaning up of empty find_package calls such as find_package(KF5).

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 0a6a434..34a7c92 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -260,7 +260,7 @@ punt_bogus_dep() {
 	local prefix=${1}
 	local dep=${2}
 
-	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 
 	# pcregrep returns non-zero on no matches/error
 	if [[ $? != 0 ]] ; then
@@ -274,7 +274,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/I d" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\s*\(REQUIRED\)*\s*\(COMPONENTS\)*\s*)/I d" -i CMakeLists.txt || die
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     735b2854aa3c17dda12d5f4d7e27188eddd52aae
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Mar  8 17:32:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 16:26:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=735b2854

kde5.eclass: Use "optional" parameter for KDE_TEST and KDE_HANDBOOK

 eclass/kde5.eclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bddb0bc..4a7c7d5 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -79,6 +79,8 @@ fi
 # If set to "false", do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
 # generate and install KDE handbook.
+# If set to "optional", config with -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
+# when USE=!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.
 : ${KDE_HANDBOOK:=false}
@@ -92,6 +94,8 @@ fi
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5.
+# If set to "optional", configure with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON
+# when USE=!test.
 # If set to "forceoptional", remove a Qt5Test dependency from the root
 # CMakeLists.txt in addition to the above.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
@@ -603,6 +607,14 @@ kde5_src_configure() {
 
 	if ! use_if_iuse test ; then
 		cmakeargs+=( -DBUILD_TESTING=OFF )
+
+		if [[ ${KDE_TEST} = optional ]] ; then
+			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON )
+		fi
+	fi
+
+	if ! use_if_iuse handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then
+		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON )
 	fi
 
 	# install mkspecs in the same directory as qt stuff

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     77c78c53ab331d8427db04a7842e676dbc32669d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 10:21:47 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 10:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=77c78c53

eclass: Raise Qt min version to 5.5.1

 eclass/kde5.eclass | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4a7c7d5..8f6ff37 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -32,7 +32,7 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_co
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.4.2}
+: ${QT_MINIMAL:=5.5.1}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
@@ -168,12 +168,6 @@ case ${KDE_AUTODEPS} in
 			esac
 		fi
 
-		if [[ ${CATEGORY} = kde-plasma ]]; then
-			if [[ ${PV} = 5.5* || ${PV} = 9999 ]]; then
-				QT_MINIMAL=5.5.0
-			fi
-		fi
-
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     9e7ad5e59cac8862a7b01006ee96e990dec5de63
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 10:32:16 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 10:32:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9e7ad5e5

eclass: Raise frameworks min version

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 34a7c92..2da4456 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.17.0}
+: ${FRAMEWORKS_MINIMAL:=5.18.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     37d930efe8f43e4b6f5bbe9d51677f3d530a19f6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 20:16:29 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 12:35:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=37d930ef

kde5.eclass: Don't remove CMakeLists.txt in po directory

 eclass/kde5.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8f6ff37..6b737fe 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -471,7 +471,9 @@ kde5_src_prepare() {
 						cmake_comment_add_subdirectory ${lang}
 					fi
 				elif ! has ${lang/.po/} ${LINGUAS} ; then
-					rm ${lang} || die
+					if [[ ${lang} != CMakeLists.txt ]] ; then
+						rm ${lang} || die
+					fi
 				fi
 			done
 			popd > /dev/null || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     03088cff7d1fe3391b0058856f847df1fa1c353c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 13 00:05:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 16:50:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=03088cff

kde5.eclass: Frameworks 5.20 was released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6b737fe..ea8f7cc 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.20.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Maciej Mrozowski]

commit:     5ce63b4c46f35ea8134b29b30690dbd43d4feed4
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 01:09:00 2016 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 01:09:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ce63b4c

kde4-base.eclass: Sync SRC_URI additions from portage

 eclass/kde4-base.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a71b950..9f5bf09 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -487,6 +487,9 @@ _calculate_src_uri() {
 				4.14.17)
 					# Part of 15.12.2 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.2/src/${_kmname_pv}.tar.xz" ;;
+				15.04.3)
+					# Files moved to Attic
+					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
@@ -499,6 +502,7 @@ _calculate_src_uri() {
 		kdevelop|kdevelop-php*|kdevplatform)
 			case ${KDEVELOP_VERSION} in
 				4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
+				4.7.3) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
 				*) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
 			esac
 			;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     96280cc01f95b3376506157731e7b4a1a958ee37
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 06:16:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 06:16:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=96280cc0

cmake-utils.eclass: replace spaces with tabs

 eclass/cmake-utils.eclass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 12b8dff..5f7bb81 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -264,14 +264,14 @@ _cmake_generator_to_use() {
 # @DESCRIPTION:
 # Comment out an add_subdirectory call in CMakeLists.txt in the current directory
 cmake_comment_add_subdirectory() {
-        if [[ -z ${1} ]]; then
-                die "comment_add_subdirectory must be passed the directory name to comment"
-        fi
-
-        if [[ -e "CMakeLists.txt" ]]; then
-                sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
-                        -i CMakeLists.txt || die "failed to comment add_subdirectory(${1})"
-        fi
+	if [[ -z ${1} ]]; then
+		die "comment_add_subdirectory must be passed the directory name to comment"
+	fi
+
+	if [[ -e "CMakeLists.txt" ]]; then
+		sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
+			-i CMakeLists.txt || die "failed to comment add_subdirectory(${1})"
+	fi
 }
 
 # @FUNCTION: comment_add_subdirectory

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     fb1fb6aa00d3875a655c570122b1907229c14fdc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 17:10:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 17:14:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb1fb6aa

kde5.eclass: mask kde-plasma-5.6.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ea8f7cc..9400f37 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.6.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7c4c0680a6ed69d242eddf7e614b59e0e27206f1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 12:16:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 12:16:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c4c0680

kde5.eclass: kde-plasma-5.6.0 is released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9400f37..ea8f7cc 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.6.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6a842b75825a439bf7c9ee11ad9686a5d163f3d3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 16:02:01 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 16:02:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a842b75

kde5.eclass: check for ninja with ROOT=/

Gentoo-bug: 577244

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5f7bb81..ebcb631 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -242,7 +242,7 @@ _cmake_generator_to_use() {
 		ninja)
 			# 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 ! has_version dev-util/ninja; then
+			if ! ROOT=/ has_version dev-util/ninja; then
 				die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
 			fi
 			generator_name="Ninja"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     159d675c90e084b6294e72e983c7d92d27c69836
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 17:46:24 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 17:47:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=159d675c

kde5-functions.eclass: Update EAPI description

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2da4456..11bfcd4 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -17,7 +17,7 @@ inherit toolchain-funcs versionator
 
 # @ECLASS-VARIABLE: EAPI
 # @DESCRIPTION:
-# Currently EAPI 5 is supported.
+# Currently EAPI 5 and 6 is supported.
 case ${EAPI} in
 	5|6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a4026dd03a9556f1cd4f6466c0807281171320cf
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 18:24:51 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 18:24:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a4026dd0

kde4-functions.eclass: Initial EAPI 6 support

 eclass/kde4-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 174cc93..8c2fa4a 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -17,9 +17,9 @@ inherit versionator
 
 # @ECLASS-VARIABLE: EAPI
 # @DESCRIPTION:
-# Currently kde4 eclasses support EAPI 5.
+# Currently kde4 eclasses support EAPI 5 and 6.
 case ${EAPI} in
-	5) : ;;
+	5|6) : ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2e928981d894753c9d604b79bb9d0f790f6c7825
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 10:43:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 10:43:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e928981

kde5-functions.eclass: typo

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 11bfcd4..be336be 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -35,7 +35,7 @@ esac
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
-# Minimal KDE Applicaions version to require for the package.
+# Minimal KDE Applications version to require for the package.
 : ${KDE_APPS_MINIMAL:=14.12.0}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     eb435028ba3ed7e7c3c5852e77437dabe1b1db3b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:40:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 17:41:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb435028

kde5.eclass: improve test support for extra-cmake-modules

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ea8f7cc..b1a3cfc 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -493,7 +493,7 @@ kde5_src_prepare() {
 	fi
 
 	# in frameworks, tests = manual tests so never build them
-	if [[ ${CATEGORY} = kde-frameworks ]]; then
+	if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then
 		cmake_comment_add_subdirectory tests
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     548b6e14ccefcd3f6fd83a0843948bd48c9bb04e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:56:55 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 17:58:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=548b6e14

kde5.eclass: Improve translation handling

Do not remove unconditionally po file for non release versions.

 eclass/kde5.eclass | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b1a3cfc..d5b7f85 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -461,24 +461,24 @@ kde5_src_prepare() {
 
 	# enable only the requested translations
 	# when required
-	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
-		if [[ -d po ]] ; then
-			pushd po > /dev/null || die
-			for lang in *; do
-				if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
-					rm -r ${lang} || die
-					if [[ -e CMakeLists.txt ]] ; then
-						cmake_comment_add_subdirectory ${lang}
-					fi
-				elif ! has ${lang/.po/} ${LINGUAS} ; then
-					if [[ ${lang} != CMakeLists.txt ]] ; then
-						rm ${lang} || die
-					fi
+	if [[ -d po ]] ; then
+		pushd po > /dev/null || die
+		for lang in *; do
+			if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
+				rm -r ${lang} || die
+				if [[ -e CMakeLists.txt ]] ; then
+					cmake_comment_add_subdirectory ${lang}
 				fi
-			done
-			popd > /dev/null || die
-		fi
+			elif ! has ${lang/.po/} ${LINGUAS} ; then
+				if [[ ${lang} != CMakeLists.txt ]] ; then
+					rm ${lang} || die
+				fi
+			fi
+		done
+		popd > /dev/null || die
+	fi
 
+	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
 		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
 			pushd ${KDE_DOC_DIR} > /dev/null || die
 			for lang in *; do
@@ -488,8 +488,6 @@ kde5_src_prepare() {
 			done
 			popd > /dev/null || die
 		fi
-	else
-		rm -rf po
 	fi
 
 	# in frameworks, tests = manual tests so never build them

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     fc7874e57902b2470160447b9f5efd629505a0bb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 17:03:29 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 17:03:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc7874e5

kde5.eclass: raise kde-apps/kde4-l10n blocker for Plasma 5.6

Gentoo-bug: 578568

 eclass/kde5.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d5b7f85..21444f2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -173,9 +173,15 @@ case ${KDE_AUTODEPS} in
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
+			local blocked_version=15.08.0-r1
+
+			if [[ ${CATEGORY} = kde-plasma && $(get_version_component_range 2) -ge 6 ]]; then
+				blocked_version=15.12.3-r1
+			fi
+
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
-				!<kde-apps/kde4-l10n-15.08.0-r1
+				!<kde-apps/kde4-l10n-${blocked_version}
 			"
 		fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a3279a9de24b54ca6f29d23a1452cc89a33aa4f9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Mar 25 15:34:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 14:53:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3279a9d

kde4-base.eclass: Remove obsolete SRC_URI

 eclass/kde4-base.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 3fab577..a1385de 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -478,9 +478,6 @@ _calculate_src_uri() {
 				4.14.16)
 					# Part of 15.12.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
-				4.14.17)
-					# Part of 15.12.2 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.12.2/src/${_kmname_pv}.tar.xz" ;;
 				4.14.18)
 					# Part of 15.12.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.3/src/${_kmname_pv}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     cb35d321cc212cad142032935526d6b146f4ec83
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Mar 15 16:03:30 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 14:53:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cb35d321

kde4-base.eclass: Add SRC_URI for 4.14.18

 eclass/kde4-base.eclass | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 9f5bf09..3fab577 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -475,18 +475,15 @@ _calculate_src_uri() {
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.14)
-					# Part of 15.08.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.15)
-					# Part of 15.12.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.12.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.16)
 					# Part of 15.12.1 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
 				4.14.17)
 					# Part of 15.12.2 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.12.2/src/${_kmname_pv}.tar.xz" ;;
+				4.14.18)
+					# Part of 15.12.3 actually, sigh. Not stable for next release!
+					SRC_URI="mirror://kde/stable/applications/15.12.3/src/${_kmname_pv}.tar.xz" ;;
 				15.04.3)
 					# Files moved to Attic
 					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a7412717be5c406a710dea221d4927ce904e4f53
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 20:16:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 20:16:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7412717

eclass: Mark KDE Frameworks 5.21.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 21444f2..ed426b5 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.21.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     ca38654b2b785d1468532ed315386b519f61cc77
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 16:49:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 16:49:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca38654b

kde5-functions.eclass: improve single line dependencny handling

Thanks to Arfrever.

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index be336be..1b882d4 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -274,7 +274,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\s*\(REQUIRED\)*\s*\(COMPONENTS\)*\s*)/I d" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     28ec150a82a01be385fc26d07995a9fd30cbf45c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Apr  7 12:32:01 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 13:30:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=28ec150a

kde5.eclass: Add warning for kf5 applications in Plasma-4

Copied and adapted from kde4-base.eclass.

 eclass/kde5.eclass | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ed426b5..4c264d0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -709,6 +709,23 @@ kde5_pkg_postinst() {
 
 	gnome2_icon_cache_update
 	xdg_pkg_postinst
+
+	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+			echo
+			einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}"
+			einfo "Use it at your own risk."
+			einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+		fi
+		# for kf5-based applications tell user that he SHOULD NOT be using kde-base/plasma-workspace
+		if [[ ${KDEBASE} != kde-base || ${CATEGORY} = kde-apps ]]  && \
+				has_version 'kde-base/plasma-workspace'; then
+			echo
+			ewarn "WARNING! Your system configuration still contains \"kde-base/plasma-workspace\","
+			ewarn "indicating a Plasma 4 setup. With this setting you are unsupported by KDE team."
+			ewarn "Please consider upgrading to Plasma 5."
+		fi
+	fi
 }
 
 # @FUNCTION: kde5_pkg_postrm

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     92c399440dbaaaaadc80669da9c7f7722b71e896
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 19:20:05 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:20:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=92c39944

kde5-functions.eclass: further dependency punting improvements

This now handles the case of 'find_package(Qt5 REQUIRED COMPONENTS )'.

Thanks again to Arfrever.

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 1b882d4..44bc296 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -274,7 +274,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     14a2310c62950c7e4d3eeaf10b4358b588298fbf
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 10:48:29 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 10:49:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14a2310c

eclass: Mark KDE Frameworks 5.21 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4c264d0..ae95079 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.21.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     53fadb5b122aa19cadcacf613838aed4b2236d53
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 19:00:39 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:00:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=53fadb5b

kde5.eclass: drop minimal gcc requirement for kde-frameworks

This will be used in a future commit for reducing the number of time-consuming
gcc version checks.

 eclass/kde5-functions.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 44bc296..dbcb229 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -41,7 +41,12 @@ esac
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DESCRIPTION:
 # Minimal GCC version to require for the package.
-: ${KDE_GCC_MINIMAL:=4.8}
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+	: ${KDE_GCC_MINIMAL:=4.5}
+else
+	: ${KDE_GCC_MINIMAL:=4.8}
+fi
+
 
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     06222905d1a08a809f3ba050cdc0d2ce30dccd5c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 19:15:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 19:15:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=06222905

kde5.eclass: merge type is already checked in _check_gcc_version

 eclass/kde5.eclass | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ae95079..5d2dc14 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -381,9 +381,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 # Do some basic settings
 kde5_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_gcc_version
-	fi
+	_check_gcc_version
 }
 
 # @FUNCTION: kde5_pkg_setup
@@ -391,9 +389,7 @@ kde5_pkg_pretend() {
 # Do some basic settings
 kde5_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_gcc_version
-	fi
+	_check_gcc_version
 }
 
 # @FUNCTION: kde5_pkg_nofetch

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     dc5edd5d4ea11ea4e87c0d5388460633a51fb696
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 20:30:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 20:30:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc5edd5d

kde5.eclass: don't run pkg_pretend for kde-frameworks

Merely exporting the phase function is very expensive, even if nothing useful
is done inside it.

Frameworks are supposed to support GCC 4.5 at a minimum which is old enough to
make it safe enough to omit the check.

 eclass/kde5.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5d2dc14..953a640 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -27,7 +27,11 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	esac
 fi
 
-EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+if [[ ${CATEGORY} != kde-frameworks ]]; then
+	EXPORT_FUNCTIONS pkg_pretend
+fi
+
+EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     b929ab7671758432d6fbb6044a27c3edfcba2424
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 09:47:00 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 09:47:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b929ab76

eclass: Mark KDE Applications 16.04.0 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a1385de..668737a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -171,7 +171,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-16.04.0 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 953a640..b46870b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -141,7 +141,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-16.04.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     90fa28d6bf712ab5eb6ca2939b8af801787d62b0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 16 18:54:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 17:56:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=90fa28d6

kde4-base.eclass: Cleanup SRC_URIs

 eclass/kde4-base.eclass | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 668737a..d73087c 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -470,19 +470,10 @@ _calculate_src_uri() {
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
 				4.14.8)
-					# Part of 15.04.1 actually, sigh. Not stable for next release!
+					# Part of 15.04.1 actually, sigh. Used by kdelibs and KDE PIM 4.
 					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
 				4.14.10)
-					# Part of 15.04.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.16)
-					# Part of 15.12.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
-				4.14.18)
-					# Part of 15.12.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.12.3/src/${_kmname_pv}.tar.xz" ;;
-				15.04.3)
-					# Files moved to Attic
+					# Part of 15.04.3 actually, sigh. Used by last version of KDE PIM 4.
 					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     c0285bfaff84e2ed16c6d3853703cdccbbf8b1ec
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 14:47:11 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 14:47:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0285bfa

eclass: Mark KDE Applications 16.04.0 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d73087c..9c91b83 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -171,7 +171,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-16.04.0 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b46870b..953a640 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -141,7 +141,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-16.04.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     dfa316fb58c13845c6fe90c1d179964ea2174fbd
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Apr 17 21:51:57 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 17:50:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfa316fb

kde5.eclass: KDE PIM split: Gpgme not required anymore

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 953a640..7a01eef 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -536,11 +536,9 @@ kde5_src_prepare() {
 			-i CMakeLists.txt || die "Failed to make dependencies optional"
 		# FIXME: try to push these down into subdirs @upstream
 		# AkonadiSearch:	kaddressbook, knotes, kdepim (kmail, korganizer)
-		# Gpgme: 			kleopatra (removed in >= 16.03.80)
 		# Grantlee:			akregator, kaddressbook, knotes, kdepim (grantleeeditor, kmail, kontact)
 		sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
 			-e "/set_package_properties(Xsltproc/ s/ REQUIRED/ OPTIONAL/" \
-			-e "/find_package(Gpgme/ s/ REQUIRED//" \
 			-e "/find_package(Grantlee5/ s/ REQUIRED//" \
 			-i CMakeLists.txt || die "Failed to make dependencies optional"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     8e26815fb992d93a2d965f66af89a579048dd598
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 17:58:26 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 17:58:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e26815f

kde5.eclass: Drop translations when nls not wanted

Gentoo-bug: 580720

 eclass/kde5.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7a01eef..8dee37b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -465,6 +465,11 @@ kde5_src_prepare() {
 		fi
 	fi
 
+	# drop translations when nls is not wanted
+	if [[ -d po ]] && ! use_if_isue nls ; then
+		rm -rf po || die
+	fi
+
 	# enable only the requested translations
 	# when required
 	if [[ -d po ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     efc6d7c15a5db37be8afc4f678d66f63d7be1e6a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 23 22:22:39 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 17:30:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=efc6d7c1

kde5.eclass: Reshuffle kdepim split packaging handling

..into one legacy (16.04) block, keeping kontactplugin stuff for future

 eclass/kde5.eclass | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8dee37b..fb33249 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -533,8 +533,9 @@ kde5_src_prepare() {
 		fi
 	fi
 
-	# kdepim split packaging handling (drop other applications != {PN})
-	if [[ ${KMNAME} = "kdepim" && $(basename "${S}") != ${PN} ]] || [[ ${PN} = "kdepim" ]] ; then
+	# legacy (16.04) kdepim split packaging handling (drop other applications != {PN})
+	if [[ ${KMNAME} = "kdepim" && ${PV} = "16.04*" && $(basename "${S}") != ${PN} ]] || \
+			[[ ${PN} = "kdepim" ]] ; then
 		# make optional a lot of otherwise required dependencies in root CMakeLists.txt
 		sed -e "/find_package(KF5/ s/ REQUIRED//" \
 			-e "/find_package(Qt5 / s/ REQUIRED/ OPTIONAL_COMPONENTS/" \
@@ -547,15 +548,20 @@ kde5_src_prepare() {
 			-e "/find_package(Grantlee5/ s/ REQUIRED//" \
 			-i CMakeLists.txt || die "Failed to make dependencies optional"
 
-		# Boost: kdepim (kmail, mailfilteragent)
-		# MailTransportDBusService: kdepim (kmail)
-		# Phonon4Qt5: kdepim (kalarm, korgac)
 		if [[ ${PN} != "kdepim" ]] ; then
+			# Boost: kdepim (kmail, mailfilteragent)
+			# MailTransportDBusService: kdepim (kmail)
+			# Phonon4Qt5: kdepim (kalarm, korgac)
 			sed -e "/find_package(Boost/ s/^/#DONT/" \
 				-e "/set_package_properties(Boost/ s/^/#DONT/" \
 				-e "/find_package(MailTransportDBusService/ s/^/#DONT/" \
 				-e "/find_package(Phonon4Qt5/ s/^/#DONT/" \
 				-i CMakeLists.txt || die "Failed to disable dependencies"
+
+			# only build select handbook
+			if use_if_iuse handbook && [[ -e doc/CMakeLists.txt ]] ; then
+				echo "add_subdirectory(${PN})" > doc/CMakeLists.txt
+			fi
 		fi
 
 		# remove anything else not listed here
@@ -575,23 +581,16 @@ kde5_src_prepare() {
 			fi
 		done
 		popd > /dev/null || die
-
-		# disable build of kontactplugin in kdepim and split kdepim packages
-		if ! use_if_iuse kontact ; then
-			for x in $(find ./ -name CMakeLists.txt -exec grep -l "add_subdirectory.*kontactplugin" "{}" ";"); do
-				einfo "Disabling kontactplugin in: ${x}"
-				pushd $(dirname "${x}") > /dev/null || die
-				cmake_comment_add_subdirectory kontactplugin
-				popd > /dev/null || die
-			done
-		fi
 	fi
 
-	# only build select handbook
-	if [[ ${KMNAME} = "kdepim" && $(basename "${S}") != ${PN} ]] ; then
-		if use_if_iuse handbook && [[ -e doc/CMakeLists.txt ]] ; then
-			echo "add_subdirectory(${PN})" > doc/CMakeLists.txt
-		fi
+	# disable build of kontactplugin in split kdepim packages
+	if ! use_if_iuse kontact ; then
+		for x in $(find ./ -name CMakeLists.txt -exec grep -l "add_subdirectory.*kontactplugin" "{}" ";"); do
+			einfo "Disabling kontactplugin in: ${x}"
+			pushd $(dirname "${x}") > /dev/null || die
+			cmake_comment_add_subdirectory kontactplugin
+			popd > /dev/null || die
+		done
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     62a5e67b708df1d2929916e7f7d045e312b56a39
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 10:36:23 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 10:36:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=62a5e67b

kde5.eclass: Sync fix with main tree

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fb33249..d39e1b4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -466,7 +466,7 @@ kde5_src_prepare() {
 	fi
 
 	# drop translations when nls is not wanted
-	if [[ -d po ]] && ! use_if_isue nls ; then
+	if [[ -d po ]] && ! use_if_iuse nls ; then
 		rm -rf po || die
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     52088d62d0545e436fc86de216dac07438ec82f1
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Apr 25 15:52:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 05:52:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=52088d62

kde5.eclass: Fix recent change wrt split PIM 16.04.x

Gentoo-bug: 581176

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d39e1b4..71e5ad4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -534,7 +534,7 @@ kde5_src_prepare() {
 	fi
 
 	# legacy (16.04) kdepim split packaging handling (drop other applications != {PN})
-	if [[ ${KMNAME} = "kdepim" && ${PV} = "16.04*" && $(basename "${S}") != ${PN} ]] || \
+	if [[ ${KMNAME} = "kdepim" && ${PV} = 16.04* && $(basename "${S}") != ${PN} ]] || \
 			[[ ${PN} = "kdepim" ]] ; then
 		# make optional a lot of otherwise required dependencies in root CMakeLists.txt
 		sed -e "/find_package(KF5/ s/ REQUIRED//" \

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     26e68162be72f9c3ed0bd7408818818de2137b81
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 18:36:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 18:49:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=26e68162

kde5.eclass: improve handling of nls USE flag

Linguas was being removed unconditionally on packages without an nls USE flag.

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 71e5ad4..80f8a7d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -466,8 +466,8 @@ kde5_src_prepare() {
 	fi
 
 	# drop translations when nls is not wanted
-	if [[ -d po ]] && ! use_if_iuse nls ; then
-		rm -rf po || die
+	if [[ -d po ]] && in_iuse nls && ! use nls ; then
+		rm -r po || die
 	fi
 
 	# enable only the requested translations

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6902585d3513138b733307823be214b362b4a28b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 18:47:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 18:49:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6902585d

kde5-functions.eclass: drop EAPI 5 support

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index dbcb229..e95a9bc 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -19,7 +19,7 @@ inherit toolchain-funcs versionator
 # @DESCRIPTION:
 # Currently EAPI 5 and 6 is supported.
 case ${EAPI} in
-	5|6) ;;
+	6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0510e917c31b3097087f08d4932c8347ee1efaf9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 18:47:38 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 18:49:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0510e917

kde5.eclass: install all translations when LINGUAS is undefined

This mirrors the behaviour of the gettext autotools macros.

Gentoo-bug: 581382

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 80f8a7d..7620966 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -472,7 +472,7 @@ kde5_src_prepare() {
 
 	# enable only the requested translations
 	# when required
-	if [[ -d po ]] ; then
+	if [[ -d po && -v LINGUAS ]] ; then
 		pushd po > /dev/null || die
 		for lang in *; do
 			if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     bb48bd139b6c0dac9f89415d31b7e955a7e7d3fc
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Wed May  4 07:50:36 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May  5 10:25:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb48bd13

kde5.eclass: infer SRC_URI from KDEBASE and KMNAME

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5.eclass | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7620966..d755887 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -326,6 +326,17 @@ _calculate_src_uri() {
 			;;
 	esac
 
+	if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
+		case ${PV} in
+			*.*.[6-9]? )
+				SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz"
+				RESTRICT+=" mirror"
+				;;
+			*)
+				SRC_URI="mirror://kde/stable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
+		esac
+	fi
+
 	if _kde_is_unreleased ; then
 		RESTRICT+=" fetch"
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e2c42744b3e84744f914b718d7cb06e0489c2c87
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 14:13:57 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 11 14:16:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e2c42744

kde5.eclass: mark kde-frameworks-5.22 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9597a76..54c3e3d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -141,7 +141,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.22.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a976c8e79c6eb6f95009ffbb10e76f0215edf622
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu May 12 22:37:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 13 16:55:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a976c8e7

kde5.eclass: Drop KDE_PIM_KONTACTPLUGIN handling

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5.eclass | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 54c3e3d..0731fd8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -114,13 +114,6 @@ fi
 # subdirectories that need to be present for a successful build.
 : ${KDE_PIM_KEEP_SUBDIR:=}
 
-# @ECLASS-VARIABLE: KDE_PIM_KONTACTPLUGIN
-# @DESCRIPTION:
-# This variable is used when building a split package from KMNAME="kdepim".
-# If set to "true", add "+kontact" to IUSE and add the appropriate dependency.
-# If set to "false", find plugin subdir and remove it from build.
-: ${KDE_PIM_KONTACTPLUGIN:=false}
-
 # @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -230,14 +223,6 @@ case ${KDE_HANDBOOK} in
 		;;
 esac
 
-case ${KDE_PIM_KONTACTPLUGIN} in
-	true)
-		IUSE+=" +kontact"
-		DEPEND+=" $(add_kdeapps_dep kontactinterface)"
-		;;
-	*)	;;
-esac
-
 case ${KDE_TEST} in
 	false)	;;
 	*)
@@ -566,7 +551,7 @@ kde5_src_prepare() {
 		sed -e "/find_package(KF5/ s/ REQUIRED//" \
 			-e "/find_package(Qt5 / s/ REQUIRED/ OPTIONAL_COMPONENTS/" \
 			-i CMakeLists.txt || die "Failed to make dependencies optional"
-		# FIXME: try to push these down into subdirs @upstream
+
 		# AkonadiSearch:	kaddressbook, knotes, kdepim (kmail, korganizer)
 		# Grantlee:			akregator, kaddressbook, knotes, kdepim (grantleeeditor, kmail, kontact)
 		sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
@@ -607,16 +592,6 @@ kde5_src_prepare() {
 			fi
 		done
 		popd > /dev/null || die
-
-		# disable build of kontactplugin in split kdepim packages
-		if ! use_if_iuse kontact ; then
-			for x in $(find ./ -name CMakeLists.txt -exec grep -l "add_subdirectory.*kontactplugin" "{}" ";"); do
-				einfo "Disabling kontactplugin in: ${x}"
-				pushd $(dirname "${x}") > /dev/null || die
-				cmake_comment_add_subdirectory kontactplugin
-				popd > /dev/null || die
-			done
-		fi
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     222d9ac75b8e9c9c250c9551b8fb42b542d480b9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 16:47:34 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 15 16:47:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=222d9ac7

kde5.eclass: Mark KDE Frameworks 5.22.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0731fd8..afa25ad 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -134,7 +134,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.22.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a01648b82773e80c7d365d3e0ce9801d78bd1460
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 16:49:02 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 15 16:49:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a01648b8

kde5.eclass: Sync SRC_URI with tree

 eclass/kde5.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index afa25ad..c76a768 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -289,8 +289,7 @@ _calculate_src_uri() {
 		kjs | \
 		kjsembed | \
 		kmediaplayer | \
-		kross | \
-		krunner)
+		kross)
 			_kmname="portingAids/${_kmname}"
 			;;
 	esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     293219251d22a3a1d1304a6773d2a64ae40fa8cf
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 07:09:16 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 18 07:09:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=29321925

cmake-utils.eclass: enable CMAKE_WARN_UNUSED_CLI for EAPI 6

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ebcb631..427c13f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -87,7 +87,6 @@ _CMAKE_UTILS_ECLASS=1
 # 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:=no}
 
 # @ECLASS-VARIABLE: PREFIX
 # @DESCRIPTION:
@@ -113,7 +112,8 @@ _CMAKE_UTILS_ECLASS=1
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 case ${EAPI} in
-	2|3|4|5|6) : ;;
+	2|3|4|5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
+	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     009482c0fa763fd2b51c9905bf3c7d969585e84e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 13:57:27 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May 19 13:57:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=009482c0

kde5-functions.eclass: Bump FRAMEWORKS_MINIMAL to 5.21.0

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index e95a9bc..9fbc35b 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.18.0}
+: ${FRAMEWORKS_MINIMAL:=5.21.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     d55a44acec333adb64ab1d1e44b849034b625929
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 14:49:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May 19 14:49:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d55a44ac

kde4-base.eclass: Sync with tree

 eclass/kde4-base.eclass | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 9c91b83..50c5fda 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -160,7 +160,7 @@ KDE_HANDBOOK="${KDE_HANDBOOK:-never}"
 # translations. (Mostly all kde ebuilds does not ship documentation
 # and translations in live ebuilds)
 if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
-	# Kdebase actualy provides the handbooks even for live stuff
+	# Kdebase actually provides the handbooks even for live stuff
 	[[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never
 	KDE_LINGUAS=""
 fi
@@ -366,11 +366,14 @@ case ${KDE_HANDBOOK} in
 		[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
 		;;
 	optional)
-		if [[ ${PN} == kdesu ]] ; then
-			IUSE+=" handbook"
-		else
-			IUSE+=" +handbook"
-		fi
+		case ${PN} in
+			kcontrol | kdesu | knetattach)
+				_IUSE+=" handbook"
+				;;
+			*)
+				IUSE+=" +handbook"
+				;;
+		esac
 		kdedepend+=" handbook? ( ${kdehandbookdepend} )"
 		[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     8b20b921a20e0d87c7e4a731fecc4c0f9152910d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu May 19 15:16:48 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May 19 15:45:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b20b921

kde4-base.eclass: Fix typo

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 50c5fda..c859c10 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -368,7 +368,7 @@ case ${KDE_HANDBOOK} in
 	optional)
 		case ${PN} in
 			kcontrol | kdesu | knetattach)
-				_IUSE+=" handbook"
+				IUSE+=" handbook"
 				;;
 			*)
 				IUSE+=" +handbook"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     183e96bd765c095b35c15f4a1ede832805befbdd
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 19:22:40 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 20 19:22:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=183e96bd

kde5-functions.eclass: Update EAPI doc

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 9fbc35b..435c838 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -17,7 +17,7 @@ inherit toolchain-funcs versionator
 
 # @ECLASS-VARIABLE: EAPI
 # @DESCRIPTION:
-# Currently EAPI 5 and 6 is supported.
+# Currently EAPI 6 is supported.
 case ${EAPI} in
 	6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Maciej Mrozowski]

commit:     1085cb7bcc8d65bea15944e378b701d7851b15bc
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 14:36:24 2016 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat May 21 14:36:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1085cb7b

cmake-utils.eclass: Remove incorrect suggestions related to eclass functions removed since EAPI 6

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 427c13f..5958230 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -161,7 +161,7 @@ _cmake_use_me_now() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	[[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead"
+	[[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later"
 
 	local uper capitalised x
 	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
@@ -184,7 +184,7 @@ _cmake_use_me_now_inverted() {
 	[[ ! -z $3 ]] && arg=$3
 
 	if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
-		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead"
+		die "${FUNCNAME[1]} is banned in EAPI 6 and later"
 	fi
 
 	local uper capitalised x

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     3b17d658fe15cf1cee822168fb15522e47c487c5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 18:38:38 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 26 08:12:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b17d658

cmake-utils.eclass: _ninjaopts_from_makeopts, fix handling of -k

Fix _ninjaopts_from_makeopts to handle -k correctly. Make does not
support parameters to -k, while ninja requires one. Therefore, handle
only a single '-k' and convert it into '-k 0' (no limit of failing
tasks).

 eclass/cmake-utils.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5958230..d035e04 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -659,14 +659,19 @@ _ninjaopts_from_makeopts() {
 	set -- ${MAKEOPTS}
 	while (( $# )); do
 		case $1 in
-			-j|-l|-k)
+			-j|-l)
 				ninjaopts+=( $1 $2 )
 				shift 2
 				;;
-			-j*|-l*|-k*)
+			-j*|-l*)
 				ninjaopts+=( $1 )
 				shift 1
 				;;
+			-k)
+				# -k 0 = any number of tasks can fail
+				ninjaopts+=( $1 0 )
+				shift 1
+				;;
 			*) shift ;;
 		esac
 	done

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     583a1bead82e2a20d396c425a2d74b7b8f9b93a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 18:42:18 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 26 08:12:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=583a1bea

cmake-utils.eclass: _ninjaopts_from_makeopts, fix plain '-j' and '-l'

Fix the _ninjaopts_from_makeopts to handle no-parameter '-j' and '-l'
options correctly and convert them to appropriate parametrized ninja
options.

 eclass/cmake-utils.eclass | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d035e04..02b06bb 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -660,8 +660,19 @@ _ninjaopts_from_makeopts() {
 	while (( $# )); do
 		case $1 in
 			-j|-l)
-				ninjaopts+=( $1 $2 )
-				shift 2
+				if [[ $# -eq 1 || $2 == -* ]]; then
+					if [[ $1 == -j ]]; then
+						# absurdly high job limit
+						ninjaopts+=( $1 9999 )
+					else # -l
+						# remove load limit (like make does for -l)
+						ninjaopts+=( $1 0 )
+					fi
+					shift 1
+				else
+					ninjaopts+=( $1 $2 )
+					shift 2
+				fi
 				;;
 			-j*|-l*)
 				ninjaopts+=( $1 )

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     268e7cd79a2f511b5e134f1c5566c83e2f5935ac
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 13:44:03 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 13:51:18 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=268e7cd7

kde4-base.eclass: Fix test phase with virtual X and EAPI 6

Migrate to virtx function as old virtualmake is banned in EAPI 6, which
makes test phase fail for eclass consumers require virtual X.

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c859c10..1e5259a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -880,7 +880,7 @@ kde4-base_src_test() {
 			debug-print "           kde4-base.eclass docs for details... Applying workaround."
 			_test_runner
 		else
-			VIRTUALX_COMMAND="_test_runner" virtualmake
+			virtx _test_runner
 		fi
 	else
 		_test_runner

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     45eb4a9cd7843a95f2d19bef81703793fa0b3ee6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 07:16:10 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 07:16:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=45eb4a9c

kde4-meta-pkg.eclass: Remove

Not used in kde overlay anymore. Does not differ from in tree version.

 eclass/kde4-meta-pkg.eclass | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
deleted file mode 100644
index 19eb45d..0000000
--- a/eclass/kde4-meta-pkg.eclass
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: kde4-meta-pkg.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: This eclass contains boilerplate for kde 4.X meta packages
-# @DESCRIPTION:
-# This eclass should only be used for defining meta packages for KDE4.
-
-if [[ -z ${_KDE4_META_PKG_ECLASS} ]]; then
-_KDE4_META_PKG_ECLASS=1
-
-inherit kde4-functions
-
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-IUSE="aqua"
-
-SLOT=4
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     40df59420cf5e14a4fdb7e0b282c79322fa88f62
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 14 12:45:33 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 18:56:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=40df5942

kde5.eclass: Add handling of building plugins for Qt5Designer

KDE_DESIGNERPLUGIN toggles dependencies and configure with USE=designer

 eclass/kde5.eclass | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 522c814..39ac206 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -56,6 +56,13 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # Otherwise, add debug to IUSE to control building with that flag.
 : ${KDE_DEBUG:=true}
 
+# @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# Otherwise, add "designer" to IUSE to toggle build of designer plugins
+# and add the necessary DEPENDs.
+: ${KDE_DESIGNERPLUGIN:=false}
+
 # @ECLASS-VARIABLE: KDE_DOXYGEN
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -208,6 +215,17 @@ case ${KDE_DEBUG} in
 		;;
 esac
 
+case ${KDE_DESIGNERPLUGIN} in
+	false)  ;;
+	*)
+		IUSE+=" designer"
+		DEPEND+=" designer? (
+			$(add_frameworks_dep kdesignerplugin)
+			$(add_qt_dep designer)
+		)"
+		;;
+esac
+
 case ${KDE_EXAMPLES} in
 	false)  ;;
 	*)
@@ -619,6 +637,10 @@ kde5_src_configure() {
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON )
 	fi
 
+	if ! use_if_iuse designer ; then
+		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
+	fi
+
 	# install mkspecs in the same directory as qt stuff
 	cmakeargs+=(-DKDE_INSTALL_USE_QT_SYS_PATHS=ON)
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     50c8bc4ce880fbbb20ea4a0f62fe35a052de8354
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 21:04:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 21:04:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=50c8bc4c

kde5.eclass: Mark KDE Frameworks 5.23.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 39ac206..b13b11c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -141,7 +141,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.23.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     b5a59f28acd9cc9212a0ef39103251606777fa63
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 06:09:06 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 06:09:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5a59f28

kde5.eclass: Fix find designer plugin condition

Regression introduced in 40df59420cf5e14a4fdb7e0b282c79322fa88f62. New
global var for creating a designer use flag is per default false. If
designer use flag is not set, finding designer package is hard disabled
unconditionally.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b13b11c..81c660d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -637,7 +637,7 @@ kde5_src_configure() {
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON )
 	fi
 
-	if ! use_if_iuse designer ; then
+	if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     f67e010af76759039e645353736ce747489f6688
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jun  9 08:25:41 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 08:25:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f67e010a

kde5-functions.eclass: Improve punt_bogus_dep

The variable holding the min version requirement can be named anything.
This should catch most cases, most importantly Qt5 modules.

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 435c838..b20d406 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -279,7 +279,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4038b1ffdcf3c360aed4f154b5d691d64d52db46
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 15:11:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 15:12:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4038b1ff

cmake-utils.eclass: do not pass CMAKE_INSTALL_DO_STRIP in EAPI 6 and later

CMAKE_INSTALL_DO_STRIP does not appear to be widely used, so this is a good
opportunity to get rid of it.

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 02b06bb..bfd3581 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -628,7 +628,7 @@ enable_cmake-utils_src_configure() {
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		-DCMAKE_INSTALL_DO_STRIP=OFF
+		$([[ ${EAPI} == [2345] ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
 		-DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
 		"${MYCMAKEARGS}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     452aaeb2e3cabac15956e2800bae3ec2b6fe7683
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 10:16:46 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 10:16:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=452aaeb2

kde5.eclass: kde-frameworks-5.23.0 is released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 81c660d..ad0310d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -141,7 +141,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.23.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     9815a3ab5cd0e3d1cc75ec120e56dc3128a866cc
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 19:15:35 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 12:38:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9815a3ab

kde5.eclass: >=Plasma-5.6.5 depends on >=Qt-5.6.1

 eclass/kde5.eclass | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7b79342..ffae3fa 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -162,6 +162,15 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
+		if [[ ${CATEGORY} = kde-plasma ]]; then
+			if [[ $(get_version_component_range 2) -eq 6 && $(get_version_component_range 3) -ge 5 ]]; then
+				QT_MINIMAL=5.6.1
+			fi
+			if [[ $(get_version_component_range 2) -ge 7 || ${PV} = 9999 ]]; then
+				QT_MINIMAL=5.6.1
+			fi
+		fi
+
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			local blocked_version=15.08.0-r1
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b06415b6826cb1cc2fad24a80420da04fd4cb8fb
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 19:25:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 12:38:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b06415b6

kde5.eclass: >=Plasma-5.7 depends on >=Frameworks-5.23

 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ffae3fa..7616deb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -168,6 +168,7 @@ case ${KDE_AUTODEPS} in
 			fi
 			if [[ $(get_version_component_range 2) -ge 7 || ${PV} = 9999 ]]; then
 				QT_MINIMAL=5.6.1
+				FRAMEWORKS_MINIMAL=5.23.0
 			fi
 		fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     32fab6c7cb7973870229d7073da3f82c08fe92b0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 16:27:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 16:31:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32fab6c7

cmake-utils.eclass: echo ctest arguments

This mirrors the behaviour during src_configure where cmake and its arguments
are printed for clarity.

 eclass/cmake-utils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index bfd3581..4bd404d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -751,6 +751,7 @@ enable_cmake-utils_src_test() {
 
 	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
 
+	echo ctest "${myctestargs[@]}" "$@"
 	if ctest "${myctestargs[@]}" "$@" ; then
 		einfo "Tests succeeded."
 		popd > /dev/null || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     17e1d854dee85c16242babc34e7f925cbed726d3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 19:31:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 19:32:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=17e1d854

kde5-functions: die if too many arguments are passed to add_*_dep

This avoids bugs where too many arguments are passed by mistake, causing the
last one to be ignored.

For example, the subslot operator added in d1bc5ac3f0e42df0f0255c8b39d7df16c5d4176b
was never applied because too many '' were passed.

 eclass/kde5-functions.eclass | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b20d406..a8cc1a3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -141,6 +141,10 @@ _add_category_dep() {
 add_frameworks_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ $# -gt 4 ]]; then
+		die "${FUNCNAME} was called with too many arguments"
+	fi
+
 	local version
 
 	if [[ -n ${3} ]]; then
@@ -169,6 +173,10 @@ add_frameworks_dep() {
 add_plasma_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ $# -gt 4 ]]; then
+		die "${FUNCNAME} was called with too many arguments"
+	fi
+
 	local version
 
 	if [[ -n ${3} ]]; then
@@ -197,6 +205,10 @@ add_plasma_dep() {
 add_kdeapps_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ $# -gt 4 ]]; then
+		die "${FUNCNAME} was called with too many arguments"
+	fi
+
 	local version
 
 	if [[ -n ${3} ]]; then
@@ -230,6 +242,10 @@ add_kdeapps_dep() {
 add_qt_dep() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ $# -gt 4 ]]; then
+		die "${FUNCNAME} was called with too many arguments"
+	fi
+
 	local version
 
 	if [[ -n ${3} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     9b1e43fb966eefd05169293368d6621ada5ec250
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:16:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:18:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b1e43fb

kde5-functions.eclass: no longer export KDE_GCC_MINIMAL by default

KDE_GCC_MINIMAL will now only be exported in packages that require it, as it
triggers an expensive pkg_pretend check whenever it is defined.

 eclass/kde5-functions.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index a8cc1a3..df5d053 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,14 +39,9 @@ esac
 : ${KDE_APPS_MINIMAL:=14.12.0}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Minimal GCC version to require for the package.
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-	: ${KDE_GCC_MINIMAL:=4.5}
-else
-	: ${KDE_GCC_MINIMAL:=4.8}
-fi
-
 
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     31412a689f5325c0f991bcd8a9be59faad300120
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:18:18 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:18:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=31412a68

kde5-functions.eclass: only perform the GCC version check if KDE_GCC_MINIMAL is defined

 eclass/kde5-functions.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index df5d053..2c45abc 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -76,7 +76,8 @@ export KDE_BUILD_TYPE
 # @DESCRIPTION:
 # Determine if the current GCC version is acceptable, otherwise die.
 _check_gcc_version() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
+	if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]]; then
+
 		local version=$(gcc-version)
 		local major=${version%.*}
 		local minor=${version#*.}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e11028263c08c98642570765cb256bf99271962c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:08:13 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:18:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1102826

kde5.eclass: only export pkg_pretend if KDE_GCC_MINIMAL is defined

Exporting pkg_pretend is expensive, even if the exported function is a noop.

As kde5_pkg_pretend is currently only used to check if the active GCC version
is recent enough, only export that phase if it will have something to do.

The number of situations in which KDE_GCC_MINIMAL is exported will be
substantially reduced in a future commit. This will result in a large time
saving at the beginning of the emerge process as we will no longer see hundreds
of lines of:

>>> Running pre-merge checks for kde-foo/bar-123
>>> Running pre-merge checks for kde-foo/baz-123

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7616deb..7c0ce36 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -27,7 +27,7 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	esac
 fi
 
-if [[ ${CATEGORY} != kde-frameworks ]]; then
+if [[ -v KDE_GCC_MINIMAL ]]; then
 	EXPORT_FUNCTIONS pkg_pretend
 fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     34646d3df06eec4547dedd73a8175b49987c088c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 26 09:00:48 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 09:02:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=34646d3d

kde5.eclass: Simplify blocked kde4-l10n logic

1) 15.08.x has left the tree
2) Prepare for a future kde4-l10n without USE=minimal
   Version block makes sure of no ancient kde4-l10n anyway

 eclass/kde5.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7c0ce36..9c871b9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -173,15 +173,9 @@ case ${KDE_AUTODEPS} in
 		fi
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
-			local blocked_version=15.08.0-r1
-
-			if [[ ${CATEGORY} = kde-plasma && $(get_version_component_range 2) -ge 6 ]]; then
-				blocked_version=15.12.3-r1
-			fi
-
 			RDEPEND+="
-				!kde-apps/kde4-l10n[-minimal(-)]
-				!<kde-apps/kde4-l10n-${blocked_version}
+				!kde-apps/kde4-l10n[-minimal(+)]
+				!<kde-apps/kde4-l10n-15.12.3-r1
 			"
 		fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     deb1aef0053d1bbf03d7fcd7426ab6e84e547655
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 14:01:24 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 14:01:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=deb1aef0

kde5.eclass: Mark KDE Plasma 5.7.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9c871b9..c6072fa 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -125,7 +125,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.7.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     6e03709bc788e66bf56e0c8aec4874d7fc0d03d7
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul  3 16:43:24 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:43:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e03709b

kde4-base.eclass: Cleanup SRC_URIs

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde4-base.eclass | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8f09871..f5e2c61 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -452,10 +452,6 @@ _calculate_src_uri() {
 	case ${KDEBASE} in
 		kde-base)
 			case ${PV} in
-				4.4.11.1)
-					# KDEPIM 4.4, special case
-					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
-					SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
 				4.4.20*)
 					# KDEPIM 4.4 no-akonadi branch, special case
 					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
@@ -463,18 +459,12 @@ _calculate_src_uri() {
 				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.11.19)
-					# Part of 15.04.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
 				4.11.22)
 					# Part of 15.08.0 actually, sigh. Not stable for next release!
 					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.3)
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.14.8)
-					# Part of 15.04.1 actually, sigh. Used by kdelibs and KDE PIM 4.
-					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Used by last version of KDE PIM 4.
 					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     32512ee7aaabe65b95842536ff48a61fdfe06a94
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 16:45:57 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:45:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32512ee7

kde4-*.eclass: Migrate to L10N flags

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde4-base.eclass      |  4 ++--
 eclass/kde4-functions.eclass | 43 +++++++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index f5e2c61..59a1932 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -341,13 +341,13 @@ fi
 
 # add a dependency over kde4-l10n
 if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
-	for _lingua in ${KDE_LINGUAS}; do
+	for _lingua in $(kde4_lingua_to_l10n ${KDE_LINGUAS}); do
 		# if our package has linguas, pull in kde4-l10n with selected lingua enabled,
 		# but only for selected ones.
 		# this can't be done on one line because if user doesn't use any localisation
 		# then he is probably not interested in kde4-l10n at all.
 		kderdepend+="
-		linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "linguas_${_lingua}(+)") )
+		l10n_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "l10n_${_lingua}(+)") )
 		"
 	done
 	unset _lingua

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 8c2fa4a..a600d55 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -76,6 +76,27 @@ case ${KDE_SCM} in
 	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
 esac
 
+# @FUNCTION: kde4_lingua_to_l10n
+# @USAGE: <lingua>...
+# @INTERNAL
+# @DESCRIPTION:
+# Output l10n flag name(s) (without prefix(es)) appropriate for given KDE
+# locale(s).
+kde4_lingua_to_l10n() {
+	local l
+	for l; do
+		case ${l} in
+			ca@valencia) echo ca-valencia;;
+			sr@ijekavian) echo sr-ijekavsk;;
+			sr@ijekavianlatin) echo sr-Latn-ijekavsk;;
+			sr@latin|sr@Latn) echo sr-Latn;;
+			uz@cyrillic) echo uz-Cyrl;;
+			*@*) die "${FUNCNAME}: Unhandled KDE_LINGUAS: ${l}";;
+			*) echo "${l/_/-}";;
+		esac
+	done
+}
+
 # @ECLASS-VARIABLE: KDE_LINGUAS
 # @DESCRIPTION:
 # This is a whitespace-separated list of translations this ebuild supports.
@@ -86,8 +107,8 @@ esac
 #
 # Example: KDE_LINGUAS="de en_GB nl"
 if [[ ${KDE_BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
-	for _lingua in ${KDE_LINGUAS}; do
-		IUSE="${IUSE} linguas_${_lingua}"
+	for _lingua in $(kde4_lingua_to_l10n ${KDE_LINGUAS}); do
+		IUSE="${IUSE} l10n_${_lingua}"
 	done
 fi
 
@@ -139,7 +160,7 @@ comment_all_add_subdirectory() {
 
 # @FUNCTION: enable_selected_linguas
 # @DESCRIPTION:
-# Enable translations based on LINGUAS settings and translations supported by
+# Enable translations based on L10N settings and translations supported by
 # the package (see KDE_LINGUAS). By default, translations are found in "${S}"/po
 # but this default can be overridden by defining KDE_LINGUAS_DIR.
 enable_selected_linguas() {
@@ -147,11 +168,6 @@ enable_selected_linguas() {
 
 	local x
 
-	# if there is no linguas defined we enable everything
-	if ! $(env | grep -q "^LINGUAS="); then
-		return 0
-	fi
-
 	# @ECLASS-VARIABLE: KDE_LINGUAS_DIR
 	# @DESCRIPTION:
 	# Specified folder where application translations are located.
@@ -171,7 +187,7 @@ enable_selected_linguas() {
 
 # @FUNCTION: enable_selected_doc_linguas
 # @DESCRIPTION:
-# Enable only selected linguas enabled doc folders.
+# Enable only selected L10N enabled doc folders.
 enable_selected_doc_linguas() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -195,11 +211,6 @@ enable_selected_doc_linguas() {
 				-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
 				-i CMakeLists.txt || die 'failed to comment out all handbooks'
 		else
-			# if there is no linguas defined we enable everything (i.e. comment out nothing)
-			if ! $(env | grep -q "^LINGUAS="); then
-				return 0
-			fi
-
 			# Disable subdirectories recursively
 			comment_all_add_subdirectory "${handbookdir}"
 
@@ -213,7 +224,7 @@ enable_selected_doc_linguas() {
 			# Add requested translations
 			local lingua
 			for lingua in en ${KDE_LINGUAS}; do
-				if [[ ${lingua} = en ]] || use linguas_${lingua}; then
+				if [[ ${lingua} = en ]] || use "l10n_$(kde4_lingua_to_l10n "${lingua}")"; then
 					if [[ -d ${handbookdir}/${translationdir//%lingua/${lingua}} ]]; then
 						sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \
 							-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \
@@ -376,7 +387,7 @@ _enable_selected_linguas_dir() {
 	done
 
 	for lingua in ${KDE_LINGUAS}; do
-		if use linguas_${lingua} ; then
+		if use "l10n_$(kde4_lingua_to_l10n ${lingua})" ; then
 			if [[ -d ${lingua} ]]; then
 				linguas="${linguas} ${lingua}"
 				sed -e "/add_subdirectory([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     c5eb028e08c0f127a8ad51da8e52b00d940b825b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 16:52:00 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:52:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5eb028e

kde5.eclass: Mark KDE Frameworks 5.24.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c6072fa..fdf69d9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -125,7 +125,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.7.0 )
+KDE_UNRELEASED=( kde-plasma-5.7.0 kde-frameworks-5.24.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     d4dfa02b687ed09ec153f6789e648e6ec66fd317
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 16:18:53 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 16:18:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4dfa02b

kde5.eclass: Mark KDE Plasma 5.7.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fdf69d9..aea9724 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -125,7 +125,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.7.0 kde-frameworks-5.24.0 )
+KDE_UNRELEASED=( kde-frameworks-5.24.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b73a85f4200c8959ca4918f464fe2fb09c70a627
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 18:41:30 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 18:41:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b73a85f4

kde5.eclass: add gcc version check debugging information

 eclass/kde5-functions.eclass | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2c45abc..ad3034a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -84,9 +84,18 @@ _check_gcc_version() {
 		local min_major=${KDE_GCC_MINIMAL%.*}
 		local min_minor=${KDE_GCC_MINIMAL#*.}
 
+		debug-print "GCC version check activated"
+		debug-print "Version detected:"
+		debug-print "	- Full: ${version}"
+		debug-print "	- Major: ${major}"
+		debug-print "	- Minor: ${minor}"
+		debug-print "Version required:"
+		debug-print "	- Major: ${min_major}"
+		debug-print "	- Minor: ${min_minor}"
+
 		[[ ${major} -lt ${min_major} ]] || \
 				( [[ ${major} -eq ${min_major} && ${minor} -lt ${min_minor} ]] ) \
-			&& die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package."
+			&& die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package (found ${version})."
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d7c4ed7f9256b3899c64105814669b11f771c30d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 20:50:11 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 20:52:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7c4ed7f

kde5-functions.eclass: only perform gcc check if gcc is being used

This used to "work" because gcc-version relied on gcc-config, even if GCC was
not the active compiler. gcc-version has since been fixed to always use CC
instead.

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ad3034a..a03c2ad 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -76,7 +76,7 @@ export KDE_BUILD_TYPE
 # @DESCRIPTION:
 # Determine if the current GCC version is acceptable, otherwise die.
 _check_gcc_version() {
-	if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]]; then
+	if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then
 
 		local version=$(gcc-version)
 		local major=${version%.*}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4568388740ae34ea63221ed05f7daa857f8066b5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 13:42:22 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 13:42:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=45683887

kde4-base.eclass: don't perform gcc version check with clang

Gentoo-bug: 587998

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 59a1932..f9e7eeb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -639,7 +639,7 @@ kde4-base_pkg_setup() {
 	# In theory should be in pkg_pretend but we check it only for kdelibs there
 	# and for others we do just quick scan in pkg_setup because pkg_pretend
 	# executions consume quite some time (ie. when merging 300 packages at once will cause 300 checks)
-	if [[ ${MERGE_TYPE} != binary ]]; then
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
 		[[ $(gcc-major-version) -lt 4 ]] || \
 				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 6 ]] ) \
 			&& die "Sorry, but gcc-4.6 and earlier wont work for some KDE packages."

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     f2010b3715d5ff888db113c78254a02ce1b15c2d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 20:08:55 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 21:43:18 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2010b37

kde*.eclass: Mark KDE Applications 16.04.3 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index f9e7eeb..3c5d3db 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -171,7 +171,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-16.04.3 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index aea9724..e70827e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -125,7 +125,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.24.0 )
+KDE_UNRELEASED=( kde-frameworks-5.24.0 kde-apps-16.04.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     44a8df9ae3cdb3540aee15b6f8cd482932c3916a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 14:00:56 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 14:08:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=44a8df9a

kde5.eclass: Don't remove existing po/${PN}.pot file

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e70827e..d49c1fa 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -486,7 +486,7 @@ kde5_src_prepare() {
 					cmake_comment_add_subdirectory ${lang}
 				fi
 			elif ! has ${lang/.po/} ${LINGUAS} ; then
-				if [[ ${lang} != CMakeLists.txt ]] ; then
+				if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
 					rm ${lang} || die
 				fi
 			fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     3ab1ed0b96a41ceed6546f0642d9b0d93f15f010
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 11:14:21 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 11:14:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3ab1ed0b

kde5.eclass: Mark KDE Frameworks 5.24.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d49c1fa..c239242 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -125,7 +125,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.24.0 kde-apps-16.04.3 )
+KDE_UNRELEASED=( kde-apps-16.04.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     e5d7072c31116829191e11d27332657b42fe7ff2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 12:17:52 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 12:18:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5d7072c

kde*.eclass: Update schedules link for no-fetch error message

Spotted by Till Schäfer <till2.schaefer <AT> uni-dortmund.de>.

Gentoo-bug: 588594

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 3c5d3db..eb6fdb7 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -683,7 +683,7 @@ kde4-base_pkg_nofetch() {
 	eerror ""
 	eerror "Please consult the upstream release schedule to see when this "
 	eerror "package is scheduled to be released:"
-	eerror "https://techbase.kde.org/Schedules"
+	eerror "https://community.kde.org/Schedules"
 }
 
 # @FUNCTION: kde4-base_src_unpack

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c239242..92851a6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -428,7 +428,7 @@ kde5_pkg_nofetch() {
 	eerror ""
 	eerror "Please consult the upstream release schedule to see when this "
 	eerror "package is scheduled to be released:"
-	eerror "https://techbase.kde.org/Schedules"
+	eerror "https://community.kde.org/Schedules"
 }
 
 # @FUNCTION: kde5_src_unpack

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     57e39e5b917785f14648a81c6b4941fcb13e80be
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 20:33:35 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 20:33:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=57e39e5b

kde*.eclass: Mark KDE Applications 16.04.3 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index eb6fdb7..47158c0 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -171,7 +171,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-16.04.3 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 92851a6..b285f6d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -125,7 +125,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-16.04.3 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     77054202886bf129dd1c088792e9fb3089a10a3c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 10 15:55:35 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:21:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=77054202

kde5-functions.eclass: Add KDEBASE=kdel10n and kde_l10n2lingua()

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5-functions.eclass | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index a03c2ad..b8f9c80 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -49,6 +49,8 @@ esac
 # kdevelop ebuild.
 if [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	KDEBASE=kdevelop
+elif [[ ${KMNAME} = kde-l10n || ${PN} = kde-l10n ]]; then
+	KDEBASE=kdel10n
 fi
 
 debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
@@ -278,6 +280,26 @@ get_kde_version() {
 	fi
 }
 
+# @FUNCTION: kde_l10n2lingua
+# @USAGE: <l10n>...
+# @INTERNAL
+# @DESCRIPTION:
+# Output KDE lingua flag name(s) (without prefix(es)) appropriate for
+# given l10n(s).
+kde_l10n2lingua() {
+	local l
+	for l; do
+		case ${l} in
+			ca-valencia) echo ca@valencia;;
+			sr-ijekavsk) echo sr@ijekavian;;
+			sr-Latn-ijekavsk) echo sr@ijekavianlatin;;
+			sr-Latn) echo sr@latin;;
+			uz-Cyrl) echo uz@cyrillic;;
+			*) echo "${l/-/_}";;
+		esac
+	done
+}
+
 # @FUNCTION: punt_bogus_dep
 # @USAGE: <prefix> <dependency>
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     887c2ec6d8ca7ddf7cb39ffa320043747e9add2e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 10 18:06:59 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:21:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=887c2ec6

kde5.eclass: Prepare for re-use of code w/ kde4-l10n

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5.eclass | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 763029c..8e6a6f1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -471,11 +471,13 @@ kde5_src_unpack() {
 				;;
 		esac
 	elif [[ ${KDEBASE} = kdel10n ]]; then
+		local l10npart=5
+		[[ ${PN} = kde4-l10n ]] && l10npart=4
 		mkdir -p "${S}" || die "Failed to create source dir ${S}"
 		cd "${S}"
 		for my_tar in ${A}; do
 			tar -xpf "${DISTDIR}/${my_tar}" --xz \
-				"${my_tar/.tar.xz/}/CMakeLists.txt" "${my_tar/.tar.xz/}/5" 2> /dev/null ||
+				"${my_tar/.tar.xz/}/CMakeLists.txt" "${my_tar/.tar.xz/}/${l10npart}" 2> /dev/null ||
 				elog "${my_tar}: tar extract command failed at least partially - continuing"
 		done
 	else
@@ -490,12 +492,14 @@ kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${KDEBASE} = kdel10n ]]; then
+		local l10npart=5
+		[[ ${PN} = kde4-l10n ]] && l10npart=4
 		# move known variant subdirs to root dir, currently sr@*
 		use_if_iuse l10n_sr-ijekavsk && _l10n_variant_subdir2root sr-ijekavsk sr
 		use_if_iuse l10n_sr-Latn-ijekavsk && _l10n_variant_subdir2root sr-Latn-ijekavsk sr
 		use_if_iuse l10n_sr-Latn && _l10n_variant_subdir2root sr-Latn sr
 		if use_if_iuse l10n_sr; then
-			rm -rf kde-l10n-sr-${PV}/5/sr/sr@* || die "Failed to cleanup L10N=sr"
+			rm -rf kde-l10n-sr-${PV}/${l10npart}/sr/sr@* || die "Failed to cleanup L10N=sr"
 			_l10n_variant_subdir_buster sr
 		elif [[ -d kde-l10n-sr-${PV} ]]; then
 			# having any variant selected means parent lingua will be unpacked as well
@@ -510,9 +514,13 @@ $(printf "add_subdirectory( %s )\n" \
 	`find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`)
 EOF
 
-		# drop KDE4-based part
-		find -maxdepth 2 -type f -name CMakeLists.txt -exec \
-			sed -i -e "/add_subdirectory(4)/ s/^/#DONT/" {} + || die
+		# for KF5: drop KDE4-based part; for KDE4: drop KF5-based part
+		case ${l10npart} in
+			5) find -maxdepth 2 -type f -name CMakeLists.txt -exec \
+				sed -i -e "/add_subdirectory(4)/ s/^/#DONT/" {} + || die ;;
+			4) find -maxdepth 2 -type f -name CMakeLists.txt -exec \
+				sed -i -e "/add_subdirectory(5)/ s/^/#DONT/" {} + || die ;;
+		esac
 	fi
 
 	cmake-utils_src_prepare
@@ -791,17 +799,19 @@ kde5_pkg_postrm() {
 }
 
 _l10n_variant_subdir2root() {
+	local l10npart=5
+	[[ ${PN} = kde4-l10n ]] && l10npart=4
 	local lingua=$(kde_l10n2lingua ${1})
 	local src=kde-l10n-${2}-${PV}
-	local dest=kde-l10n-${lingua}-${PV}/5
+	local dest=kde-l10n-${lingua}-${PV}/${l10npart}
 
 	# create variant rootdir structure from parent lingua and adapt it
 	mkdir -p ${dest} || die "Failed to create ${dest}"
-	mv ${src}/5/${2}/${lingua} ${dest}/${lingua} || die "Failed to create ${dest}/${lingua}"
+	mv ${src}/${l10npart}/${2}/${lingua} ${dest}/${lingua} || die "Failed to create ${dest}/${lingua}"
 	cp -f ${src}/CMakeLists.txt kde-l10n-${lingua}-${PV} || die "Failed to prepare L10N=${1} subdir"
 	echo "add_subdirectory(${lingua})" > ${dest}/CMakeLists.txt ||
 		die "Failed to prepare ${dest}/CMakeLists.txt"
-	cp -f ${src}/5/${2}/CMakeLists.txt ${dest}/${lingua} ||
+	cp -f ${src}/${l10npart}/${2}/CMakeLists.txt ${dest}/${lingua} ||
 		die "Failed to create ${dest}/${lingua}/CMakeLists.txt"
 	sed -e "s/${2}/${lingua}/" -i ${dest}/${lingua}/CMakeLists.txt ||
 		die "Failed to prepare ${dest}/${lingua}/CMakeLists.txt"
@@ -810,9 +820,14 @@ _l10n_variant_subdir2root() {
 }
 
 _l10n_variant_subdir_buster() {
-	local dir=kde-l10n-$(kde_l10n2lingua ${1})-${PV}/5/$(kde_l10n2lingua ${1})
+	local l10npart=5
+	[[ ${PN} = kde4-l10n ]] && l10npart=4
+	local dir=kde-l10n-$(kde_l10n2lingua ${1})-${PV}/${l10npart}/$(kde_l10n2lingua ${1})
 
-	sed -e "/^add_subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir"
+	case ${l10npart} in
+		5) sed -e "/^add_subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir" ;;
+		4) sed -e "/^macro.*subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir" ;;
+	esac
 
 	for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do
 		echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     70443934f8c389e4165c20a59345f3d0aa140237
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 17:11:32 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 17:11:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70443934

kde5.eclass: Fix SRC_URI for split-off l10n packages

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8e6a6f1..7755b31 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -344,7 +344,7 @@ _calculate_src_uri() {
 	fi
 
 	if [[ ${KDEBASE} = kdel10n ]] ; then
-		local uri_base="${SRC_URI/${PN}-${PV}.tar.xz/}kde-l10n/kde-l10n"
+		local uri_base="${SRC_URI/${_kmname}-${PV}.tar.xz/}kde-l10n/kde-l10n"
 		SRC_URI=""
 		for my_l10n in ${KDE_L10N[@]} ; do
 			case ${my_l10n} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     55ea59868b530d9012a0495ca6367882c2e26f35
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 12:02:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 12:02:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=55ea5986

kde5.eclass: Drop minimal

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index af27dda..423248c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -186,7 +186,7 @@ case ${KDE_AUTODEPS} in
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
-				!kde-apps/kde4-l10n[-minimal(+)]
+				!kde-apps/kde4-l10n
 				!<kde-apps/kde4-l10n-15.12.3-r1
 			"
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a7e54d5d162e515fb08b75edf609f31149fa72e6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 11:57:06 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 11:57:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7e54d5d

kde5.eclass: Drop obsolete kdepim split handling

 eclass/kde5.eclass | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7755b31..af27dda 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -606,56 +606,6 @@ EOF
 			cmake_comment_add_subdirectory tests
 		fi
 	fi
-
-	# legacy (16.04) kdepim split packaging handling (drop other applications != {PN})
-	if [[ ${KMNAME} = "kdepim" && ${PV} = 16.04* && $(basename "${S}") != ${PN} ]] || \
-			[[ ${PN} = "kdepim" ]] ; then
-		# make optional a lot of otherwise required dependencies in root CMakeLists.txt
-		sed -e "/find_package(KF5/ s/ REQUIRED//" \
-			-e "/find_package(Qt5 / s/ REQUIRED/ OPTIONAL_COMPONENTS/" \
-			-i CMakeLists.txt || die "Failed to make dependencies optional"
-
-		# AkonadiSearch:	kaddressbook, knotes, kdepim (kmail, korganizer)
-		# Grantlee:			akregator, kaddressbook, knotes, kdepim (grantleeeditor, kmail, kontact)
-		sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ OPTIONAL/" \
-			-e "/set_package_properties(Xsltproc/ s/ REQUIRED/ OPTIONAL/" \
-			-e "/find_package(Grantlee5/ s/ REQUIRED//" \
-			-i CMakeLists.txt || die "Failed to make dependencies optional"
-
-		if [[ ${PN} != "kdepim" ]] ; then
-			# Boost: kdepim (kmail, mailfilteragent)
-			# MailTransportDBusService: kdepim (kmail)
-			# Phonon4Qt5: kdepim (kalarm, korgac)
-			sed -e "/find_package(Boost/ s/^/#DONT/" \
-				-e "/set_package_properties(Boost/ s/^/#DONT/" \
-				-e "/find_package(MailTransportDBusService/ s/^/#DONT/" \
-				-e "/find_package(Phonon4Qt5/ s/^/#DONT/" \
-				-i CMakeLists.txt || die "Failed to disable dependencies"
-
-			# only build select handbook
-			if use_if_iuse handbook && [[ -e doc/CMakeLists.txt ]] ; then
-				echo "add_subdirectory(${PN})" > doc/CMakeLists.txt
-			fi
-		fi
-
-		# remove anything else not listed here
-		local _pim_keep_subdir="${PN} ${KDE_PIM_KEEP_SUBDIR}"
-		einfo "Building: ${_pim_keep_subdir}"
-		_pim_keep_subdir="cmake doc examples grantlee-extractor-pot-scripts ${_pim_keep_subdir}"
-
-		einfo "Removing other subdirectories:"
-		pushd "${S}" > /dev/null || die
-		for subdir in *; do
-			if ! has ${subdir} ${_pim_keep_subdir} ; then
-				if [[ -d "${subdir}" ]] ; then
-					einfo "   ${subdir}"
-					rm -r ${subdir} || die "Failed to remove ${subdir} application"
-					cmake_comment_add_subdirectory ${subdir}
-				fi
-			fi
-		done
-		popd > /dev/null || die
-	fi
 }
 
 # @FUNCTION: kde5_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     17756c057d53dac27fc1628fad2ce0e24580de2e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 12:10:34 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 12:10:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=17756c05

kde5.eclass: Unblock kde4-l10n

 eclass/kde5.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 423248c..14d4e87 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -186,7 +186,6 @@ case ${KDE_AUTODEPS} in
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
-				!kde-apps/kde4-l10n
 				!<kde-apps/kde4-l10n-15.12.3-r1
 			"
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     912d150938c9730009816bf4008ea9455cf07772
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 13:02:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:30:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=912d1509

kde5.eclass: More cleanup after 16.04 removal

 eclass/kde5.eclass | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 14d4e87..a4e3768 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -109,12 +109,6 @@ if [[ ${KDEBASE} = kdel10n ]]; then
 	fi
 fi
 
-# @ECLASS-VARIABLE: KDE_PIM_KEEP_SUBDIR
-# @DESCRIPTION:
-# If building a split package from KMNAME="kdepim", provide a list of
-# subdirectories that need to be present for a successful build.
-: ${KDE_PIM_KEEP_SUBDIR:=}
-
 # @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -254,16 +248,7 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
-	local subproj
-	if [[ ${PV} != 16.04* ]]; then
-		subproj="/${PN}"
-	fi
-	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-		S="${WORKDIR}/${P}${subproj}"
-	else
-		S="${WORKDIR}/${KMNAME}-${PV}${subproj}"
-	fi
-	unset subproj
+	S="${S}/${PN}"
 fi
 
 _kde_is_unreleased() {

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     22cfc0f311acbdcd33f88bbace07bf8dc11e386e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 21:11:17 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 21:11:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=22cfc0f3

kde5.eclass: Raise Qt min version

 eclass/kde5.eclass | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a4e3768..613f724 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -36,7 +36,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.5.1}
+: ${QT_MINIMAL:=5.6.1}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
@@ -168,16 +168,6 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
-		if [[ ${CATEGORY} = kde-plasma ]]; then
-			if [[ $(get_version_component_range 2) -eq 6 && $(get_version_component_range 3) -ge 5 ]]; then
-				QT_MINIMAL=5.6.1
-			fi
-			if [[ $(get_version_component_range 2) -ge 7 || ${PV} = 9999 ]]; then
-				QT_MINIMAL=5.6.1
-				FRAMEWORKS_MINIMAL=5.23.0
-			fi
-		fi
-
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
 				!<kde-apps/kde4-l10n-15.12.3-r1

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     33bdfc556edcc77b3e41401cd0eefa097cae899b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 21:09:52 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 21:09:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=33bdfc55

kde5-functions.eclass: Raise frameworks min version

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b8f9c80..7e91cc6 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.21.0}
+: ${FRAMEWORKS_MINIMAL:=5.23.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     774151db1c8bf23e3e0fbc65b418d60c48f775c5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug  3 13:04:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 14:11:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=774151db

kde5.eclass: Fix doc install if LINGUAS is undefined

 eclass/kde5.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 613f724..bba12d0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -522,6 +522,7 @@ EOF
 	# when required
 	if [[ -d po && -v LINGUAS ]] ; then
 		pushd po > /dev/null || die
+		local lang
 		for lang in *; do
 			if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
 				rm -r ${lang} || die
@@ -537,9 +538,10 @@ EOF
 		popd > /dev/null || die
 	fi
 
-	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
-		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
+	if [[ ${KDE_BUILD_TYPE} = release && ${CATEGORY} != kde-apps ]] ; then
+		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && -v LINGUAS ]] ; then
 			pushd ${KDE_DOC_DIR} > /dev/null || die
+			local lang
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					cmake_comment_add_subdirectory ${lang}

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     bbcd95371d614c8013452e330dd785a8be69a9e9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 19:58:58 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 19:58:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bbcd9537

kde5-meta-pkg.eclass: Respect KDE_BLOCK_SLOT4

 eclass/kde5-meta-pkg.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index 4cc5da5..a156d8b 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -18,6 +18,8 @@ HOMEPAGE="https://www.kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 
-RDEPEND+=" !kde-apps/${PN}:4"
+if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
+	RDEPEND+=" !kde-apps/${PN}:4"
+fi
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Maciej Mrozowski]

commit:     5a4dfd12ba10bec7ebfaaef73fcd14e31fe6d9f1
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 23:41:32 2016 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 23:58:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a4dfd12

cmake-utils.eclass: Expand suggestion related to functions banned EAPI 6

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 4bd404d..6363d31 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -161,7 +161,7 @@ _cmake_use_me_now() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	[[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later"
+	[[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 
 	local uper capitalised x
 	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
@@ -184,7 +184,7 @@ _cmake_use_me_now_inverted() {
 	[[ ! -z $3 ]] && arg=$3
 
 	if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
-		die "${FUNCNAME[1]} is banned in EAPI 6 and later"
+		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 	fi
 
 	local uper capitalised x

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1c666b71b428b1aa47c2ca5ef947cc4a63c7aa7c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug  6 22:13:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 16:14:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c666b71

kde5-functions.eclass: Fix SRC_URI for kde-l10n-15.12.3

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7e91cc6..da4cd1e 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -50,7 +50,7 @@ esac
 if [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	KDEBASE=kdevelop
 elif [[ ${KMNAME} = kde-l10n || ${PN} = kde-l10n ]]; then
-	KDEBASE=kdel10n
+	[[ ${PV} != 15.12.3 ]] && KDEBASE=kdel10n
 fi
 
 debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     3bd92a24a5181a3fb08b8afbe667bf4258988203
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 17:36:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 17:36:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bd92a24

kde5.eclass: Mark KDE Frameworks 5.25 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bba12d0..a7fbcc3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -129,7 +129,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.25.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     66c2d2d4d7b6a794c53066296de746f0f22d82fa
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug  7 19:02:52 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 15:40:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=66c2d2d4

kde5.eclass: Remove obsolete KDE_PUNT_BOGUS_DEPS handling

 eclass/kde5.eclass | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a7fbcc3..8c6a846 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -109,13 +109,6 @@ if [[ ${KDEBASE} = kdel10n ]]; then
 	fi
 fi
 
-# @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# For any other value, do black magic to make hardcoded-but-optional dependencies
-# optional again. An upstream solution is preferable and this is a last resort.
-: ${KDE_PUNT_BOGUS_DEPS:=false}
-
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:
 # If set to "none", do nothing.
@@ -556,18 +549,6 @@ EOF
 		cmake_comment_add_subdirectory tests
 	fi
 
-	case ${KDE_PUNT_BOGUS_DEPS} in
-		false)	;;
-		*)
-			if ! use_if_iuse test ; then
-				punt_bogus_dep Qt5 Test
-			fi
-			if ! use_if_iuse handbook ; then
-				punt_bogus_dep KF5 DocTools
-			fi
-			;;
-	esac
-
 	# only build unit tests when required
 	if ! use_if_iuse test ; then
 		if [[ ${KDE_TEST} = forceoptional ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     db06717d93dda81bc3abf3219e8d274a36d62d03
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 18:17:22 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 18:17:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db06717d

cmake-utils.eclass: Let cmake_comment_add_subdirectory take n arguments

 eclass/cmake-utils.eclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 6363d31..1b1924f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -262,15 +262,18 @@ _cmake_generator_to_use() {
 # @FUNCTION: cmake_comment_add_subdirectory
 # @USAGE: <subdirectory>
 # @DESCRIPTION:
-# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
+# Comment out one ore more add_subdirectory calls in CMakeLists.txt in the current directory
 cmake_comment_add_subdirectory() {
 	if [[ -z ${1} ]]; then
-		die "comment_add_subdirectory must be passed the directory name to comment"
+		die "comment_add_subdirectory must be passed at least one directory name to comment"
 	fi
 
 	if [[ -e "CMakeLists.txt" ]]; then
-		sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
-			-i CMakeLists.txt || die "failed to comment add_subdirectory(${1})"
+		local d
+		for d in $@; do
+			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
+				-i CMakeLists.txt || die "failed to comment add_subdirectory(${d})"
+		done
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1e11a0ddc194b3e6943f18c4a2cfee8f2102ad9f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 18:18:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 18:18:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e11a0dd

kde5-functions.eclass: Make punt_bogus_dep detect !CMakeLists.txt

 eclass/kde5-functions.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index da4cd1e..d2eb8a6 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -308,6 +308,10 @@ punt_bogus_dep() {
 	local prefix=${1}
 	local dep=${2}
 
+	if [[ ! -e "CMakeLists.txt" ]]; then
+		return
+	fi
+
 	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 
 	# pcregrep returns non-zero on no matches/error

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     24edb3b8d156558891a0161defb28b522cb1b1a5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 18:23:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 18:23:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=24edb3b8

kde5.eclass: Add KDE_TEST="forceoptional-recursive" handling

Prime example: dev-util/kdevplatform with 24 test* subdirs

 eclass/kde5.eclass | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8c6a846..01d0f97 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -91,8 +91,10 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5.
 # If set to "optional", configure with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON
 # when USE=!test.
-# If set to "forceoptional", remove a Qt5Test dependency from the root
-# CMakeLists.txt in addition to the above.
+# If set to "forceoptional", remove a Qt5Test dependency and comment test
+# subdirs from the root CMakeLists.txt in addition to the above.
+# If set to "forceoptional-recursive", remove a Qt5Test dependency and comment
+# test subdirs from *any* CMakeLists.txt in addition to the above.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_TEST:=true}
 else
@@ -554,13 +556,17 @@ EOF
 		if [[ ${KDE_TEST} = forceoptional ]] ; then
 			punt_bogus_dep Qt5 Test
 			# if forceoptional, also cover non-kde categories
-			cmake_comment_add_subdirectory autotests
-			cmake_comment_add_subdirectory test
-			cmake_comment_add_subdirectory tests
+			cmake_comment_add_subdirectory autotests test tests
+		elif [[ ${KDE_TEST} = forceoptional-recursive ]] ; then
+			local d
+			for d in $(find . -type d -name "autotests" -or -name "tests" -or -name "test"); do
+				pushd ${d%/*} > /dev/null || die
+					punt_bogus_dep Qt5 Test
+					cmake_comment_add_subdirectory autotests test tests
+				popd > /dev/null || die
+			done
 		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
-			cmake_comment_add_subdirectory autotests
-			cmake_comment_add_subdirectory test
-			cmake_comment_add_subdirectory tests
+			cmake_comment_add_subdirectory autotests test tests
 		fi
 	fi
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2832c1a7551437600fb7bf0b1216060f25f3bc0e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 22 19:41:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 13:33:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2832c1a7

kde4-base.eclass: Introduce WEBKIT_REQUIRED

webkit flag is on by default to build as upstream intended.

 eclass/kde4-base.eclass | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 47158c0..a629bcd 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -131,6 +131,12 @@ OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
 # This variable must be set before inheriting any eclasses. Defaults to 'never'.
 MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}"
 
+# @ECLASS-VARIABLE: WEBKIT_REQUIRED
+# @DESCRIPTION:
+# Is qtwebkit required? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+WEBKIT_REQUIRED="${WEBKIT_REQUIRED:-never}"
+
 # @ECLASS-VARIABLE: CPPUNIT_REQUIRED
 # @DESCRIPTION:
 # Is cppunit required for tests? Possible values are 'always', 'optional' and 'never'.
@@ -266,6 +272,22 @@ case ${MULTIMEDIA_REQUIRED} in
 esac
 unset qtmultimediadepend
 
+# WebKit dependencies
+qtwebkitdepend="
+	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
+"
+case ${WEBKIT_REQUIRED} in
+	always)
+		COMMONDEPEND+=" ${qtwebkitdepend}"
+		;;
+	optional)
+		IUSE+=" +webkit"
+		COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )"
+		;;
+	*) ;;
+esac
+unset qtwebkitdepend
+
 # CppUnit dependencies
 cppuintdepend="
 	dev-util/cppunit
@@ -295,11 +317,17 @@ kdecommondepend="
 	>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
 	>=dev-qt/qtsvg-${QT_MINIMAL}:4
 	>=dev-qt/qttest-${QT_MINIMAL}:4
-	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
 "
 
 if [[ ${PN} != kdelibs ]]; then
-	kdecommondepend+=" $(add_kdebase_dep kdelibs)"
+	local _kdelibsuse
+	case ${WEBKIT_REQUIRED} in
+		always) _kdelibsuse="webkit" ;;
+		optional) _kdelibsuse="webkit?" ;;
+		*) ;;
+	esac
+	kdecommondepend+=" || ( $(add_kdebase_dep kdelibs "${_kdelibsuse}" 4.14.22) <kde-base/kdelibs-4.14.22 )"
+	unset _kdelibsuse
 	if [[ ${KDEBASE} = kdevelop ]]; then
 		if [[ ${PN} != kdevplatform ]]; then
 			# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     34c6ac07f854630dc02fa205e749fce418ac282e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 21:24:40 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 13:38:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=34c6ac07

kde5.eclass: Fix SRC_URI, kdevelop missing trailing .0 in first release

Add kdevelop-pg-qt SRC_URIs

 eclass/kde5.eclass | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 01d0f97..113b8fd 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -232,10 +232,19 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
+# Drop this when kdepim is finally split upstream
 if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
 	S="${S}/${PN}"
 fi
 
+if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then
+	if [[ -n ${KMNAME} ]]; then
+		S=${WORKDIR}/${KMNAME}-${PV%.0}	# kdevelop missing trailing .0 in first release
+	else
+		S=${WORKDIR}/${PN}-${PV%.0}	# kdevelop missing trailing .0 in first release
+	fi
+fi
+
 _kde_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do
@@ -302,14 +311,22 @@ _calculate_src_uri() {
 	esac
 
 	if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
+		local _kdebase
+		case ${PN} in
+			kdevelop-pg-qt)
+				_kdebase=${PN} ;;
+			*)
+				_kdebase=${KDEBASE} ;;
+		esac
 		case ${PV} in
 			*.*.[6-9]? )
-				SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz"
+				SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz"
 				RESTRICT+=" mirror"
 				;;
 			*)
-				SRC_URI="mirror://kde/stable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
+				SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV%.0}.tar.xz" ;;
 		esac
+		unset _kdebase
 	fi
 
 	if [[ ${KDEBASE} = kdel10n ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     33393debf5210a36c351a6bb06a20d6310e9a34b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 20:13:18 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 20:14:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=33393deb

kde5.eclass: a step close to becoming Turing complete

 eclass/kde5.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 113b8fd..0fbcad1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -575,8 +575,9 @@ EOF
 			# if forceoptional, also cover non-kde categories
 			cmake_comment_add_subdirectory autotests test tests
 		elif [[ ${KDE_TEST} = forceoptional-recursive ]] ; then
+			punt_bogus_dep Qt5 Test
 			local d
-			for d in $(find . -type d -name "autotests" -or -name "tests" -or -name "test"); do
+			for d in $(find . -type d -name "autotests" -or -name "tests" -or -name "test" -or -name "unittests"); do
 				pushd ${d%/*} > /dev/null || die
 					punt_bogus_dep Qt5 Test
 					cmake_comment_add_subdirectory autotests test tests

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     49599d55b92f7947f095dca6bb6112817813a63d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 13:51:58 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 13:52:18 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=49599d55

cmake-utils.eclass: typo

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 1b1924f..393ee28 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -262,7 +262,7 @@ _cmake_generator_to_use() {
 # @FUNCTION: cmake_comment_add_subdirectory
 # @USAGE: <subdirectory>
 # @DESCRIPTION:
-# Comment out one ore more add_subdirectory calls in CMakeLists.txt in the current directory
+# Comment out one or more add_subdirectory calls in CMakeLists.txt in the current directory
 cmake_comment_add_subdirectory() {
 	if [[ -z ${1} ]]; then
 		die "comment_add_subdirectory must be passed at least one directory name to comment"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6eb65ab1ddd8ca0fde02eca6b84782689796f50d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 13:57:59 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:30:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6eb65ab1

kde5.eclass: kde-frameworks-5.25.0 is long released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0fbcad1..a3990d3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -124,7 +124,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.25.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     c2039456c60ca96065bdcbba5f431950a89b1405
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 14:19:37 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:33:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2039456

kde5.eclass: Update comment

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a3990d3..4a20e18 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -232,7 +232,7 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
-# Drop this when kdepim is finally split upstream
+# FIXME: Drop this when kdepim-16.08.x is no more
 if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
 	S="${S}/${PN}"
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     8212b2dd7c50d0c76882685f7883904f70d7b3d2
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 27 16:22:05 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 15:24:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8212b2dd

kde5-functions.eclass: Drop 15.12.3 exception

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d2eb8a6..34489c4 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -50,7 +50,7 @@ esac
 if [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	KDEBASE=kdevelop
 elif [[ ${KMNAME} = kde-l10n || ${PN} = kde-l10n ]]; then
-	[[ ${PV} != 15.12.3 ]] && KDEBASE=kdel10n
+	KDEBASE=kdel10n
 fi
 
 debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     549ade03b47bb0b22801001921cdc31111c5ea31
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 23:34:56 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 15:01:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=549ade03

cmake-utils.eclass: print feature summary

Closes: https://github.com/gentoo/gentoo/pull/2139

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 eclass/cmake-utils.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 393ee28..d5292bc 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -425,6 +425,13 @@ _cmake_modify-cmakelists() {
 		Module          \${CMAKE_MODULE_LINKER_FLAGS}
 		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
 	_EOF_
+
+	if ! grep -Fiq FEATURE_SUMMARY "${CMAKE_USE_DIR}"/CMakeLists.txt; then
+		cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
+			include(FeatureSummary)
+			FEATURE_SUMMARY(INCLUDE_QUIET_PACKAGES WHAT ALL)
+		_EOF_
+	fi
 }
 
 # temporary function for moving cmake cleanups from from src_configure -> src_prepare.

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0ceb2634274a4c51279a2a64e19be20f85a74ba4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 20:14:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 20:15:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ceb2634

Revert "cmake-utils.eclass: print feature summary"

A package can include a custom FeatureSummary module which does not export
FEATURE_SUMMARY() resulting in a configure failure.

This reverts commit 549ade03b47bb0b22801001921cdc31111c5ea31.

Gentoo-bug: 593230

 eclass/cmake-utils.eclass | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d5292bc..393ee28 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -425,13 +425,6 @@ _cmake_modify-cmakelists() {
 		Module          \${CMAKE_MODULE_LINKER_FLAGS}
 		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
 	_EOF_
-
-	if ! grep -Fiq FEATURE_SUMMARY "${CMAKE_USE_DIR}"/CMakeLists.txt; then
-		cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
-			include(FeatureSummary)
-			FEATURE_SUMMARY(INCLUDE_QUIET_PACKAGES WHAT ALL)
-		_EOF_
-	fi
 }
 
 # temporary function for moving cmake cleanups from from src_configure -> src_prepare.

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7cd7df59d588e440bcf3cb12c7351a9bc3e76944
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 10 14:59:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 14:59:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7cd7df59

kde5.eclass: KDE Plasma 5.8 requires >=KF-5.26

 eclass/kde5.eclass | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4a20e18..45065af 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,14 +159,18 @@ case ${KDE_AUTODEPS} in
 			esac
 		fi
 
+		if [[ ${CATEGORY} = kde-plasma ]]; then
+			if ! [[ $(get_version_component_range 2) -le 7 && $(get_version_component_range 3) -lt 50 ]]; then
+				FRAMEWORKS_MINIMAL=5.26.0
+			fi
+		fi
+
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
-			RDEPEND+="
-				!<kde-apps/kde4-l10n-15.12.3-r1
-			"
+			RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
 		fi
 
 		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     53ead7243cb49514698dbafdfd7149c921597722
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 19:15:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 19:15:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=53ead724

kde4-base.eclass: remove reference to old kdelibs versions

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a629bcd..48a2244 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -326,7 +326,7 @@ if [[ ${PN} != kdelibs ]]; then
 		optional) _kdelibsuse="webkit?" ;;
 		*) ;;
 	esac
-	kdecommondepend+=" || ( $(add_kdebase_dep kdelibs "${_kdelibsuse}" 4.14.22) <kde-base/kdelibs-4.14.22 )"
+	kdecommondepend+=" $(add_kdebase_dep kdelibs "${_kdelibsuse}" 4.14.22)"
 	unset _kdelibsuse
 	if [[ ${KDEBASE} = kdevelop ]]; then
 		if [[ ${PN} != kdevplatform ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     9aedcc80567137305e54b607c427ddf7fe35f713
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 25 14:39:19 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 17:39:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9aedcc80

kde4-base.eclass: 15.08.0 tarballs moved to Attic

 eclass/kde4-base.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 48a2244..c79a00e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -489,7 +489,7 @@ _calculate_src_uri() {
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
 				4.11.22)
 					# Part of 15.08.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
+					SRC_URI="mirror://kde/Attic/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
 				4.14.3)
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     731472601e8d7c62748123bb35721b7e221516b1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 16:48:56 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 16:51:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=73147260

kde5.eclass: mark plasma-5.8.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 45065af..7520f47 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -124,7 +124,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.8.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     874ba1117424e8d0490d28451fcb5546271caaa4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 17:35:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 17:38:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=874ba111

kde5.eclass: mark kde-frameworks-5.27.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7520f47..22230e2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -124,7 +124,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.8.0 )
+KDE_UNRELEASED=( kde-plasma-5.8.0 kde-frameworks-5.27.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     0ace261f14ec27efba170a4d7bdf15ef9f8a69a5
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 17:40:56 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 17:40:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ace261f

kde5.eclass: Mark kde-plasma-5.8.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 22230e2..a7c929c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -124,7 +124,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.8.0 kde-frameworks-5.27.0 )
+KDE_UNRELEASED=( kde-frameworks-5.27.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     b1ee8c8d03273d1ce9ccc3577893803a0a59b0a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 15:43:44 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 15:43:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1ee8c8d

kde5.eclass: mark kde-frameworks-5.27.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a7c929c..45065af 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -124,7 +124,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.27.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     86bc7d59ec0c4b718ee7b3c7e62f8f05e61f747f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 20:53:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 20:53:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=86bc7d59

kde5.eclass: Take care of empty po directory shipped by upstream

Uncovered by dev-libs/kreport-3.0.0.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 45065af..52c432d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -545,7 +545,7 @@ EOF
 				if [[ -e CMakeLists.txt ]] ; then
 					cmake_comment_add_subdirectory ${lang}
 				fi
-			elif ! has ${lang/.po/} ${LINGUAS} ; then
+			elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
 				if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
 					rm ${lang} || die
 				fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     e45d4241402987dbf43f86808143a0cdd823594a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 17:08:49 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 17:10:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e45d4241

kde5.eclass: drop obsolete FRAMEWORKS_MINIMAL conditional

5.26.0 is unconditionally required since 0511d3cc56a91ab98addc442b062feb92aaba2db.

 eclass/kde5.eclass | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 52c432d..0d88c41 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,12 +159,6 @@ case ${KDE_AUTODEPS} in
 			esac
 		fi
 
-		if [[ ${CATEGORY} = kde-plasma ]]; then
-			if ! [[ $(get_version_component_range 2) -le 7 && $(get_version_component_range 3) -lt 50 ]]; then
-				FRAMEWORKS_MINIMAL=5.26.0
-			fi
-		fi
-
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a6c8fa0a868ac150a430c82e356f59ee8e2aa992
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 17:07:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 17:10:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6c8fa0a

kde5-functions.eclass: raise FRAMEWORKS_MINIMAL to 5.26.0 (latest stable)

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 34489c4..8796268 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.23.0}
+: ${FRAMEWORKS_MINIMAL:=5.26.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0626a828c1ddb354af60fa0d6281f5f51914a18c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 14:22:32 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 21:44:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0626a828

kde5.eclass: KDE Applications 16.12 requires >=KF-5.27

 eclass/kde5.eclass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 814c5f0..7937ffe 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,6 +165,14 @@ case ${KDE_AUTODEPS} in
 			fi
 		fi
 
+		if [[ ${CATEGORY} = kde-apps ]]; then
+			local vcr2=$((10#$(get_version_component_range 2)))
+			if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
+				FRAMEWORKS_MINIMAL=5.27.0
+			fi
+			unset vcr2
+		fi
+
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     307d0422ee40c66a07d8b4043901d708aeb7bf19
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 10 14:59:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 21:44:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=307d0422

kde5.eclass: KDE Plasma 5.9 requires >=KF-5.27

Don't interfere with live ebuild KF5 dep though.

 eclass/kde5.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0d88c41..814c5f0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,6 +159,12 @@ case ${KDE_AUTODEPS} in
 			esac
 		fi
 
+		if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then
+			if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+				FRAMEWORKS_MINIMAL=5.27.0
+			fi
+		fi
+
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     7354361319a3fe4bebb962c63f3c0afc6210576d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 14:48:12 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 14:51:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=73543613

kde5.eclass: Raise frameworks minimal for KDE Apps 16.12

Thanks-to: Arfrever on irc @ #gentoo-kde

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7937ffe..1b65add 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -168,7 +168,7 @@ case ${KDE_AUTODEPS} in
 		if [[ ${CATEGORY} = kde-apps ]]; then
 			local vcr2=$((10#$(get_version_component_range 2)))
 			if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
-				FRAMEWORKS_MINIMAL=5.27.0
+				FRAMEWORKS_MINIMAL=5.28.0
 			fi
 			unset vcr2
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     e01b2631764d7c689ce195b1357de8ae59d57265
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 15:17:02 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 15:17:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e01b2631

kde5{,-functions}.eclass: Move QT_MINIMAL declaration

Thanks-to: Arfrever on irc @ #gentoo-kde

 eclass/kde5-functions.eclass | 5 +++++
 eclass/kde5.eclass           | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8796268..a6bf976 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -23,6 +23,11 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
+# @ECLASS-VARIABLE: QT_MINIMAL
+# @DESCRIPTION:
+# Minimal Qt version to require for the package.
+: ${QT_MINIMAL:=5.6.1}
+
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1b65add..a8915d4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -33,11 +33,6 @@ fi
 
 EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
-# @ECLASS-VARIABLE: QT_MINIMAL
-# @DESCRIPTION:
-# Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.6.1}
-
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     49748132681ce49686debf19c6af3430512ba262
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 08:09:56 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 08:26:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=49748132

kde4-functions.eclass: Set KDEBASE for category kde-plasma

 eclass/kde4-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index a600d55..0c130a1 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -36,7 +36,7 @@ esac
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a kde or
 # kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then
+if [[ ${CATEGORY} = kde-base || ${CATEGORY} == kde-plasma || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	KDEBASE=kde-base
 elif [[ ${KMNAME-${PN}} = kdevelop ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     040cef12f24e64267d5c60bd0b2fbcc5a3280cec
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 16:02:54 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 16:07:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=040cef12

kde5.eclass: only set FRAMEWORKS_MINIMAL if undefined

Unconditionally setting FRAMEWORKS_MINIMAL prevents it being overridden in an
ebuild (or somewhere else...).

 eclass/kde5.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a8915d4..9ef7c15 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -145,10 +145,11 @@ case ${KDE_AUTODEPS} in
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			case ${CATEGORY} in
 				kde-frameworks)
-					FRAMEWORKS_MINIMAL=9999
+					: ${FRAMEWORKS_MINIMAL:=9999}
 				;;
 				kde-plasma)
-					FRAMEWORKS_MINIMAL=9999
+
+					: ${FRAMEWORKS_MINIMAL:=9999}
 				;;
 				*) ;;
 			esac
@@ -156,14 +157,14 @@ case ${KDE_AUTODEPS} in
 
 		if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then
 			if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
-				FRAMEWORKS_MINIMAL=5.27.0
+				: ${FRAMEWORKS_MINIMAL:=5.27.0}
 			fi
 		fi
 
 		if [[ ${CATEGORY} = kde-apps ]]; then
 			local vcr2=$((10#$(get_version_component_range 2)))
 			if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
-				FRAMEWORKS_MINIMAL=5.28.0
+				: ${FRAMEWORKS_MINIMAL:=5.28.0}
 			fi
 			unset vcr2
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     724835ce2f6c3086b29da7f5b87a323e87f4ab63
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 19:27:43 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 19:29:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=724835ce

kde5.eclass: mark kde-frameworks-5.28 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9ef7c15..7a8c85a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -119,7 +119,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.28.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     c21a10b5a315a15e6f573c8fc234e3d502dc14ed
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 20:04:46 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 20:04:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c21a10b5

kde4-meta.eclass: Remove unused

Identical to gentoo main tree version.

 eclass/kde4-meta.eclass | 636 ------------------------------------------------
 1 file changed, 636 deletions(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
deleted file mode 100644
index ba7114d..0000000
--- a/eclass/kde4-meta.eclass
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# @ECLASS: kde4-meta.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: Eclass for writing "split" KDE packages.
-# @DESCRIPTION:
-# This eclass provides all necessary functions for writing split KDE ebuilds.
-#
-# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
-# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
-
-if [[ -z ${_KDE4_META_ECLASS} ]]; then
-_KDE4_META_ECLASS=1
-
-[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
-
-inherit kde4-base
-
-KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
-EXPORT_FUNCTIONS ${KDEMETA_EXPF}
-
-# Add dependencies that all packages in a certain module share.
-case ${KMNAME} in
-	kdepim|kdepim-runtime)
-		case ${PN} in
-			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
-				IUSE+=" +kontact"
-				RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact '' ${PV}) )"
-				;;
-		esac
-		;;
-esac
-
-DEPEND+=" ${COMMONDEPEND}"
-RDEPEND+=" ${COMMONDEPEND}"
-unset COMMONDEPEND
-
-debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies"
-debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
-
-# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
-case ${KDE_BUILD_TYPE} in
-	live)
-		if [[ ${KDE_SCM} == svn ]]; then
-			case ${KMNAME} in
-				extragear*|playground*)
-					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
-					ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}"
-					;;
-			esac
-		fi
-		;;
-esac
-
-# @ECLASS-VARIABLE: KMNAME
-# @DESCRIPTION:
-# Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it
-# _before_ inheriting this eclass, (unlike the other parameters), since it's
-# used to set $SRC_URI.
-
-# @ECLASS-VARIABLE: KMMODULE
-# @DESCRIPTION:
-# Specify exactly one subdirectory of $KMNAME here. Defaults to $PN.
-# The subdirectory listed here is treated exactly like items in $KMEXTRA.
-#
-# Example: The ebuild name of "kdebase/l10n" is kde-base/kdebase-l10n, because
-# just 'l10n' would be too confusing. Hence it sets KMMODULE="l10n".
-
-# @ECLASS-VARIABLE: KMNOMODULE
-# @DESCRIPTION:
-# If set to "true", $KMMODULE doesn't have to be defined.
-#
-# Example usage: If you're installing subdirectories of a package, like plugins,
-# you mark the top subdirectory (containing the package) as $KMEXTRACTONLY, and
-# set KMNOMODULE="true".
-if [[ -z ${KMMODULE} ]] && [[ ${KMNOMODULE} != true ]]; then
-	KMMODULE=${PN}
-fi
-
-# @ECLASS-VARIABLE: KMEXTRA
-# @DESCRIPTION:
-# All subdirectories listed here will be extracted, compiled & installed.
-# $KMMODULE is always added to $KMEXTRA.
-# If KDE_HANDBOOK is 'always' or 'optional' and handbook USE-flag is set, and if this
-# directory exists, then "doc/$KMMODULE" is added to $KMEXTRA. If there's additional
-# documentation in different subdirectories, it should be added to KMEXTRA manually..
-
-# @ECLASS-VARIABLE: KMCOMPILEONLY
-# @DESCRIPTION:
-# All subdirectories listed here will be extracted & compiled, but not installed.
-
-# TODO: better formulation may be needed
-# @ECLASS-VARIABLE: KMEXTRACTONLY
-# @DESCRIPTION:
-# All subdirectories listed here will be extracted, but neither compiled nor installed.
-# This can be used to avoid compilation in a subdirectory of a directory in $KMMODULE or $KMEXTRA
-
-# @ECLASS-VARIABLE: KMTARPARAMS
-# @DESCRIPTION:
-# Specify extra parameters to pass to tar, in kde4-meta_src_extract.
-# '-xpf -j' are passed to tar by default.
-
-# @FUNCTION: kde4-meta_pkg_setup
-# @DESCRIPTION:
-# Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version.
-# Use this one in split ebuilds.
-kde4-meta_pkg_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_setup
-}
-
-# @FUNCTION: kde4-meta_src_unpack
-# @DESCRIPTION:
-# This function unpacks the source for split ebuilds.
-# Further more is processed in kde4-meta_src_extract
-kde4-meta_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		case "${KDE_SCM}" in
-			svn)
-				S="${WORKDIR}/${P}"
-				mkdir -p "${S}"
-				ESVN_RESTRICT="export" subversion_src_unpack
-				subversion_wc_info
-				subversion_bootstrap
-				;;
-			git)
-				git-r3_src_unpack
-				;;
-		esac
-	fi
-	kde4-meta_src_extract
-}
-
-# @FUNCTION: kde4-meta_src_extract
-# @DESCRIPTION:
-# A function to extract the source for a split KDE ebuild.
-# Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and
-# KMTARPARAMS.
-kde4-meta_src_extract() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		# Export working copy to ${S}
-		einfo "Exporting parts of working copy to ${S}"
-		kde4-meta_create_extractlists
-
-		case ${KDE_SCM} in
-			svn)
-				local rsync_options subdir targetdir wc_path escm
-
-				rsync_options="--group --links --owner --perms --quiet --exclude=.svn/ --exclude=.git/"
-				wc_path="${ESVN_WC_PATH}"
-				escm="{ESVN}"
-
-				# Copy ${KMNAME} non-recursively (toplevel files)
-				rsync ${rsync_options} "${wc_path}"/* "${S}" \
-					|| die "${escm}: can't export toplevel files to '${S}'."
-				# Copy cmake directory
-				if [[ -d "${wc_path}/cmake" ]]; then
-					rsync --recursive ${rsync_options} "${wc_path}/cmake" "${S}" \
-						|| die "${escm}: can't export cmake files to '${S}'."
-				fi
-				# Copy all subdirectories
-				for subdir in $(_list_needed_subdirectories); do
-					targetdir=""
-					if [[ $subdir = doc/* && ! -e "$wc_path/$subdir" ]]; then
-						continue
-					fi
-
-					[[ ${subdir%/} = */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}"
-					rsync --recursive ${rsync_options} "${wc_path}/${subdir%/}" "${S}/${targetdir}" \
-						|| die "${escm}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'."
-				done
-				;;
-		esac
-	else
-		local abort tarball tarfile f extractlist postfix
-
-		if [[ ${PV} =~ 4.4.11 ]]; then
-			postfix="bz2"
-			KMTARPARAMS+=" --bzip2"
-		elif [[ ${PV} =~ _pre ]]; then
-			postfix="gz"
-			KMTARPARAMS+=" --gz"
-		else
-			postfix="xz"
-			KMTARPARAMS+=" --xz"
-		fi
-
-		tarball="${KMNAME}-${PV}.tar.${postfix}"
-
-		# Full path to source tarball
-		tarfile="${DISTDIR}/${tarball}"
-
-		# Detect real toplevel dir from tarball name - it will be used upon extraction
-		# and in _list_needed_subdirectories
-		topdir="${tarball%.tar.*}/"
-		if [[ ${topdir} =~ _pre ]]; then
-			topdir="${topdir%-$PV*}/"
-		fi
-
-		ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
-
-		kde4-meta_create_extractlists
-
-		for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake
-		do
-			extractlist+=" ${topdir}${f}"
-		done
-		extractlist+=" $(_list_needed_subdirectories)"
-
-		pushd "${WORKDIR}" > /dev/null || die
-
-		# @ECLASS-VARIABLE: KDE4_STRICTER
-		# @DESCRIPTION:
-		# Print out all issues found executing tar / kmextract files
-		# Set on if you want to find issues in kde-base ebuild unpack sequences
-		[[ -n ${KDE4_STRICTER} ]] && echo 'tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist}'
-		tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null || echo "tar extract command failed at least partially - continuing anyway"
-
-		# Default $S is based on $P; rename the extracted directory to match $S if necessary
-		if [[ ${KMNAME} != ${PN} ]]; then
-			mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
-		fi
-
-		popd > /dev/null || die
-
-		eend $?
-
-		if [[ -n ${KDE4_STRICTER} ]]; then
-			for f in $(_list_needed_subdirectories fatal); do
-				if [[ ! -e ${S}/${f#*/} ]]; then
-					eerror "'${f#*/}' is missing"
-					abort=true
-				fi
-			done
-			[[ -n ${abort} ]] && die "There were missing files."
-		fi
-
-		# We don't need it anymore
-		unset topdir
-	fi
-}
-
-# @FUNCTION: kde4-meta_create_extractlists
-# @DESCRIPTION:
-# Create lists of files and subdirectories to extract.
-# Also see descriptions of KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY,
-# KMEXTRACTONLY and KMTARPARAMS.
-kde4-meta_create_extractlists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Add default handbook locations
-	# FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5.
-	if [[ $(get_kde_version) < 4.5 ]] && use_if_iuse handbook && [[ -z ${KMNOMODULE} ]]; then
-		# We use the basename of $KMMODULE because $KMMODULE can contain
-		# the path to the module subdirectory.
-		KMEXTRA_NONFATAL+="
-			doc/${KMMODULE##*/}"
-	fi
-
-	# Add default handbook locations
-	if [[ -z ${KMNOMODULE} ]] && ( [[ ${KDE_HANDBOOK} == always ]] || ( [[ ${KDE_HANDBOOK} == optional ]] && use handbook ) ); then
-		KMEXTRA_NONFATAL+=" doc/${KMMODULE##*/}"
-	fi
-
-	# Add some CMake-files to KMEXTRACTONLY.
-	# Note that this actually doesn't include KMEXTRA handling.
-	# In those cases you should care to add the relevant files to KMEXTRACTONLY
-	case ${KMNAME} in
-		kde-baseapps)
-			KMEXTRACTONLY+="
-				CTestConfig.cmake
-				config-apps.h.cmake
-				ConfigureChecks.cmake"
-			;;
-		kde-runtime)
-			KMEXTRACTONLY+="
-				cmake/modules/
-				CTestConfig.cmake
-				config-runtime.h.cmake"
-			;;
-		kde-workspace)
-			KMEXTRACTONLY+="
-				cmake/modules/
-				config-unix.h.cmake
-				ConfigureChecks.cmake
-				config-workspace.h.cmake
-				config-X11.h.cmake
-				startkde.cmake
-				KDE4WorkspaceConfig.cmake.in"
-			;;
-		kdepim)
-			if [[ ${PN} != libkdepim ]]; then
-				KMEXTRACTONLY+="
-					libkdepim/"
-			fi
-			KMEXTRACTONLY+="
-				config-enterprise.h.cmake
-				kleopatra/ConfigureChecks.cmake
-				CTestCustom.cmake
-				kdepim-version.h.cmake
-				kdepim-version.h"
-			if use_if_iuse kontact; then
-				KMEXTRA+="
-					kontact/plugins/${PLUGINNAME:-${PN}}/"
-			fi
-			;;
-	esac
-
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"
-}
-
-_list_needed_subdirectories() {
-	local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist
-
-	# We expand KMEXTRA by adding CMakeLists.txt files
-	kmextra="${KMEXTRA}"
-	[[ ${1} != fatal ]] && kmextra+=" ${KMEXTRA_NONFATAL}"
-	for i in ${kmextra}; do
-		kmextra_expanded+=" ${i}"
-		j=$(dirname ${i})
-		while [[ ${j} != "." ]]; do
-			kmextra_expanded+=" ${j}/CMakeLists.txt";
-			j=$(dirname ${j})
-		done
-	done
-
-	# Expand KMMODULE
-	if [[ -n ${KMMODULE} ]]; then
-		kmmodule_expanded="${KMMODULE}"
-		j=$(dirname ${KMMODULE})
-		while [[ ${j} != "." ]]; do
-			kmmodule_expanded+=" ${j}/CMakeLists.txt";
-			j=$(dirname ${j})
-		done
-	fi
-
-	# Expand KMCOMPILEONLY
-	for i in ${KMCOMPILEONLY}; do
-		kmcompileonly_expanded+=" ${i}"
-		j=$(dirname ${i})
-		while [[ ${j} != "." ]]; do
-			kmcompileonly_expanded+=" ${j}/CMakeLists.txt";
-			j=$(dirname ${j})
-		done
-	done
-
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmextra_expanded: ${kmextra_expanded}"
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmmodule_expanded:  ${kmmodule_expanded}"
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmcompileonly_expanded: ${kmcompileonly_expanded}"
-
-	# Create final list of stuff to extract
-	# We append topdir only when specified (usually for tarballs)
-	for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \
-		${KMEXTRACTONLY}
-	do
-		extractlist+=" ${topdir}${i}"
-	done
-
-	echo ${extractlist}
-}
-
-# @FUNCTION: kde4-meta_src_prepare
-# @DESCRIPTION:
-# Meta-package build system configuration handling - commenting out targets, etc..
-kde4-meta_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-meta_change_cmakelists
-	kde4-base_src_prepare
-}
-
-# @FUNCTION: _change_cmakelists_parent_dirs
-# @DESCRIPTION:
-# Adjust CMakeLists.txt to shadow subdirectories
-# that are not required for the build.
-_change_cmakelists_parent_dirs() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local _olddir _dir
-	_dir="${S}"/${1}
-	until [[ ${_dir} == ${S} ]]; do
-		_olddir=$(basename "${_dir}")
-		_dir=$(dirname "${_dir}")
-		debug-print "${LINENO}: processing ${_dir} CMakeLists.txt searching for ${_olddir}"
-		if [[ -f ${_dir}/CMakeLists.txt ]]; then
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${_olddir}[[:space:]]*)/s/#DONOTCOMPILE //g" \
-				-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${_olddir}[[:space:]]*)/s/#DONOTCOMPILE //g" \
-				-i ${_dir}/CMakeLists.txt || die "${LINENO}: died in ${FUNCNAME} while processing ${_dir}"
-		fi
-	done
-}
-
-# @FUNCTION: kde4-meta_change_cmakelists
-# @DESCRIPTION:
-# Adjust CMakeLists.txt to comply to our splitting.
-kde4-meta_change_cmakelists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	pushd "${S}" > /dev/null || die
-
-	comment_all_add_subdirectory ./
-
-	# Restore "add_subdirectory( cmake )" in ${S}/CMakeLists.txt
-	if [[ -f CMakeLists.txt ]]; then
-		sed -e '/add_subdirectory[[:space:]]*([[:space:]]*cmake[[:space:]]*)/s/^#DONOTCOMPILE //' \
-			-e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*cmake[[:space:]]*)/s/^#DONOTCOMPILE //' \
-			-i CMakeLists.txt || die "${LINENO}: cmake sed died"
-	fi
-
-	# Restore "add_subdirectory( ${ ..." (this is done in kdesdk)
-	if [[ -f CMakeLists.txt ]]; then
-		sed -e '/add_subdirectory[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
-			-e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
-			-i CMakeLists.txt || die "${LINENO}: cmake sed died"
-	fi
-
-	if [[ -z ${KMNOMODULE} ]]; then
-		# Restore "add_subdirectory" in $KMMODULE subdirectories
-		find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | \
-			xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-				die "${LINENO}: died in KMMODULE section"
-		_change_cmakelists_parent_dirs ${KMMODULE}
-	fi
-
-	local i
-
-	# KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY
-	for i in ${KMEXTRACTONLY}; do
-		if [[ -d ${i} && -f ${i}/../CMakeLists.txt ]]; then
-			sed -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-				-i ${i}/../CMakeLists.txt || \
-				die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}"
-		fi
-	done
-
-	# KMCOMPILEONLY
-	for i in ${KMCOMPILEONLY}; do
-		debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}"
-		# Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions.
-		find "${S}"/${i} -name CMakeLists.txt -print0 | \
-			xargs -0 sed -i \
-				-e 's/^#DONOTCOMPILE //g' \
-				-e '/install(.*)/I{s/^/#DONOTINSTALL /;}' \
-				-e '/^install(/,/)/I{s/^/#DONOTINSTALL /;}' \
-				-e '/kde4_install_icons(.*)/I{s/^/#DONOTINSTALL /;}' || \
-				die "${LINENO}: sed died in the KMCOMPILEONLY section while processing ${i}"
-		_change_cmakelists_parent_dirs ${i}
-	done
-
-	# KMEXTRA section
-	for i in ${KMEXTRA}; do
-		debug-print "${LINENO}: KMEXTRA section, processing ${i}"
-		find "${S}"/${i} -name CMakeLists.txt -print0 | \
-			xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-			die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
-		_change_cmakelists_parent_dirs ${i}
-	done
-	# KMEXTRA_NONFATAL section
-	for i in ${KMEXTRA_NONFATAL}; do
-		if [[ -d "${S}"/${i} ]]; then
-			find "${S}"/${i} -name CMakeLists.txt -print0 | \
-				xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-					die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
-			_change_cmakelists_parent_dirs ${i}
-		fi
-	done
-
-	case ${KMNAME} in
-		kde-workspace)
-			# COLLISION PROTECT section
-			# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
-			# not as a part of every package.
-			if [[ ${PN} != kdebase-startkde && -f CMakeLists.txt ]]; then
-				# The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
-				sed -e '/startkde/s/^/#DONOTINSTALL /' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
-			fi
-			# Remove workspace target prefix in order to get direct linking to workspace libs
-			sed -e '/set(KDE4WORKSPACE_TARGET_PREFIX/s/^/#OVERRIDE /' \
-				-i CMakeLists.txt || die "${LINENO}: sed died in KDE4WORKSPACE_TARGET_PREFIX removal section"
-			# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
-			if [[ ${PN} != libkworkspace ]]; then
-				sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace strip config install and fix EXPORT section"
-			fi
-			# <KDE/4.11
-			if [[ ${PN} != plasma-workspace ]]; then
-				sed -e '/KActivities/s/REQUIRED//' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section"
-			fi
-			sed -e '/QImageBlitz/s/REQUIRED//' \
-				-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section 2"
-
-			# >=KDE/4.11
-			sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e 's/XCB REQUIRED/XCB/' -e 's/X11 REQUIRED/X11/' \
-				-e 's/message(FATAL_ERROR/message(/' -i CMakeLists.txt \
-				|| die "${LINENO}: sed died in kde-workspace dep reduction section"
-			if [[ "${PN}" != "kwin" ]]; then
-				sed -i -e "/^    macro_log_feature(OPENGL_OR_ES_FOUND/s/TRUE/FALSE/" \
-					"${S}"/CMakeLists.txt || die "${LINENO}: sed died removing kde-workspace opengl dependency"
-			fi
-			;;
-		kde-runtime)
-			sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/LibGcrypt/s/REQUIRED//' -i CMakeLists.txt \
-				|| die "${LINENO}: sed died in kde-runtime dep reduction section"
-
-			# COLLISION PROTECT section
-			# Only install the kde4 script as part of kde-base/kdebase-data
-			if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then
-				sed -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
-					-i CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
-			fi
-			;;
-		kdenetwork)
-			# Disable hardcoded kdepimlibs check
-			sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
-				-i CMakeLists.txt || die "failed to disable hardcoded checks"
-			;;
-		kdepim)
-			# Disable hardcoded checks
-			sed -r -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/find_package\(KdepimLibs/s/REQUIRED//' \
-				-e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
-				-e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
-				-e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \
-				-e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
-				-i CMakeLists.txt || die "failed to disable hardcoded checks"
-			# Disable broken or redundant build logic
-			if use_if_iuse kontact || [[ ${PN} = kontact ]]; then
-				sed -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # &/' \
-					-e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
-					-i kontact/plugins/CMakeLists.txt || die 'failed to override build logic'
-			fi
-			case ${PV} in
-				4.4*)
-					case ${PN} in
-						kalarm|kmailcvt|kontact|korganizer|korn)
-							sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
-								-e '/add_custom_target(kmail_xml /,/)/p' \
-								-i kmail/CMakeLists.txt || die "uncommenting xml failed"
-							_change_cmakelists_parent_dirs kmail
-							;;
-					esac
-					;;
-			esac
-			;;
-	esac
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: kde4-meta_src_configure
-# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in split
-# ebuilds.
-kde4-meta_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_src_configure
-}
-
-# @FUNCTION: kde4-meta_src_compile
-# @DESCRIPTION:
-# General function for compiling split KDE4 applications.
-# Overrides kde4-base_src_compile.
-kde4-meta_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_src_compile "$@"
-}
-
-# @FUNCTION: kde4-meta_src_test
-# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5) if
-# I_KNOW_WHAT_I_AM_DOING is set. Use this in split ebuilds.
-kde4-meta_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ $I_KNOW_WHAT_I_AM_DOING ]]; then
-		kde4-base_src_test
-	else
-		einfo "Tests disabled"
-	fi
-}
-
-# @FUNCTION: kde4-meta_src_install
-# @DESCRIPTION:
-# Function for installing KDE4 split applications.
-kde4-meta_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Search ${S}/${KMMODULE} and install common documentation files found
-	local doc
-	for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-		[[ -f "${doc}" ]] && [[ -s "${doc}" ]] && dodoc "${doc}"
-	done
-
-	kde4-base_src_install
-}
-
-# @FUNCTION: kde4-meta_pkg_preinst
-# @DESCRIPTION:
-# Invoke its equivalent in kde4-base.eclass.
-kde4-meta_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_preinst
-}
-
-# @FUNCTION: kde4-meta_pkg_postinst
-# @DESCRIPTION:
-# Invoke kbuildsycoca4.
-kde4-meta_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_postinst
-}
-
-# @FUNCTION: kde4-meta_pkg_postrm
-# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
-# ebuilds.
-kde4-meta_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_postrm
-}
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0255dbac884a82144bf0a1bcfec9788b1753204a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 19:04:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 19:07:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0255dbac

kde5.eclass: kde-frameworks-5.28.0 is released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7a8c85a..9ef7c15 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -119,7 +119,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.28.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     14ad094657f03c6b9e7c5fa179602691f54ecdb3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 17 14:24:16 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 19:19:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14ad0946

kde5-functions.eclass: Move *_MINIMAL setup here from kde5.eclass

Makes sure that 5.8 LTS stable branch does not raise FRAMEWORKS_MINIMAL
Also bumping FRAMEWORKS_MINIMAL to 5.28.0 for >=Plasma-5.9

 eclass/kde5-functions.eclass | 37 +++++++++++++++++++++++++++++--------
 eclass/kde5.eclass           | 27 ---------------------------
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index a6bf976..1724a69 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -23,6 +23,35 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
+# determine the build type
+if [[ ${PV} = *9999* ]]; then
+	KDE_BUILD_TYPE="live"
+else
+	KDE_BUILD_TYPE="release"
+fi
+export KDE_BUILD_TYPE
+
+case ${CATEGORY} in
+	kde-frameworks)
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		;;
+	kde-plasma)
+		if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.26.0}	# special 5.8 LTS rule to not get overwritten below
+		elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.28.0}
+		fi
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		;;
+	kde-apps)
+		local vcr2=$((10#$(get_version_component_range 2)))
+		if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.28.0}
+		fi
+		unset vcr2
+		;;
+esac
+
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
@@ -70,14 +99,6 @@ case ${KDE_SCM} in
 	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
 esac
 
-# determine the build type
-if [[ ${PV} = *9999* ]]; then
-	KDE_BUILD_TYPE="live"
-else
-	KDE_BUILD_TYPE="release"
-fi
-export KDE_BUILD_TYPE
-
 # @FUNCTION: _check_gcc_version
 # @INTERNAL
 # @DESCRIPTION:

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9ef7c15..4876d7c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -142,33 +142,6 @@ fi
 case ${KDE_AUTODEPS} in
 	false)	;;
 	*)
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			case ${CATEGORY} in
-				kde-frameworks)
-					: ${FRAMEWORKS_MINIMAL:=9999}
-				;;
-				kde-plasma)
-
-					: ${FRAMEWORKS_MINIMAL:=9999}
-				;;
-				*) ;;
-			esac
-		fi
-
-		if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then
-			if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
-				: ${FRAMEWORKS_MINIMAL:=5.27.0}
-			fi
-		fi
-
-		if [[ ${CATEGORY} = kde-apps ]]; then
-			local vcr2=$((10#$(get_version_component_range 2)))
-			if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
-				: ${FRAMEWORKS_MINIMAL:=5.28.0}
-			fi
-			unset vcr2
-		fi
-
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5afa991ccc424d87451ab7d1d3a118e899ed65a6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 19 00:13:02 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 00:18:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5afa991c

kde5.eclass: Add KDE_SUBSLOT

 eclass/kde5.eclass | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4876d7c..a6fdfa4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -113,6 +113,14 @@ fi
 # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
 : ${KDE_SELINUX_MODULE:=none}
 
+# @ECLASS-VARIABLE: KDE_SUBSLOT
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# If set to "true", add a subslot to the package, where subslot is either
+# defined as major.minor version for kde-*/ categories or ${PV} if other.
+# For any other value, that value will be used as subslot.
+: ${KDE_SUBSLOT:=false}
+
 # @ECLASS-VARIABLE: KDE_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION
@@ -133,12 +141,31 @@ fi
 
 LICENSE="GPL-2"
 
+SLOT=5
+
 if [[ ${CATEGORY} = kde-frameworks ]]; then
-	SLOT=5/$(get_version_component_range 1-2)
-else
-	SLOT=5
+	KDE_SUBSLOT=true
 fi
 
+case ${KDE_SUBSLOT} in
+	false)  ;;
+	true)
+		case ${CATEGORY} in
+			kde-frameworks | \
+			kde-plasma | \
+			kde-apps)
+				SLOT+="/$(get_version_component_range 1-2)"
+				;;
+			*)
+				SLOT+="/${PV}"
+				;;
+		esac
+		;;
+	*)
+		SLOT+="/${KDE_SUBSLOT}"
+		;;
+esac
+
 case ${KDE_AUTODEPS} in
 	false)	;;
 	*)

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     7dfe00ffcb33caeb04dfb8493ce4fdb15fe79204
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Nov 25 14:53:58 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 14:59:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dfe00ff

kde5.eclass: Fix install with L10N=""

 eclass/kde5.eclass | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a6fdfa4..53b5eb4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -500,13 +500,17 @@ kde5_src_prepare() {
 			rm -r kde-l10n-sr-${PV} || die "Failed to remove sr parent lingua"
 		fi
 
-		# add all l10n directories to cmake
 		cat <<-EOF > CMakeLists.txt || die
-project(${PN})
-cmake_minimum_required(VERSION 2.8.12)
-$(printf "add_subdirectory( %s )\n" \
-	`find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`)
-EOF
+		project(${PN})
+		cmake_minimum_required(VERSION 2.8.12)
+		EOF
+		# add all l10n directories to cmake
+		if [[ -n ${A} ]]; then
+			cat <<-EOF >> CMakeLists.txt || die
+			$(printf "add_subdirectory( %s )\n" \
+				`find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`)
+			EOF
+		fi
 
 		# for KF5: drop KDE4-based part; for KDE4: drop KF5-based part
 		case ${l10npart} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     41125b34f88d166420a158fb3dcd3059cdcabca5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 20:07:32 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 20:07:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=41125b34

kde5.eclass: Mark KDE Frameworks 5.29.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 53b5eb4..9dce208 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.29.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     c6be0e76d56626dad7977e92df2b9b25e70c2cc8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 14:58:05 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 14:58:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6be0e76

kde5.eclass: Update Plasma 4 workspace check

 eclass/kde5.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9dce208..ec4a492 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -720,11 +720,11 @@ kde5_pkg_postinst() {
 			einfo "Use it at your own risk."
 			einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
 		fi
-		# for kf5-based applications tell user that he SHOULD NOT be using kde-base/plasma-workspace
+		# for kf5-based applications tell user that he SHOULD NOT be using kde-plasma/plasma-workspace:4
 		if [[ ${KDEBASE} != kde-base || ${CATEGORY} = kde-apps ]]  && \
-				has_version 'kde-base/plasma-workspace'; then
+				has_version 'kde-plasma/plasma-workspace:4'; then
 			echo
-			ewarn "WARNING! Your system configuration still contains \"kde-base/plasma-workspace\","
+			ewarn "WARNING! Your system configuration still contains \"kde-plasma/plasma-workspace:4\","
 			ewarn "indicating a Plasma 4 setup. With this setting you are unsupported by KDE team."
 			ewarn "Please consider upgrading to Plasma 5."
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     07d1695116324953a0e3c9933c4865c585003558
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 16:46:52 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 16:46:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=07d16951

kde5.eclass: Mark KDE Frameworks 5.29.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ec4a492..3669536 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.29.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     dbdbd6a518e3f5037c88e2709d157c93069cd98c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 17:26:01 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 17:26:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbdbd6a5

kde4-base.eclass: Add KDevelop 4.7.4 SRC_URI

 eclass/kde4-base.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c79a00e..1fd79e9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -509,6 +509,7 @@ _calculate_src_uri() {
 			case ${KDEVELOP_VERSION} in
 				4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
 				4.7.3) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
+				4.7.4) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/${P}.tar.xz" ;;
 				*) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
 			esac
 			;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     f77d785fe15870c92e704668d47c6966476c6827
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 19:01:24 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:01:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f77d785f

kde5.eclass: Sync with gentoo main tree

 eclass/kde5.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3669536..ebdd790 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -773,7 +773,9 @@ _l10n_variant_subdir_buster() {
 	esac
 
 	for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do
-		echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt
+		if [[ ${subdir##*/} != "cmake_modules" ]] ; then
+			echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt || die
+		fi
 	done
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     ed52c23f305de6b6e307be23659649ddc95ec996
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 09:01:40 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 09:01:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed52c23f

cmake-utils.eclass: Sync with gentoo main tree

 eclass/cmake-utils.eclass | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 393ee28..1fddae1 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -517,22 +517,33 @@ enable_cmake-utils_src_configure() {
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
-		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
-		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
-		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
 	_EOF_
 
+	local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC)
+
+	# !!! IMPORTANT NOTE !!!
+	# Single slash below is intentional. CMake is weird and wants the
+	# CMAKE_*_VARIABLES split into two elements: the first one with
+	# compiler path, and the second one with all command-line options,
+	# space separated.
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
-		SET (CMAKE_C_COMPILER $(tc-getCC))
-		SET (CMAKE_CXX_COMPILER $(tc-getCXX))
-		SET (CMAKE_Fortran_COMPILER $(tc-getFC))
+		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+		SET (CMAKE_C_COMPILER "${myCC/ /;}")
+		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
+		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
+		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
+		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
 	_EOF_
 
+	# We are using the C compiler for assembly by default.
+	local -x ASMFLAGS=${CFLAGS}
+	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
+
 	if tc-is-cross-compiler; then
 		local sysname
 		case "${KERNEL:-linux}" in
@@ -593,11 +604,26 @@ enable_cmake-utils_src_configure() {
 	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
 	local libdir=$(get_libdir)
 	cat > "${common_config}" <<- _EOF_ || die
+		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
+	# Wipe the default optimization flags out of CMake
+	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]] && ! has "${EAPI}" 2 3 4 5; then
+		cat >> ${common_config} <<- _EOF_ || die
+			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+		_EOF_
+	fi
+
 	# Convert mycmakeargs to an array, for backwards compatibility
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     51574a62149d68b780b11dfadd7270556ffdd61e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 09:04:57 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 09:04:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=51574a62

cmake-utils.eclass: Set CMAKE_MIN_VERSION to 3.2.2

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 1fddae1..94ba5df 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -57,7 +57,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=2.8.12}
+: ${CMAKE_MIN_VERSION:=3.2.2}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     f2861707814e1ba59eb05efd0edd5af7710743a5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 15:59:33 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 15:59:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2861707

cmake-utils.eclass: Set CMAKE_MIN_VERSION to 3.5.2

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 4a74584..1b269dd 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -57,7 +57,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.2.2}
+: ${CMAKE_MIN_VERSION:=3.5.2}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     ff043f67e5df4cf15ab503f500da8de98b14ca37
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 09:06:01 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 09:06:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff043f67

kde5.eclass: Drop obsolete kdepim S handling

 eclass/kde5.eclass | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 850a272..2e1a553 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -240,11 +240,6 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
-# FIXME: Drop this when kdepim-16.08.x is no more
-if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
-	S="${S}/${PN}"
-fi
-
 if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then
 	if [[ -n ${KMNAME} ]]; then
 		S=${WORKDIR}/${KMNAME}-${PV%.0}	# kdevelop missing trailing .0 in first release

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5f80efa768f765f0f31f3956545c13fa7573284d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 14:40:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 15:45:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f80efa7

kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined

So far we relied on ${SLOT} (4|5) to depend on the correct Qt slot, but
this is not always the case. If an ebuild inherits kde5-functions and
uses add_qt_dep then it is safe to assume it will depend on Qt5.

 eclass/kde5-functions.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ad576c6..26e9811 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -280,14 +280,19 @@ add_qt_dep() {
 	fi
 
 	local version
+	local slot=${4}
 
 	if [[ -n ${3} ]]; then
 		version=${3}
-	elif [[ -z "${version}" ]] ; then
+	elif [[ -z "${version}" ]]; then
 		version=${QT_MINIMAL}
 	fi
 
-	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
+	if [[ -z ${slot} ]]; then
+		slot="5"
+	fi
+
+	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
 # @FUNCTION: get_kde_version

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4551c14eb8aecfdab59148ca1446464f33127736
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 08:29:13 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 14:42:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4551c14e

cmake-utils.eclass: Support running ctest in parallel

Pass -j and --test-load options (with values based on MAKEOPTS) to CTest
by default, in order to enable parallel test runs.

 eclass/cmake-utils.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 1b269dd..099aaac 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -117,7 +117,7 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs multilib flag-o-matic eutils versionator
+inherit toolchain-funcs multilib flag-o-matic eutils multiprocessing versionator
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
@@ -780,8 +780,9 @@ enable_cmake-utils_src_test() {
 
 	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
 
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
+	set -- ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"
+	echo "$@" >&2
+	if "$@" ; then
 		einfo "Tests succeeded."
 		popd > /dev/null || die
 		return 0

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     e0e780f3d30eb49daa86139fe0d4aad1937c13a3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 07:58:49 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 08:20:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0e780f3

kde5.eclass: Mark KDE Frameworks 5.30.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2e1a553..176c54e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.30.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     83ee256c4e08400771af6266ae1d4c7d23467658
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 07:44:31 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 07:44:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=83ee256c

kde5.eclass: Mark KDE Applications 16.12.1 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 176c54e..6d5b44c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.30.0 )
+KDE_UNRELEASED=( kde-frameworks-5.30.0 kde-apps-16.12.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c931522156e9da891bbafdcdf37eaedb83f7b696
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 18:55:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 19:44:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c9315221

kde5-functions.eclass: Raise Plasma-5.9 FRAMEWORKS_MINIMAL to 5.29

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 26e9811..1b6797c 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,7 +39,7 @@ case ${CATEGORY} in
 		if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.26.0}	# special 5.8 LTS rule to not get overwritten below
 		elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.28.0}
+			: ${FRAMEWORKS_MINIMAL:=5.29.0}
 		fi
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     20470c748d494c6e41c89fb93f9d5078b1dfe2dd
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 10:07:46 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 10:07:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=20470c74

kde5.eclass: Mark KDE Frameworks 5.30.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 176c54e..2e1a553 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.30.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     758e10fc630ff4222a9b6c33b985b7fc783f4500
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 10:43:48 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 10:43:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=758e10fc

kde5-functions.eclass: Raise Plasmas 5.9 QT_MINIMAL to 5.7.1

Gentoo-bug: 605646

 eclass/kde5-functions.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 1b6797c..e87cf93 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,6 +39,7 @@ case ${CATEGORY} in
 		if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.26.0}	# special 5.8 LTS rule to not get overwritten below
 		elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+			: ${QT_MINIMAL:=5.7.1}
 			: ${FRAMEWORKS_MINIMAL:=5.29.0}
 		fi
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     abcb6767fefaa3f57965096a4cb89c364028b218
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 17:40:42 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 17:40:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=abcb6767

kde5.eclass: Raise RDEPEND on kde-frameworks/kf-env to 4

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2e1a553..a049455 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -170,7 +170,7 @@ case ${KDE_AUTODEPS} in
 	false)	;;
 	*)
 		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
-		RDEPEND+=" >=kde-frameworks/kf-env-3"
+		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
 		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2c4949c5e6475013213f4a64e8392d9d298e6ac7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:15:19 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 10:15:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2c4949c5

kde5-functions.eclass: raise PLASMA_MINIMAL to latest stable

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index cadeda9..9a54fb4 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -56,7 +56,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.4.1}
+: ${PLASMA_MINIMAL:=5.8.3}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1b54dba9916b069f17d072048c03a8156f424c6e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:12:48 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 10:15:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b54dba9

kde5-functions.eclass: raise FRAMEWORKS_MINIMAL to latest stable

 eclass/kde5-functions.eclass | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index e87cf93..cadeda9 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -36,21 +36,11 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.26.0}	# special 5.8 LTS rule to not get overwritten below
-		elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+		if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
 			: ${QT_MINIMAL:=5.7.1}
-			: ${FRAMEWORKS_MINIMAL:=5.29.0}
 		fi
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
-	kde-apps)
-		local vcr2=$((10#$(get_version_component_range 2)))
-		if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.28.0}
-		fi
-		unset vcr2
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
@@ -61,7 +51,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.26.0}
+: ${FRAMEWORKS_MINIMAL:=5.29.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     98df9212f4098a9c8ad9cec485e91712cf9914be
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 18:33:48 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 18:33:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=98df9212

kde5.eclass: Mark KDE Plasma 5.9.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a049455..94374f4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.9.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     38072da3e72f73782a7e50b09bcc5190d8f70686
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 19:56:23 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 19:56:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=38072da3

cmake-utils.eclass: Drop EAPI 3

No consumers left.

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 099aaac..7b3500b 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -112,7 +112,7 @@ _CMAKE_UTILS_ECLASS=1
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 case ${EAPI} in
-	2|3|4|5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
+	2|4|5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
 	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     3d4d295e08ddb9fbc1975e89806540b8449a1ba2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 12:50:01 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 12:50:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d4d295e

kde5.eclass: Mark KDE Plasma 5.9.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 94374f4..a049455 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.9.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2e9dc37215fd88e6034b36d926774c8355ea609d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 14:14:44 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 14:14:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e9dc372

kde5-functions.eclass: Raise PLASMA_MINIMAL to latest stable

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 9a54fb4..3be9ca3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -56,7 +56,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.8.3}
+: ${PLASMA_MINIMAL:=5.8.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0a0e42155232629006f35d99abf828a297217c94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 14:24:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 14:24:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a0e4215

kde5.eclass: Mark kde-frameworks-5.31.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a049455..7e842d4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.31.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     5fc722d8dc0fd8a36f42d67ded93aa6d84502764
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 21:17:24 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 21:17:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5fc722d8

cmake-utils.eclass: Set CMAKE_MIN_VERSION to 3.6.3

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7b3500b..d7870c4 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -57,7 +57,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.5.2}
+: ${CMAKE_MIN_VERSION:=3.6.3}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     751dab52267ca575a8689784f0687b099f6229d8
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 17:25:45 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 17:25:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=751dab52

cmake-utils.eclass: set CMAKE_SYSTEM_PROCESSOR

Certain build systems rely on this for crosscompiling.
Patch by aballier.

Gentoo-bug: 607904

 eclass/cmake-utils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d7870c4..b1d499c 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -538,6 +538,7 @@ enable_cmake-utils_src_configure() {
 		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
 		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
 		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
+		SET (CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}")
 	_EOF_
 
 	# We are using the C compiler for assembly by default.

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     fa4911abeeac6ac2c8257f72d3d8cdcf57a0f7c2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 19:36:46 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 19:36:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fa4911ab

eclass: Mark KDE Applications 16.12.2 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index edcc15a..0e5f9c2 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -177,7 +177,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-16.12.2 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7e842d4..b417d2d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.31.0 )
+KDE_UNRELEASED=( kde-frameworks-5.31.0 kde-apps-16.12.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     11d1e7402325e50de639720b7a2ff01f851510b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 22:31:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 23:04:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=11d1e740

kde5-functions.eclass: Raise QT_MINIMAL to 5.7.1 for Plasma live

 eclass/kde5-functions.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 3be9ca3..90fb579 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,7 +39,10 @@ case ${CATEGORY} in
 		if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
 			: ${QT_MINIMAL:=5.7.1}
 		fi
-		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+			: ${FRAMEWORKS_MINIMAL:=9999}
+			: ${QT_MINIMAL:=5.7.1}
+		fi
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     3094cd6675a43fdc6f492070aa8d79224ba8eade
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 18:27:12 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 18:27:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3094cd66

eclass: Mark KDE Applications 16.12.2 as released

This reverts commit fa4911abeeac6ac2c8257f72d3d8cdcf57a0f7c2.

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0e5f9c27e0..edcc15acc3 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -177,7 +177,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-16.12.2 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b417d2d09e..7e842d4a52 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.31.0 kde-apps-16.12.2 )
+KDE_UNRELEASED=( kde-frameworks-5.31.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     1a5b351f70c71e06c0558c4d58b679735cc78526
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 11:20:55 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 11:20:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a5b351f

kde5.eclass: Mark KDE Frameworks 5.31.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7e842d4a52..a0494554fa 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -127,7 +127,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.31.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     ca60ba5a6e23f1b3b87f31c852a4de8716dcdeae
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 19:46:34 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 19:49:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca60ba5a

kde5.eclass: Mark KDE Frameworks 5.32 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2d9151f95a..fc8f10db03 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.32.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     bcc1b8616cb4c74fe40f7aabc78b422bc5fd9d04
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 16:30:05 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 16:30:05 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bcc1b861

kde*eclass: Mark KDE Applications 16.12.3 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0f750fccfc..de996510ea 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-16.12.3 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fc8f10db03..1fd8b78ca7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.32.0 )
+KDE_UNRELEASED=( kde-frameworks-5.32.0 kde-apps-16.12.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     9167006c6654243fd78fb37a440ab36c85ea7ff6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 18:30:26 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 19:26:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9167006c

kde*eclass: Mark KDE Applications 16.12.3 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index de996510ea..0f750fccfc 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-16.12.3 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1fd8b78ca7..fc8f10db03 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.32.0 kde-apps-16.12.3 )
+KDE_UNRELEASED=( kde-frameworks-5.32.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a6e8d90b46a814d571be89d81d52344e036d7eea
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 19:40:03 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 19:40:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6e8d90b

kde5.eclass: Mark KDE Frameworks 5.32.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fc8f10db03..2d9151f95a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.32.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     340c61f72143a1052ea4ac29aae2bf756edf6f4c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 02:53:17 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 02:53:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=340c61f7

cmake-utils.eclass: raise minimum version to 3.7.2

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 003488dde9..07f719a62a 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -56,7 +56,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.6.3}
+: ${CMAKE_MIN_VERSION:=3.7.2}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     bc73205325cc83e4e1ad930aaedc315f7de104de
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 21:36:11 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 21:36:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc732053

kde5.eclass: Drop KDevelop 5.0.0 release workaround

Is not needed anymore and breaks 5.1.0.

 eclass/kde5.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2d9151f95a..106383bb05 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -241,9 +241,9 @@ fi
 
 if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then
 	if [[ -n ${KMNAME} ]]; then
-		S=${WORKDIR}/${KMNAME}-${PV%.0}	# kdevelop missing trailing .0 in first release
+		S=${WORKDIR}/${KMNAME}-${PV}
 	else
-		S=${WORKDIR}/${PN}-${PV%.0}	# kdevelop missing trailing .0 in first release
+		S=${WORKDIR}/${P}
 	fi
 fi
 
@@ -326,7 +326,7 @@ _calculate_src_uri() {
 				RESTRICT+=" mirror"
 				;;
 			*)
-				SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV%.0}.tar.xz" ;;
+				SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
 		esac
 		unset _kdebase
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6421faa2ea0cdeb35327ce41e63490c0526f9b9e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 07:32:39 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 07:32:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6421faa2

kde5-functions.eclass: Raise kde-apps-17.04 FRAMEWORKS_MINIMAL to 5.32

 eclass/kde5-functions.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 99d24b6b55..686baf803a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -43,6 +43,11 @@ case ${CATEGORY} in
 			: ${QT_MINIMAL:=5.7.1}
 		fi
 		;;
+	kde-apps)
+		if [[ $(get_version_component_range 1) -ge 17 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.32.0}
+		fi
+		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3c5360a28f29d26cf4a25874df36cca1211de6f3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:08:37 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:08:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3c5360a2

kde5.eclass: Mark KDE Frameworks 5.33.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 106383bb05..f1519b798d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.33.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c9c4d5e713a374a346b0621ddf1afd1c1b6e6424
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  6 23:52:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 21:40:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c9c4d5e7

kde5.eclass: Add blocker against kde-apps/kde{,pim}-l10n

Changes in translation handling:
https://mail.kde.org/pipermail/kde-distro-packagers/2017-April/000276.html

 eclass/kde5.eclass | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f1519b798d..245a1427f3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -172,13 +172,17 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
-		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
-			RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
-		fi
-
-		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
-			RDEPEND+=" !kde-apps/${PN}:4"
-		fi
+		case ${CATEGORY} in
+			kde-frameworks | \
+			kde-plasma)
+				RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
+				;;
+			kde-apps)
+				[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
+				[[ $(get_version_component_range 1) -ge 17 ]] && \
+					RDEPEND+=" !kde-apps/kde-l10n !kde-apps/kdepim-l10n:5"
+				;;
+		esac
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a5b9dda4d9336b746547e53c6c432993966b5891
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 20:52:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 21:40:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5b9dda4

kde5.eclass: LINGUAS handling: Also drop subdir paths

 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 245a1427f3..eb6f43d635 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -550,6 +550,7 @@ kde5_src_prepare() {
 				rm -r ${lang} || die
 				if [[ -e CMakeLists.txt ]] ; then
 					cmake_comment_add_subdirectory ${lang}
+					sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" -i CMakeLists.txt || die
 				fi
 			elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
 				if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6425df68319e5ef162b028e2e119167dd1ecd77b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 15:10:24 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 15:10:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6425df68

kde5.eclass: Mark KDE Frameworks 5.33.0 released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index eb6f43d635..0fc2d72f6b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.33.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     696a07882b68220f598d16f3c1a318b04283cd3f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 21:51:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 21:51:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=696a0788

kde5.eclass: Add additional blocker for <kde-apps/kde4-l10n-16.12.0:4

There would be file collisions in the event that someone is upgrading
straight from 16.08 to 17.04, specifically packages that were ported
to KF5 in the meantime.

 eclass/kde5.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0fc2d72f6b..e071a82b5d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -180,7 +180,11 @@ case ${KDE_AUTODEPS} in
 			kde-apps)
 				[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
 				[[ $(get_version_component_range 1) -ge 17 ]] && \
-					RDEPEND+=" !kde-apps/kde-l10n !kde-apps/kdepim-l10n:5"
+					RDEPEND+="
+						!kde-apps/kde-l10n
+						!<kde-apps/kde4-l10n-16.12.0:4
+						!kde-apps/kdepim-l10n:5
+					"
 				;;
 		esac
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     05b3b4b620eb04ef2a5248587dfdd14a3b5ac030
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 10:48:56 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 10:48:56 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=05b3b4b6

kde*.eclass: Mark KDE Applications 17.04.0 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0f750fccfc..562366b365 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.04.0 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e071a82b5d..04b67a8978 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.04.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     70c4a7ff1af2876114c63b7dbe90e98d4aac7f8d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 20:36:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 20:36:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70c4a7ff

kde5-functions.eclass: Raise QT_MINIMAL to 5.7.1 for kde-apps live

All of KDE PIM and some of kde-apps is depending on it.

 eclass/kde5-functions.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 686baf803a..f138d83aa0 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -47,6 +47,9 @@ case ${CATEGORY} in
 		if [[ $(get_version_component_range 1) -ge 17 ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.32.0}
 		fi
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+			: ${QT_MINIMAL:=5.7.1}
+		fi
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     30e900db1ecd0a17b1cc1b91bc0a698d48a3a379
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 15:11:59 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 15:11:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=30e900db

kde*.eclass: Mark KDE Applications 17.04.0 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 562366b365..0f750fccfc 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.04.0 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 04b67a8978..e071a82b5d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.04.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7114304391ba3261f74725906fdc5a0b8d192b29
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 08:28:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 08:31:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=71143043

kde5.eclass: Check for and remove 'poqm' directory if USE=-nls

 eclass/kde5.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e071a82b5d..5e9a731b59 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -540,8 +540,13 @@ kde5_src_prepare() {
 	fi
 
 	# drop translations when nls is not wanted
-	if [[ -d po ]] && in_iuse nls && ! use nls ; then
-		rm -r po || die
+	if in_iuse nls && ! use nls ; then
+		if [[ -d po ]] ; then
+			rm -r po || die
+		fi
+		if [[ -d poqm ]] ; then
+			rm -r poqm || die
+		fi
 	fi
 
 	# enable only the requested translations

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4aa1f9272910de4b8ed53317aa6c1d6e7fd3335e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 12:38:56 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 12:38:56 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4aa1f927

kde5.eclass: Filter LINGUAS in poqm as well

 eclass/kde5.eclass | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5e9a731b59..38b0fcda90 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -549,25 +549,30 @@ kde5_src_prepare() {
 		fi
 	fi
 
-	# enable only the requested translations
-	# when required
-	if [[ -d po && -v LINGUAS ]] ; then
-		pushd po > /dev/null || die
-		local lang
-		for lang in *; do
-			if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
-				rm -r ${lang} || die
-				if [[ -e CMakeLists.txt ]] ; then
-					cmake_comment_add_subdirectory ${lang}
-					sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" -i CMakeLists.txt || die
-				fi
-			elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
-				if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
-					rm ${lang} || die
+	# enable only the requested translations when required
+	if [[ -v LINGUAS ]] ; then
+		local po
+		for po in po poqm; do
+		if [[ -d ${po} ]] ; then
+			pushd ${po} > /dev/null || die
+			local lang
+			for lang in *; do
+				if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
+					rm -r ${lang} || die
+					if [[ -e CMakeLists.txt ]] ; then
+						cmake_comment_add_subdirectory ${lang}
+						sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
+							-i CMakeLists.txt || die
+					fi
+				elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+					if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
+						rm ${lang} || die
+					fi
 				fi
-			fi
+			done
+			popd > /dev/null || die
+		fi
 		done
-		popd > /dev/null || die
 	fi
 
 	if [[ ${KDE_BUILD_TYPE} = release && ${CATEGORY} != kde-apps ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     54ac2df4df2d97a68b369ed94c4e623350315a6e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 10:42:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 23:11:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=54ac2df4

kde5.eclass: Move GNOME2_ECLASS_ICONS conditional from gnome2-utils

 eclass/kde5.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 38b0fcda90..102a41545a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -723,7 +723,9 @@ kde5_pkg_preinst() {
 kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	gnome2_icon_cache_update
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
 	xdg_pkg_postinst
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7d92d160ed9986f23d531c8cbb6b3e95d01f4f00
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 10:42:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 18:08:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d92d160

kde4-base.eclass: Move GNOME2_ECLASS_ICONS conditional from gnome2-utils

 eclass/kde4-base.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0f750fccfc..47b3770ba4 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -960,7 +960,9 @@ kde4-base_pkg_preinst() {
 kde4-base_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	gnome2_icon_cache_update
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	buildsycoca

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     98e6b139c9616c1191ee85e96f134a20806f7c4d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 20:16:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 09:31:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=98e6b139

kde5-functions.eclass: Fix minimum version requirements

- Plasma 5.8 stable branch should not require Qt-5.7.1
- Plasma 5.10 already requires KF-5.34

 eclass/kde5-functions.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f138d83aa0..d187f54283 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -35,10 +35,13 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+		if [[ $(get_version_component_range 2) -ge 9 ]]; then
 			: ${QT_MINIMAL:=5.7.1}
 		fi
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+		if ! [[ $(get_version_component_range 2) -le 9 && $(get_version_component_range 3) -lt 50 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.34.0}
+		fi
+		if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 			: ${QT_MINIMAL:=5.7.1}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2e6fb2a3c2e6b4e5a1ac203612114e31f9cc716b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 21:33:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 21:33:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e6fb2a3

kde4-base.eclass: Add SRC_URI for KDE PIM 4.14.11_pre20160611 snapshots

 eclass/kde4-base.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 47b3770ba4..02e1c6370b 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -495,6 +495,9 @@ _calculate_src_uri() {
 				4.14.10)
 					# Part of 15.04.3 actually, sigh. Used by last version of KDE PIM 4.
 					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
+				4.14.11*)
+					# KDEPIM 4.14 snapshot with Gentoo patches
+					SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     739ebd606822915f811232a951c15172d3132172
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 09:15:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  7 09:15:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=739ebd60

kde5.eclass: Mark KDE Frameworks 5.34.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 102a41545a..d2f50e32f0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( 5.34.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7d83cb13e8c59708ac1f221ae7d976c6c6005b65
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 10:03:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  9 10:04:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d83cb13

kde*.eclass: Mark KDE Applications 17.04.1 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 02e1c6370b..bb19071232 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.04.1 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d2f50e32f0..51b4779153 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( 5.34.0 )
+KDE_UNRELEASED=( kde-frameworks-5.34.0 kde-apps-17.04.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a34f7f8f7a5af810a1ac20fe2e944cca684af21a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 14:52:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 14:52:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a34f7f8f

kde5.eclass: Mark KDE Applications 17.04.1 released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 51b4779153..685a3b1f06 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.34.0 kde-apps-17.04.1 )
+KDE_UNRELEASED=( kde-frameworks-5.34.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b711fd8595d968899d3b5d3b81c87e1d91ce6e58
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 20:56:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 18:26:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b711fd85

kde5.eclass: 16.12.3 tarballs moved to Attic

 eclass/kde5.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 685a3b1f06..6b140d7909 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -294,6 +294,8 @@ _calculate_src_uri() {
 	case ${CATEGORY} in
 		kde-apps)
 			case ${PV} in
+				16.12.3)
+					SRC_URI="mirror://kde/Attic/applications/16.12.3/src/${_kmname}-${PV}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[6-9]? )
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4d5469a9d46a3000eb04c36beb2cf1d6aedd8a0d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 20:56:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 18:26:26 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d5469a9

kde4-base.eclass: 16.12.3 tarballs moved to Attic

 eclass/kde4-base.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index bb19071232..04f26ff42a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -498,6 +498,8 @@ _calculate_src_uri() {
 				4.14.11*)
 					# KDEPIM 4.14 snapshot with Gentoo patches
 					SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${_kmname_pv}.tar.xz" ;;
+				16.12.3)
+					SRC_URI="mirror://kde/Attic/applications/16.12.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     400b6fa407f6a9bf1dadc9e447a281daa7a6dfd5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 21:10:54 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 18:26:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=400b6fa4

kde5.eclass: 5.29.0 tarballs moved to Attic

 eclass/kde5.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6b140d7909..7c09c4061e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -305,7 +305,13 @@ _calculate_src_uri() {
 			esac
 			;;
 		kde-frameworks)
-			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
+			case ${PV} in
+				5.29.?)
+					SRC_URI="mirror://kde/Attic/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
+				*)
+					SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
+			esac
+			;;
 		kde-plasma)
 			local plasmapv=$(get_version_component_range 1-3)
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a146315bf2055f55c6603cc4acda98b277d2886c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 18:34:24 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 18:37:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a146315b

kde5.eclass: Disable kdoctools_install(po) if KDE_HANDBOOK=forceoptional

Reported-by: Perfect Gentleman <perfect007gentleman <AT> gmail.com>
Gentoo-bug: 618210

 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7c09c4061e..0a4529b442 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -544,6 +544,7 @@ kde5_src_prepare() {
 
 		if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
 			punt_bogus_dep KF5 DocTools
+			sed -i -e "/kdoctools_install/ s/^/#DONT/" CMakeLists.txt || die
 		fi
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     75d942deb45fcedcdb605b86d5b9976330a39120
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:28:19 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 07:28:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=75d942de

kde5.eclass: Mark KDE Frameworks 5.34.0 released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0a4529b442..60d8f131f1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.34.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9d1466fdf69c88b90c9d12299a111e6ff97275a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 20:26:54 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 20:26:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d1466fd

kde5.eclass: Don't remove cmake_modules, simplify filtering LINGUAS

Recent changes in KDE Applications packaging added a new directory
'cmake_modules' for some type of data content inside po/${lang}/

 eclass/kde5.eclass | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 60d8f131f1..7183973348 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -566,17 +566,18 @@ kde5_src_prepare() {
 			pushd ${po} > /dev/null || die
 			local lang
 			for lang in *; do
-				if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
-					rm -r ${lang} || die
+				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+					case ${lang} in
+						cmake_modules | \
+						CMakeLists.txt | \
+						${PN}.pot)	;;
+						*) rm -r ${lang} || die	;;
+					esac
 					if [[ -e CMakeLists.txt ]] ; then
 						cmake_comment_add_subdirectory ${lang}
 						sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
 							-i CMakeLists.txt || die
 					fi
-				elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
-					if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
-						rm ${lang} || die
-					fi
 				fi
 			done
 			popd > /dev/null || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b0ed2cfd961a4125106f5485ce9cb3c21031f8d5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 16:39:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 21 12:52:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0ed2cfd

cmake-utils.eclass: Use eninja from ninja-utils

 eclass/cmake-utils.eclass | 52 +++--------------------------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 07f719a62a..2b3c8d933d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -116,7 +116,8 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs multilib flag-o-matic eutils multiprocessing versionator
+inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
+	multiprocessing versionator
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
@@ -680,44 +681,6 @@ enable_cmake-utils_src_compile() {
 	cmake-utils_src_make "$@"
 }
 
-_ninjaopts_from_makeopts() {
-	if [[ ${NINJAOPTS+set} == set ]]; then
-		return 0
-	fi
-	local ninjaopts=()
-	set -- ${MAKEOPTS}
-	while (( $# )); do
-		case $1 in
-			-j|-l)
-				if [[ $# -eq 1 || $2 == -* ]]; then
-					if [[ $1 == -j ]]; then
-						# absurdly high job limit
-						ninjaopts+=( $1 9999 )
-					else # -l
-						# remove load limit (like make does for -l)
-						ninjaopts+=( $1 0 )
-					fi
-					shift 1
-				else
-					ninjaopts+=( $1 $2 )
-					shift 2
-				fi
-				;;
-			-j*|-l*)
-				ninjaopts+=( $1 )
-				shift 1
-				;;
-			-k)
-				# -k 0 = any number of tasks can fail
-				ninjaopts+=( $1 0 )
-				shift 1
-				;;
-			*) shift ;;
-		esac
-	done
-	export NINJAOPTS="${ninjaopts[*]}"
-}
-
 # @FUNCTION: _cmake_ninja_src_make
 # @INTERNAL
 # @DESCRIPTION:
@@ -727,16 +690,7 @@ _cmake_ninja_src_make() {
 
 	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
 
-	_ninjaopts_from_makeopts
-
-	if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-		set -- ninja ${NINJAOPTS} -v "$@"
-	else
-		set -- ninja ${NINJAOPTS} "$@"
-	fi
-
-	echo "$@"
-	"$@" || die
+	eninja "$@"
 }
 
 # @FUNCTION: _cmake_emake_src_make

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5a5150066a38e68750fb2b58c49d576f45548070
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 08:09:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 21 12:57:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a515006

cmake-utils.eclass: Remove support for EAPIs 0 - 4

Closes: https://github.com/gentoo/gentoo/pull/4528

 eclass/cmake-utils.eclass | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 6ae324093b..b326ef717d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -101,7 +101,7 @@ _CMAKE_UTILS_ECLASS=1
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 case ${EAPI} in
-	2|4|5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
+	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
 	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
@@ -137,7 +137,7 @@ _cmake_use_me_now() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	[[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
+	[[ ${EAPI} == 5 ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 
 	local uper capitalised x
 	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
@@ -159,7 +159,7 @@ _cmake_use_me_now_inverted() {
 	local arg=$2
 	[[ ! -z $3 ]] && arg=$3
 
-	if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
+	if [[ ${EAPI} != 5 && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
 		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 	fi
 
@@ -259,7 +259,7 @@ cmake_comment_add_subdirectory() {
 # Comment out an add_subdirectory call in CMakeLists.txt in the current directory
 # Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
 comment_add_subdirectory() {
-	[[ ${EAPI} == [2345] ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
+	[[ ${EAPI} == 5 ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
 
 	cmake_comment_add_subdirectory "$@"
 }
@@ -291,7 +291,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
 # This can be used to make find_package optional.
 cmake-utils_use_find_package() {
-	if [[ ${EAPI} != [2345] && "$#" != 2 ]] ; then
+	if [[ ${EAPI} != 5 && "$#" != 2 ]] ; then
 		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
 	fi
 
@@ -432,7 +432,7 @@ enable_cmake-utils_src_prepare() {
 
 	pushd "${S}" > /dev/null || die
 
-	if [[ ${EAPI} != [2345] ]]; then
+	if [[ ${EAPI} != 5 ]]; then
 		default_src_prepare
 		_cmake_cleanup_cmake
 	else
@@ -464,7 +464,7 @@ enable_cmake-utils_src_prepare() {
 enable_cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ ${EAPI} == [2345] ]] && _cmake_cleanup_cmake
+	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
 
 	_cmake_check_build_dir
 
@@ -552,8 +552,6 @@ enable_cmake-utils_src_configure() {
 		fi
 	fi
 
-	[[ ${EAPI} == 2 ]] && ! use prefix && local EPREFIX=
-
 	if [[ ${EPREFIX} ]]; then
 		cat >> "${build_rules}" <<- _EOF_ || die
 			# in Prefix we need rpath and must ensure cmake gets our default linker path
@@ -588,7 +586,7 @@ enable_cmake-utils_src_configure() {
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
 	# Wipe the default optimization flags out of CMake
-	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]] && ! has "${EAPI}" 2 3 4 5; then
+	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
 			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
@@ -607,7 +605,7 @@ enable_cmake-utils_src_configure() {
 	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
 	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
 		if [[ -n "${mycmakeargstype}" ]] ; then
-			if [[ ${EAPI} == [2345] ]]; then
+			if [[ ${EAPI} == 5 ]]; then
 				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
 			else
 				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
@@ -634,7 +632,7 @@ enable_cmake-utils_src_configure() {
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		$([[ ${EAPI} == [2345] ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
+		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
 		-DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
 		"${MYCMAKEARGS}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     64eaa6665ea8cb091050546bea1d74e3b58a1a92
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 08:09:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 21 12:59:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=64eaa666

cmake-utils.eclass: Remove PREFIX variable

Closes: https://github.com/gentoo/gentoo/pull/4528

 eclass/cmake-utils.eclass | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b326ef717d..08057d812d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -87,13 +87,6 @@ _CMAKE_UTILS_ECLASS=1
 # but not used. Might give false-positives.
 # "no" to disable (default) or anything else to enable.
 
-# @ECLASS-VARIABLE: PREFIX
-# @DESCRIPTION:
-# Eclass respects PREFIX variable, though it's not recommended way to set
-# install/lib/bin prefixes.
-# Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead.
-: ${PREFIX:=/usr}
-
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
 # @DESCRIPTION:
 # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
@@ -112,6 +105,7 @@ inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 [[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+[[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
@@ -563,13 +557,13 @@ enable_cmake-utils_src_configure() {
 
 			ELSE ()
 
-			SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX}" CACHE STRING "" FORCE)
+			SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
 			SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
 			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
 			SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
-			SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
+			SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
 			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX}/lib" CACHE STRING "" FORCE)
+			SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE)
 
 			ENDIF (NOT APPLE)
 		_EOF_
@@ -629,7 +623,7 @@ enable_cmake-utils_src_configure() {
 		${warn_unused_cli}
 		-C "${common_config}"
 		-G "$(_cmake_generator_to_use)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9b345bc630718eb959890dd7c511210114ba043d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 08:09:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 21 12:56:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b345bc6

cmake-utils.eclass: Remove WANT_CMAKE and warn users

Closes: https://github.com/gentoo/gentoo/pull/4528

 eclass/cmake-utils.eclass | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 2b3c8d933d..6ae324093b 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -94,16 +94,6 @@ _CMAKE_UTILS_ECLASS=1
 # Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead.
 : ${PREFIX:=/usr}
 
-# @ECLASS-VARIABLE: WANT_CMAKE
-# @DESCRIPTION:
-# Specify if cmake-utils eclass should depend on cmake optionally or not.
-# This is useful when only part of application is using cmake build system.
-# Valid values are: always [default], optional (where the value is the useflag
-# used for optionality)
-#
-# This is banned in EAPI 6 and later.
-: ${WANT_CMAKE:=always}
-
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
 # @DESCRIPTION:
 # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
@@ -121,23 +111,14 @@ inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
-CMAKEDEPEND=""
-case ${WANT_CMAKE} in
-	always)
-		;;
-	*)
-		[[ ${EAPI} == [2345] ]] || die "WANT_CMAKE is banned in EAPI 6 and later"
-		IUSE+=" ${WANT_CMAKE}"
-		CMAKEDEPEND+="${WANT_CMAKE}? ( "
-		;;
-esac
+[[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
-		CMAKEDEPEND+=" sys-devel/make"
+		DEPEND="sys-devel/make"
 		;;
 	ninja)
-		CMAKEDEPEND+=" dev-util/ninja"
+		DEPEND="dev-util/ninja"
 		;;
 	*)
 		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@@ -146,14 +127,9 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
+	DEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
 fi
 
-[[ ${WANT_CMAKE} = always ]] || CMAKEDEPEND+=" )"
-
-DEPEND="${CMAKEDEPEND}"
-unset CMAKEDEPEND
-
 # Internal functions used by cmake-utils_use_*
 _cmake_use_me_now() {
 	debug-print-function ${FUNCNAME} "$@"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7b27f5b52fe1e215e3e203415b3ca833843fe63f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 11:53:34 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 21 13:03:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b27f5b5

cmake-utils.eclass: Drop _cmake_execute_optionally after WANT_CMAKE

Follow-up to d741b4ef5054c8800b97748ef8caa11ad910d784

 eclass/cmake-utils.eclass | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 08057d812d..faf6cdb0b7 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -743,7 +743,7 @@ enable_cmake-utils_src_install() {
 # @DESCRIPTION:
 # Apply ebuild and user patches.
 cmake-utils_src_prepare() {
-	_cmake_execute_optionally "src_prepare" "$@"
+	enable_cmake-utils_src_prepare "$@"
 }
 
 # @FUNCTION: cmake-utils_src_configure
@@ -751,7 +751,7 @@ cmake-utils_src_prepare() {
 # General function for configuring with cmake. Default behaviour is to start an
 # out-of-source build.
 cmake-utils_src_configure() {
-	_cmake_execute_optionally "src_configure" "$@"
+	enable_cmake-utils_src_configure "$@"
 }
 
 # @FUNCTION: cmake-utils_src_compile
@@ -759,31 +759,21 @@ cmake-utils_src_configure() {
 # General function for compiling with cmake.
 # Automatically detects the build type. All arguments are passed to emake.
 cmake-utils_src_compile() {
-	_cmake_execute_optionally "src_compile" "$@"
+	enable_cmake-utils_src_compile "$@"
 }
 
 # @FUNCTION: cmake-utils_src_test
 # @DESCRIPTION:
 # Function for testing the package. Automatically detects the build type.
 cmake-utils_src_test() {
-	_cmake_execute_optionally "src_test" "$@"
+	enable_cmake-utils_src_test "$@"
 }
 
 # @FUNCTION: cmake-utils_src_install
 # @DESCRIPTION:
 # Function for installing the package. Automatically detects the build type.
 cmake-utils_src_install() {
-	_cmake_execute_optionally "src_install" "$@"
-}
-
-# Optionally executes phases based on WANT_CMAKE variable/USE flag.
-_cmake_execute_optionally() {
-	local phase="$1" ; shift
-	if [[ ${WANT_CMAKE} = always ]]; then
-		enable_cmake-utils_${phase} "$@"
-	else
-		use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@"
-	fi
+	enable_cmake-utils_src_install "$@"
 }
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     848961434ef67e449f44476f69da3caebee9b9b0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 13:45:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 23 18:32:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=84896143

cmake-utils.eclass: Remove redundant enable_cmake-* functions

Closes: https://github.com/gentoo/gentoo/pull/4702

 eclass/cmake-utils.eclass | 64 ++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 42 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index faf6cdb0b7..dbb12f25f3 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -421,7 +421,10 @@ _cmake_cleanup_cmake() {
 	_cmake_modify-cmakelists
 }
 
-enable_cmake-utils_src_prepare() {
+# @FUNCTION: cmake-utils_src_prepare
+# @DESCRIPTION:
+# Apply ebuild and user patches.
+cmake-utils_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	pushd "${S}" > /dev/null || die
@@ -455,7 +458,11 @@ enable_cmake-utils_src_prepare() {
 # }
 # @CODE
 
-enable_cmake-utils_src_configure() {
+# @FUNCTION: cmake-utils_src_configure
+# @DESCRIPTION:
+# General function for configuring with cmake. Default behaviour is to start an
+# out-of-source build.
+cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
@@ -643,7 +650,11 @@ enable_cmake-utils_src_configure() {
 	popd > /dev/null || die
 }
 
-enable_cmake-utils_src_compile() {
+# @FUNCTION: cmake-utils_src_compile
+# @DESCRIPTION:
+# General function for compiling with cmake.
+# Automatically detects the build type. All arguments are passed to emake.
+cmake-utils_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	cmake-utils_src_make "$@"
@@ -693,7 +704,10 @@ cmake-utils_src_make() {
 	popd > /dev/null || die
 }
 
-enable_cmake-utils_src_test() {
+# @FUNCTION: cmake-utils_src_test
+# @DESCRIPTION:
+# Function for testing the package. Automatically detects the build type.
+cmake-utils_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_cmake_check_build_dir
@@ -726,7 +740,10 @@ enable_cmake-utils_src_test() {
 	fi
 }
 
-enable_cmake-utils_src_install() {
+# @FUNCTION: cmake-utils_src_install
+# @DESCRIPTION:
+# Function for installing the package. Automatically detects the build type.
+cmake-utils_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_cmake_check_build_dir
@@ -739,41 +756,4 @@ enable_cmake-utils_src_install() {
 	popd > /dev/null || die
 }
 
-# @FUNCTION: cmake-utils_src_prepare
-# @DESCRIPTION:
-# Apply ebuild and user patches.
-cmake-utils_src_prepare() {
-	enable_cmake-utils_src_prepare "$@"
-}
-
-# @FUNCTION: cmake-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with cmake. Default behaviour is to start an
-# out-of-source build.
-cmake-utils_src_configure() {
-	enable_cmake-utils_src_configure "$@"
-}
-
-# @FUNCTION: cmake-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with cmake.
-# Automatically detects the build type. All arguments are passed to emake.
-cmake-utils_src_compile() {
-	enable_cmake-utils_src_compile "$@"
-}
-
-# @FUNCTION: cmake-utils_src_test
-# @DESCRIPTION:
-# Function for testing the package. Automatically detects the build type.
-cmake-utils_src_test() {
-	enable_cmake-utils_src_test "$@"
-}
-
-# @FUNCTION: cmake-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package. Automatically detects the build type.
-cmake-utils_src_install() {
-	enable_cmake-utils_src_install "$@"
-}
-
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ab4c0383d2b460622e88b9db8116252990e49f35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 15:16:16 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 26 15:25:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab4c0383

kde5.eclass: Mark KDE Plasma 5.10 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7183973348..078c4573d4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.10.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c5764a1a9654b008329dbf4355b5ef2482c8bc63
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 11:48:39 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 28 11:48:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5764a1a

kde5-functions.eclass: Pin down Plasma 5.8 LTS deps to LTS versions

 eclass/kde5-functions.eclass | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d187f54283..b255cc88e6 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -142,16 +142,23 @@ _add_category_dep() {
 	local category=${1}
 	local package=${2}
 	local use=${3}
-	local version=${4}
-	local slot=${5}
+	local operator=${4}
+	local version=${5}
+	local slot=${6}
 
 	if [[ -n ${use} ]] ; then
 		local use="[${use}]"
 	fi
 
 	if [[ -n ${version} ]] ; then
-		local operator=">="
-		local version="-$(get_version_component_range 1-3 ${version})"
+		if [[ -z ${operator} ]] ; then
+			operator=">="
+		fi
+		if [[ ${operator} = ">=" ]] ; then
+			version="-$(get_version_component_range 1-3 ${version})"
+		else
+			version="-${version}"
+		fi
 	fi
 
 	if [[ -n ${slot} ]] ; then
@@ -192,7 +199,7 @@ add_frameworks_dep() {
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
-	_add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}"
+	_add_category_dep kde-frameworks "${1}" "${2}" "" "${version}" "${4}"
 }
 
 # @FUNCTION: add_plasma_dep
@@ -214,17 +221,21 @@ add_plasma_dep() {
 		die "${FUNCNAME} was called with too many arguments"
 	fi
 
+	local operator
 	local version
 
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
 		version=${PV}
+		if [[ ${PV} = 5.8* ]] ; then
+			operator="~"
+		fi
 	elif [[ -z "${version}" ]] ; then
 		version=${PLASMA_MINIMAL}
 	fi
 
-	_add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}"
+	_add_category_dep kde-plasma "${1}" "${2}" "${operator}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_kdeapps_dep
@@ -261,7 +272,7 @@ add_kdeapps_dep() {
 		fi
 	fi
 
-	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"
+	_add_category_dep kde-apps "${1}" "${2}" "" "${version}" "${4}"
 }
 
 # @FUNCTION: add_qt_dep
@@ -296,7 +307,7 @@ add_qt_dep() {
 		slot="5"
 	fi
 
-	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
+	_add_category_dep dev-qt "${1}" "${2}" "" "${version}" "${slot}"
 }
 
 # @FUNCTION: get_kde_version

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2805a3b847e74c0576e8b1a7fb59b6509ac8404c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 12:31:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 30 12:31:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2805a3b8

kde5.eclass: Mark KDE Plasma 5.10.0 released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 078c4573d4..7183973348 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.10.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     515770ada824efa18df5431af7a7d5f98170b199
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 16:08:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 16:08:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=515770ad

kde5.eclass: Mark KDE Frameworks 5.35.0 as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7183973348..ea7a36aaff 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.35.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6da474acfd758447e7b8de64a67d38e10da588fa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 16:52:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 16:52:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6da474ac

kde5-functions.eclass: Fix KDE Plasma 5.8 LTS dependencies

 eclass/kde5-functions.eclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b255cc88e6..62a806fadc 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -154,10 +154,9 @@ _add_category_dep() {
 		if [[ -z ${operator} ]] ; then
 			operator=">="
 		fi
-		if [[ ${operator} = ">=" ]] ; then
-			version="-$(get_version_component_range 1-3 ${version})"
-		else
-			version="-${version}"
+		version="-$(get_version_component_range 1-3 ${version})"
+		if [[ ${operator} = "=" ]] ; then
+			version="${version}*"
 		fi
 	fi
 
@@ -229,7 +228,7 @@ add_plasma_dep() {
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
 		version=${PV}
 		if [[ ${PV} = 5.8* ]] ; then
-			operator="~"
+			operator="="
 		fi
 	elif [[ -z "${version}" ]] ; then
 		version=${PLASMA_MINIMAL}

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     55f6a1fb31104b242399d567ec40dcc4156fba13
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 15:56:25 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 15:56:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=55f6a1fb

kde*.eclass: Mark KDE Applications 17.04.2 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 04f26ff42a..d4e00c7455 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.04.1 )
+KDE_UNRELEASED=( kde-apps-17.04.2 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ea7a36aaff..02a1294f1f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.35.0 )
+KDE_UNRELEASED=( kde-frameworks-5.35.0 kde-apps-17.04.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     ab0f217246ff6ee36f5979cf26ecbabf33c63a5a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 20:35:51 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 20:35:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab0f2172

kde*.eclass: Mark KDE Applications 17.04.2 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d4e00c7455..b4b8ad3260 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.04.2 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 02a1294f1f..ea7a36aaff 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.35.0 kde-apps-17.04.2 )
+KDE_UNRELEASED=( kde-frameworks-5.35.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3d86dd122f5abd83536613c70500f84234daa859
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 15:00:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 10:26:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d86dd12

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL=5.34, PLASMA_MINIMAL=5.8.6

Cleanup obsolete per-category definitions.

 eclass/kde5-functions.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 62a806fadc..b5f639eaf7 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,18 +38,12 @@ case ${CATEGORY} in
 		if [[ $(get_version_component_range 2) -ge 9 ]]; then
 			: ${QT_MINIMAL:=5.7.1}
 		fi
-		if ! [[ $(get_version_component_range 2) -le 9 && $(get_version_component_range 3) -lt 50 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.34.0}
-		fi
 		if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 			: ${QT_MINIMAL:=5.7.1}
 		fi
 		;;
 	kde-apps)
-		if [[ $(get_version_component_range 1) -ge 17 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.32.0}
-		fi
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${QT_MINIMAL:=5.7.1}
 		fi
@@ -64,12 +58,12 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.29.0}
+: ${FRAMEWORKS_MINIMAL:=5.34.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.8.5}
+: ${PLASMA_MINIMAL:=5.8.6}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     01a9e08594646456902a3bab2846c9c145004bad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 17:28:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 11:48:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=01a9e085

kde5.eclass: Fix non-compression of docbooks

PREFIX was never defined, making this a no-op.

 eclass/kde5.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ea7a36aaff..b748b41cef 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -710,10 +710,10 @@ kde5_src_install() {
 
 	cmake-utils_src_install
 
-	# We don't want ${PREFIX}/share/doc/HTML to be compressed,
+	# We don't want /usr/share/doc/HTML to be compressed,
 	# because then khelpcenter can't find the docs
-	if [[ -d ${ED}/${PREFIX}/share/doc/HTML ]]; then
-		docompress -x ${PREFIX}/share/doc/HTML
+	if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
+		docompress -x /usr/share/doc/HTML
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6a51af7a6851a0475f8f0a2cc4c73d05eafee2c7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 15:34:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 15:35:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a51af7a

kde5.eclass: Mark KDE Frameworks 5.35.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b748b41cef..cbcbb27672 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -126,7 +126,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.35.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d35b43566c6a9732f8cbcb29e84bda6349872bff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 22:25:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 22:26:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d35b4356

kde5.eclass: Drop 5.29 SRC_URI

 eclass/kde5.eclass | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index cbcbb27672..ecd14d30fb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -305,13 +305,7 @@ _calculate_src_uri() {
 			esac
 			;;
 		kde-frameworks)
-			case ${PV} in
-				5.29.?)
-					SRC_URI="mirror://kde/Attic/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
-				*)
-					SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
-			esac
-			;;
+			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
 		kde-plasma)
 			local plasmapv=$(get_version_component_range 1-3)
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8ae7620c5051cbf2b98facbfd4e4d0196c2c1fe6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 08:09:11 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 08:11:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ae7620c

kde5-functions.eclass: Drop KDE Plasma 5.8 LTS quirks

We won't need this.

 eclass/kde5-functions.eclass | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b5f639eaf7..942c0251d5 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -136,22 +136,16 @@ _add_category_dep() {
 	local category=${1}
 	local package=${2}
 	local use=${3}
-	local operator=${4}
-	local version=${5}
-	local slot=${6}
+	local version=${4}
+	local slot=${5}
 
 	if [[ -n ${use} ]] ; then
 		local use="[${use}]"
 	fi
 
 	if [[ -n ${version} ]] ; then
-		if [[ -z ${operator} ]] ; then
-			operator=">="
-		fi
-		version="-$(get_version_component_range 1-3 ${version})"
-		if [[ ${operator} = "=" ]] ; then
-			version="${version}*"
-		fi
+		local operator=">="
+		local version="-$(get_version_component_range 1-3 ${version})"
 	fi
 
 	if [[ -n ${slot} ]] ; then
@@ -192,7 +186,7 @@ add_frameworks_dep() {
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
-	_add_category_dep kde-frameworks "${1}" "${2}" "" "${version}" "${4}"
+	_add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_plasma_dep
@@ -214,21 +208,17 @@ add_plasma_dep() {
 		die "${FUNCNAME} was called with too many arguments"
 	fi
 
-	local operator
 	local version
 
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
 		version=${PV}
-		if [[ ${PV} = 5.8* ]] ; then
-			operator="="
-		fi
 	elif [[ -z "${version}" ]] ; then
 		version=${PLASMA_MINIMAL}
 	fi
 
-	_add_category_dep kde-plasma "${1}" "${2}" "${operator}" "${version}" "${4}"
+	_add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_kdeapps_dep
@@ -265,7 +255,7 @@ add_kdeapps_dep() {
 		fi
 	fi
 
-	_add_category_dep kde-apps "${1}" "${2}" "" "${version}" "${4}"
+	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"
 }
 
 # @FUNCTION: add_qt_dep
@@ -300,7 +290,7 @@ add_qt_dep() {
 		slot="5"
 	fi
 
-	_add_category_dep dev-qt "${1}" "${2}" "" "${version}" "${slot}"
+	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
 # @FUNCTION: get_kde_version

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1139ec358e4ee5c0c02466ccc9073dc70a6f3a72
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 12:07:27 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:08:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1139ec35

kde5.eclass: use HTTPS

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ecd14d30fb..ef1ee5a945 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -131,7 +131,7 @@ KDE_UNRELEASED=( )
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"
 elif [[ ${KDEBASE} = kdel10n ]]; then
-	HOMEPAGE="http://l10n.kde.org"
+	HOMEPAGE="https://l10n.kde.org"
 elif [[ ${KMNAME} = kdepim ]]; then
 	HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 else

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3b97a4c9393d807d14fab2d0138d9b8929981211
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 15:07:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 15:07:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b97a4c9

kde5.eclass: Drop obsolete Plasma-4 warning

 eclass/kde5.eclass | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ef1ee5a945..3b6810526a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -739,14 +739,6 @@ kde5_pkg_postinst() {
 			einfo "Use it at your own risk."
 			einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
 		fi
-		# for kf5-based applications tell user that he SHOULD NOT be using kde-plasma/plasma-workspace:4
-		if [[ ${KDEBASE} != kde-base || ${CATEGORY} = kde-apps ]]  && \
-				has_version 'kde-plasma/plasma-workspace:4'; then
-			echo
-			ewarn "WARNING! Your system configuration still contains \"kde-plasma/plasma-workspace:4\","
-			ewarn "indicating a Plasma 4 setup. With this setting you are unsupported by KDE team."
-			ewarn "Please consider upgrading to Plasma 5."
-		fi
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     558ddc978497aae5aa47721176f8b83b1234046c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 21:53:10 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 15:12:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=558ddc97

kde5.eclass: Add KDE_QTHELP for QCH file support

Do not compress .qch and .tags files.

See also:
https://mail.kde.org/pipermail/distributions/2017-June/000227.html

 eclass/kde5.eclass | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3b6810526a..e5e5fb2400 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -79,6 +79,14 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # Defaults to "doc". Otherwise, use alternative KDE handbook path.
 : ${KDE_DOC_DIR:=doc}
 
+# @ECLASS-VARIABLE: KDE_QTHELP
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# Otherwise, add "+qthelp" to IUSE, add the appropriate dependency, and
+# generate and install Qt compressed help files.
+# If set to "optional", config with -DBUILD_QCH=ON when USE=qthelp.
+: ${KDE_QTHELP:=false}
+
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -144,6 +152,8 @@ SLOT=5
 
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	KDE_SUBSLOT=true
+	[[ $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ]] && \
+		KDE_QTHELP=true
 fi
 
 case ${KDE_SUBSLOT} in
@@ -223,6 +233,18 @@ case ${KDE_HANDBOOK} in
 		;;
 esac
 
+case ${KDE_QTHELP} in
+	false)	;;
+	*)
+		IUSE+=" +qthelp"
+		COMMONDEPEND+=" qthelp? ( $(add_qt_dep qt-docs) )"
+		DEPEND+=" qthelp? (
+			$(add_qt_dep qthelp)
+			>=app-doc/doxygen-1.8.13-r1
+		)"
+		;;
+esac
+
 case ${KDE_TEST} in
 	false)	;;
 	*)
@@ -647,6 +669,10 @@ kde5_src_configure() {
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
 	fi
 
+	if use_if_iuse qthelp ; then
+		cmakeargs+=( -DBUILD_QCH=ON )
+	fi
+
 	# install mkspecs in the same directory as qt stuff
 	cmakeargs+=(-DKDE_INSTALL_USE_QT_SYS_PATHS=ON)
 
@@ -704,6 +730,14 @@ kde5_src_install() {
 
 	cmake-utils_src_install
 
+	# We don't want QCH and tags files to be compressed, because then
+	# cmake can't find the tags and qthelp viewers can't find the docs
+	local p=$(best_version dev-qt/qtcore:5)
+	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
+	if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
+		docompress -x /usr/share/doc/qt-${pv}
+	fi
+
 	# We don't want /usr/share/doc/HTML to be compressed,
 	# because then khelpcenter can't find the docs
 	if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     669f4a373d55d4b21103d6394d0ece013558b8a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 05:33:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 05:33:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=669f4a37

kde5.eclass: Mark KDE Frameworks 5.36.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e5e5fb2400..86c6fce3ee 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -134,7 +134,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.36.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f21810e15e9b05b397e567b535901dd2987f7cb6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 20:24:44 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 20:24:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f21810e1

kde5-functions.eclass: Raise PLASMA_MINIMAL to 5.9.5

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 942c0251d5..34cf9935b1 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -63,7 +63,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.8.6}
+: ${PLASMA_MINIMAL:=5.9.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     608fb76af1ec1fd2f76a17e8bb8b51f8b56f2941
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 11:49:38 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 11:49:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=608fb76a

kde5.eclass: Mark KDE Frameworks 5.36.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 86c6fce3ee..e5e5fb2400 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -134,7 +134,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.36.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a28709efa9b879c54517fe302980260ec9c7848c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 14:57:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 16:48:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a28709ef

kde5.eclass: Fix KDE_QTHELP, switch USE=qthelp -> doc

 eclass/kde5.eclass | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e5e5fb2400..b4cfadc9df 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -82,10 +82,13 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # @ECLASS-VARIABLE: KDE_QTHELP
 # @DESCRIPTION:
 # If set to "false", do nothing.
-# Otherwise, add "+qthelp" to IUSE, add the appropriate dependency, and
-# generate and install Qt compressed help files.
-# If set to "optional", config with -DBUILD_QCH=ON when USE=qthelp.
-: ${KDE_QTHELP:=false}
+# Otherwise, add "doc" to IUSE, add the appropriate dependency, generate
+# and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
+if [[ ${CATEGORY} = kde-frameworks && ( $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ) ]]; then
+	: ${KDE_QTHELP:=true}
+else
+	: ${KDE_QTHELP:=false}
+fi
 
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
@@ -152,8 +155,6 @@ SLOT=5
 
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	KDE_SUBSLOT=true
-	[[ $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ]] && \
-		KDE_QTHELP=true
 fi
 
 case ${KDE_SUBSLOT} in
@@ -236,9 +237,9 @@ esac
 case ${KDE_QTHELP} in
 	false)	;;
 	*)
-		IUSE+=" +qthelp"
-		COMMONDEPEND+=" qthelp? ( $(add_qt_dep qt-docs) )"
-		DEPEND+=" qthelp? (
+		IUSE+=" doc"
+		COMMONDEPEND+=" doc? ( $(add_qt_dep qt-docs) )"
+		DEPEND+=" doc? (
 			$(add_qt_dep qthelp)
 			>=app-doc/doxygen-1.8.13-r1
 		)"
@@ -669,8 +670,8 @@ kde5_src_configure() {
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
 	fi
 
-	if use_if_iuse qthelp ; then
-		cmakeargs+=( -DBUILD_QCH=ON )
+	if [[ ${KDE_QTHELP} != false ]]; then
+		cmakeargs+=( -DBUILD_QCH=$(usex doc) )
 	fi
 
 	# install mkspecs in the same directory as qt stuff

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c08d557bdc225779d4ec3f7c87999342b616f447
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 11:25:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 11:25:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c08d557b

kde5-functions.eclass: Simplify kde-plasma QT_MINIMAL setup

 eclass/kde5-functions.eclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 34cf9935b1..2ac6526adc 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -35,12 +35,9 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ $(get_version_component_range 2) -ge 9 ]]; then
-			: ${QT_MINIMAL:=5.7.1}
-		fi
+		: ${QT_MINIMAL:=5.7.1}
 		if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.7.1}
 		fi
 		;;
 	kde-apps)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     62105bcabec4fa0834cfa013c1945f4f1691c6b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 06:14:54 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 06:14:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=62105bca

kde*.eclass: Mark KDE Applications 17.04.3 as unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b4b8ad3260..d44d95da23 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.04.3 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b4cfadc9df..3266e381f1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.04.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a3d17e3e391532862d6285a59e0390d619983dfe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 18:57:02 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 18:57:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3d17e3e

kde*eclass: Mark KDE Applications 17.04.3 released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d44d95da23..b4b8ad3260 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.04.3 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3266e381f1..b4cfadc9df 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.04.3 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     98237c3ad18d8f80f27baa9170743d813b0490b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 14:10:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 15:31:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=98237c3a

kde5-meta-pkg.eclass: Block slot 4 unconditionally

This eclass has always been unaware of KDE_BLOCK_SLOT4.

 eclass/kde5-meta-pkg.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index 50c83c1ba3..a241d5d8e2 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 
-if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
+if [[ ${CATEGORY} = kde-apps ]]; then
 	RDEPEND+=" !kde-apps/${PN}:4"
 fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6d44e23e6e1ce2f681cdbe0ed74a1d25e0b5a931
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 15:29:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 15:55:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6d44e23e

kde5-functions.eclass: Drop 5.9999 version dep exception

 eclass/kde5-functions.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2ac6526adc..4641e0605c 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -244,12 +244,7 @@ add_kdeapps_dep() {
 	elif [[ ${CATEGORY} = kde-apps ]]; then
 		version=${PV}
 	elif [[ -z "${version}" ]] ; then
-		# In KDE applications world, 5.9999 > yy.mm.x
-		if [[ ${PV} = 5.9999 || ${PV} = 9999 ]]; then
-			version=5.9999
-		else
-			version=${KDE_APPS_MINIMAL}
-		fi
+		version=${KDE_APPS_MINIMAL}
 	fi
 
 	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ac513a1544c02403cc6f8817669250abef9fa44d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 22:24:11 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 22:24:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac513a15

kde4-base.eclass: Drop obsolete USE conflict mitigation

 eclass/kde4-base.eclass | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 05b1bc0ed9..65616e4fe5 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -393,14 +393,7 @@ case ${KDE_HANDBOOK} in
 		[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
 		;;
 	optional)
-		case ${PN} in
-			kcontrol | kdesu | knetattach)
-				IUSE+=" handbook"
-				;;
-			*)
-				IUSE+=" +handbook"
-				;;
-		esac
+		IUSE+=" +handbook"
 		kdedepend+=" handbook? ( ${kdehandbookdepend} )"
 		[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     001ba933be53882118e301105086175a46375dbc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 22:14:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 22:14:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=001ba933

kde4-base.eclass: Drop obsolete minimum GCC check

 eclass/kde4-base.eclass | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b4b8ad3260..05b1bc0ed9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -660,7 +660,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 kde4-base_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if has handbook ${IUSE} || has "+handbook" ${IUSE} && [ "${KDE_HANDBOOK}" != optional ] ; then
+	if has handbook ${IUSE} || has "+handbook" ${IUSE} && [[ "${KDE_HANDBOOK}" != optional ]] ; then
 		eqawarn "Handbook support is enabled via KDE_HANDBOOK=optional in the ebuild."
 		eqawarn "Please do not just set IUSE=handbook, as this leads to dependency errors."
 	fi
@@ -668,16 +668,6 @@ kde4-base_pkg_setup() {
 	# Don't set KDEHOME during compilation, it will cause access violations
 	unset KDEHOME
 
-	# Check if gcc compiler is fresh enough.
-	# In theory should be in pkg_pretend but we check it only for kdelibs there
-	# and for others we do just quick scan in pkg_setup because pkg_pretend
-	# executions consume quite some time (ie. when merging 300 packages at once will cause 300 checks)
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 6 ]] ) \
-			&& die "Sorry, but gcc-4.6 and earlier wont work for some KDE packages."
-	fi
-
 	KDEDIR=/usr
 	: ${PREFIX:=/usr}
 	EKDEDIR=${EPREFIX}/usr

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     346fd99bb131071d76f23dfe98f10a43948cf1e9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 22:25:16 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 22:25:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=346fd99b

kde4-base.eclass: Drop obsolete kde-base/*:4 blocker

No ebuilds of this type should exist at this point after pkgmoves done.

 eclass/kde4-base.eclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 65616e4fe5..56125ec877 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -357,10 +357,6 @@ kdedepend="
 
 kderdepend=""
 
-if [[ ${CATEGORY} == kde-apps ]]; then
-	kderdepend+=" !kde-base/${PN}:4"
-fi
-
 # all packages needs oxygen icons for basic iconset
 if [[ ${PN} != oxygen-icons ]]; then
 	kderdepend+=" kde-frameworks/oxygen-icons"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     db3062527e532b02e48b486d8d232deb6f52f12d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 16:19:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 20:26:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db306252

kde5-functions.eclass: Raise >=KF-5.37 QT_MINIMAL to 5.7.1

See also:
https://mail.kde.org/pipermail/release-team/2017-August/010526.html

 eclass/kde5-functions.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4641e0605c..34bb74ffa4 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -33,10 +33,12 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		[[ ${KDE_BUILD_TYPE} = live || $(get_version_component_range 2) -ge 37 ]] \
+			&& : ${QT_MINIMAL:=5.7.1}
 		;;
 	kde-plasma)
 		: ${QT_MINIMAL:=5.7.1}
-		if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0367f0584a38986a7ab579df431b32c0f99c0b5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 16:24:41 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 22:29:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0367f058

kde5.eclass: Mark KDE Frameworks 5.37.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b4cfadc9df..5b3018afa8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.37.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5380d5393bd8acb522e4406bbfcade8d10cd4e54
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 12:51:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 13:15:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5380d539

kde*eclass: Mark KDE Applications 17.08.0 unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 56125ec877..9e425733f9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -176,7 +176,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.08.0 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5b3018afa8..213118c9e7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.37.0 )
+KDE_UNRELEASED=( kde-apps-17.08.0 kde-frameworks-5.37.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7793e90802c1b3c898b8e734b7f118347e760ab7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 16:35:13 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 16:35:13 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7793e908

kde5-functions.eclass: Raise PLASMA_MINIMAL to 5.10.4

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 34bb74ffa4..a0e2b6dfe7 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -62,7 +62,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.9.5}
+: ${PLASMA_MINIMAL:=5.10.4}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e1a9165cd96171b5778f6f7ff42f1d2a54d6687b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 21:30:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 21:30:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1a9165c

kde5.eclass: Mark KDE Frameworks 5.37 released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 213118c9e7..e34dcc7f33 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -137,7 +137,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.0 kde-frameworks-5.37.0 )
+KDE_UNRELEASED=( kde-apps-17.08.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2e1d80462a9dab24b28f4340d42af93d7e25ca35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 15:17:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 15:17:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e1d8046

kde5-functions.eclass: Raise kde-apps/*17.08 FRAMEWORKS_MINIMAL to 5.37

Also raise QT_MINIMAL to 5.7.1 for all kde-apps/

 eclass/kde5-functions.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index a0e2b6dfe7..4c0115fa1a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -43,9 +43,8 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			: ${QT_MINIMAL:=5.7.1}
-		fi
+		: ${QT_MINIMAL:=5.7.1}
+		[[ ${KDE_BUILD_TYPE} = live || ${PN} = 17.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.37.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f3bd66dffa477b017a66bea1dbb32afc022860f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 21:29:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 21:29:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3bd66df

kde5.eclass: KDE_TEST=forceoptional-recursive reloaded

Searches for test subdirectory pattern in CMakeLists.txt recursively,
enclose it with BUILD_TESTING conditional.

Creates unified diff to easily pick up for cosmetics and submission
upstream.

 eclass/kde5.eclass | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e34dcc7f33..251026233d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -90,6 +90,13 @@ else
 	: ${KDE_QTHELP:=false}
 fi
 
+# @ECLASS-VARIABLE: KDE_TESTPATTERN
+# @DESCRIPTION:
+# DANGER: Only touch it if you know what you are doing.
+# By default, matches autotest(s), unittest(s) and test(s) pattern inside
+# cmake add_subdirectory calls.
+: ${KDE_TESTPATTERN:="\(auto|unit\)\?tests\?"}
+
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -628,13 +635,24 @@ kde5_src_prepare() {
 			cmake_comment_add_subdirectory autotests test tests
 		elif [[ ${KDE_TEST} = forceoptional-recursive ]] ; then
 			punt_bogus_dep Qt5 Test
-			local d
-			for d in $(find . -type d -name "autotests" -or -name "tests" -or -name "test" -or -name "unittests"); do
-				pushd ${d%/*} > /dev/null || die
+			local f pf="${T}/${P}"-tests-optional.patch
+			touch ${pf} || die "Failed to touch patch file"
+			for f in $(find . -type f -name "CMakeLists.txt" -exec \
+				grep -l "^\s*add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)" {} \;); do
+				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
+				pushd ${f%/*} > /dev/null || die
 					punt_bogus_dep Qt5 Test
-					cmake_comment_add_subdirectory autotests test tests
+					sed -i CMakeLists.txt -e \
+						"/^#/! s/add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
+						|| die
 				popd > /dev/null || die
+				diff -Naur ${f}.old ${f} 1>>${pf}
+				rm ${f}.old || die "Failed to clean up"
 			done
+			einfo "Build system was modified by KDE_TEST=forceoptional-recursive."
+			einfo "Unified diff file ready for pickup in:"
+			einfo "  ${pf}"
+			einfo "Push it upstream to make this message go away."
 		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
 			cmake_comment_add_subdirectory autotests test tests
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e2b1f68f7ba85569f101d2e058cc37c9de801611
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 09:35:34 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 09:35:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e2b1f68f

kde5-functions.eclass: Fix variable for version check

Thanks-to: Arfrever

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4c0115fa1a..5b1115f089 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -44,7 +44,7 @@ case ${CATEGORY} in
 		;;
 	kde-apps)
 		: ${QT_MINIMAL:=5.7.1}
-		[[ ${KDE_BUILD_TYPE} = live || ${PN} = 17.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.37.0}
+		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.37.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9b9845280c6ddb659ea2d2a88c022bca053347e5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 15:52:44 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 09:32:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b984528

kde4-base.eclass: Add {QT3SUPPORT,SQL}_REQUIRED, drop designer:4 dep

This makes dev-qt/qtsql:4 and dev-qt/qt3support:4 optional.

 eclass/kde4-base.eclass | 66 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 9e425733f9..78bceb12ed 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -112,6 +112,12 @@ unset export_fns
 # This variable must be set before inheriting any eclasses. Defaults to 'never'.
 DECLARATIVE_REQUIRED="${DECLARATIVE_REQUIRED:-never}"
 
+# @ECLASS-VARIABLE: QT3SUPPORT_REQUIRED
+# @DESCRIPTION:
+# Is qt3support required? Possible values are 'true' or 'false'.
+# This variable must be set before inheriting any eclasses. Defaults to 'false'.
+QT3SUPPORT_REQUIRED="${QT3SUPPORT_REQUIRED:-false}"
+
 # @ECLASS-VARIABLE: QTHELP_REQUIRED
 # @DESCRIPTION:
 # Is qthelp required? Possible values are 'always', 'optional' and 'never'.
@@ -130,6 +136,12 @@ OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
 # This variable must be set before inheriting any eclasses. Defaults to 'never'.
 MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}"
 
+# @ECLASS-VARIABLE: SQL_REQUIRED
+# @DESCRIPTION:
+# Is qtsql required? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+SQL_REQUIRED="${SQL_REQUIRED:-never}"
+
 # @ECLASS-VARIABLE: WEBKIT_REQUIRED
 # @DESCRIPTION:
 # Is qtwebkit required? Possible values are 'always', 'optional' and 'never'.
@@ -224,6 +236,21 @@ case ${DECLARATIVE_REQUIRED} in
 esac
 unset qtdeclarativedepend
 
+# Qt3Support dependencies
+qt3supportdepend="
+	>=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
+"
+case ${QT3SUPPORT_REQUIRED} in
+	true)
+		COMMONDEPEND+=" ${qt3supportdepend}"
+		[[ -n ${qtcoreuse} ]] && qtcoreuse+=",qt3support" || qtcoreuse="qt3support"
+		[[ -n ${qtsqluse} ]] && qtsqluse+=",qt3support" || qtsqluse="qt3support"
+		[[ -n ${kdelibsuse} ]] && kdelibsuse+=",qt3support(+)" || kdelibsuse="qt3support(+)"
+		;;
+	*) ;;
+esac
+unset qt3supportdepend
+
 # QtHelp dependencies
 qthelpdepend="
 	>=dev-qt/qthelp-${QT_MINIMAL}:4
@@ -271,6 +298,24 @@ case ${MULTIMEDIA_REQUIRED} in
 esac
 unset qtmultimediadepend
 
+# Sql dependencies
+[[ -n ${qtsqluse} ]] && qtsqluse="[${qtsqluse}]"
+qtsqldepend="
+	>=dev-qt/qtsql-${QT_MINIMAL}:4${qtsqluse}
+"
+case ${SQL_REQUIRED} in
+	always)
+		COMMONDEPEND+=" ${qtsqldepend}"
+		;;
+	optional)
+		IUSE+=" sql"
+		COMMONDEPEND+=" sql? ( ${qtsqldepend} )"
+		;;
+	*) ;;
+esac
+unset qtsqluse
+unset qtsqldepend
+
 # WebKit dependencies
 qtwebkitdepend="
 	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
@@ -278,10 +323,12 @@ qtwebkitdepend="
 case ${WEBKIT_REQUIRED} in
 	always)
 		COMMONDEPEND+=" ${qtwebkitdepend}"
+		[[ -n ${kdelibsuse} ]] && kdelibsuse+=",webkit(+)" || kdelibsuse="webkit(+)"
 		;;
 	optional)
 		IUSE+=" +webkit"
 		COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )"
+		[[ -n ${kdelibsuse} ]] && kdelibsuse+=",webkit?" || kdelibsuse="webkit?"
 		;;
 	*) ;;
 esac
@@ -305,28 +352,22 @@ unset cppuintdepend
 
 # KDE dependencies
 # Qt accessibility classes are needed in various places, bug 325461
+[[ -n ${qtcoreuse} ]] && qtcoreuse+=",ssl" || qtcoreuse="ssl"
+[[ -n ${qtcoreuse} ]] && qtcoreuse="[${qtcoreuse}]"
 kdecommondepend="
 	dev-lang/perl
-	>=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
-	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl]
+	>=dev-qt/qtcore-${QT_MINIMAL}:4${qtcoreuse}
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	>=dev-qt/designer-${QT_MINIMAL}:4
 	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
 	>=dev-qt/qtsvg-${QT_MINIMAL}:4
 	>=dev-qt/qttest-${QT_MINIMAL}:4
 "
+unset qtcoreuse
 
 if [[ ${PN} != kdelibs ]]; then
-	local _kdelibsuse
-	case ${WEBKIT_REQUIRED} in
-		always) _kdelibsuse="[webkit]" ;;
-		optional) _kdelibsuse="[webkit?]" ;;
-		*) ;;
-	esac
-	kdecommondepend+=" >=kde-frameworks/kdelibs-4.14.22:4${_kdelibsuse}"
-	unset _kdelibsuse
+	[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]"
+	kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}"
 	if [[ ${KDEBASE} = kdevelop ]]; then
 		if [[ ${PN} != kdevplatform ]]; then
 			# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
@@ -345,6 +386,7 @@ if [[ ${PN} != kdelibs ]]; then
 		fi
 	fi
 fi
+unset kdelibsuse
 
 kdedepend="
 	dev-util/automoc

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     599fbba8a0b5bf9ee31215bdb2c9f518148b6f40
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 15:03:02 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 15:03:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=599fbba8

kde5.eclass: Update KDE_TEST documentation

 eclass/kde5.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 251026233d..afc990f944 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -105,8 +105,10 @@ fi
 # when USE=!test.
 # If set to "forceoptional", remove a Qt5Test dependency and comment test
 # subdirs from the root CMakeLists.txt in addition to the above.
-# If set to "forceoptional-recursive", remove a Qt5Test dependency and comment
-# test subdirs from *any* CMakeLists.txt in addition to the above.
+# If set to "forceoptional-recursive", remove Qt5Test dependencies and make
+# test subdirs according to KDE_TESTPATTERN from *any* CMakeLists.txt in ${S}
+# and below conditional on BUILD_TESTING. 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
 	: ${KDE_TEST:=true}
 else

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     59f8ceab591f86ca8dcc892885e46336ed4b5e95
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 15:03:33 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 15:03:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=59f8ceab

kde5.eclass: Re-order unconditional Frameworks tests disabling

To produce more compatible forceoptional-recursive tests.

 eclass/kde5.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index afc990f944..93e4f01277 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -624,11 +624,6 @@ kde5_src_prepare() {
 		fi
 	fi
 
-	# in frameworks, tests = manual tests so never build them
-	if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then
-		cmake_comment_add_subdirectory tests
-	fi
-
 	# only build unit tests when required
 	if ! use_if_iuse test ; then
 		if [[ ${KDE_TEST} = forceoptional ]] ; then
@@ -659,6 +654,11 @@ kde5_src_prepare() {
 			cmake_comment_add_subdirectory autotests test tests
 		fi
 	fi
+
+	# in frameworks, tests = manual tests so never build them
+	if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then
+		cmake_comment_add_subdirectory tests
+	fi
 }
 
 # @FUNCTION: kde5_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     09275f9360991a9416126a7fad29c5d2a763e997
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 19:15:27 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 19:15:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=09275f93

kde4-base.eclass: Re-add dev-qt/designer:4

Not going to invest time on it at this point.

 eclass/kde4-base.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 78bceb12ed..9ec78541e9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -356,6 +356,7 @@ unset cppuintdepend
 [[ -n ${qtcoreuse} ]] && qtcoreuse="[${qtcoreuse}]"
 kdecommondepend="
 	dev-lang/perl
+	>=dev-qt/designer-${QT_MINIMAL}:4
 	>=dev-qt/qtcore-${QT_MINIMAL}:4${qtcoreuse}
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
 	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a5b3f5d822c25da88121ff43adc7922d1e334e3f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 12:23:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 12:23:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5b3f5d8

eclass/kde*eclass: Mark KDE Applications 17.08.0 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 9ec78541e9..1a5a4e0c79 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.0 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 93e4f01277..b48dd4b46b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -146,7 +146,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e7753972dc103b968580bd0ca0a548b640e6d9fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 18:40:51 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 18:43:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7753972

kde5*.eclass: KDEBASE=kdel10n cleanup

 eclass/kde5-functions.eclass |   2 -
 eclass/kde5.eclass           | 111 -------------------------------------------
 2 files changed, 113 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 5b1115f089..e11fdc823e 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -79,8 +79,6 @@ esac
 # kdevelop ebuild.
 if [[ ${KMNAME-${PN}} = kdevelop ]]; then
 	KDEBASE=kdevelop
-elif [[ ${KMNAME} = kde-l10n || ${PN} = kde-l10n ]]; then
-	KDEBASE=kdel10n
 fi
 
 debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b48dd4b46b..f26aac839b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -115,16 +115,6 @@ else
 	: ${KDE_TEST:=false}
 fi
 
-# @ECLASS-VARIABLE: KDE_L10N
-# @DESCRIPTION:
-# This is an array of translations this ebuild supports. These translations
-# are automatically added to IUSE.
-if [[ ${KDEBASE} = kdel10n ]]; then
-	if [[ -n ${KDE_L10N} ]]; then
-		IUSE="${IUSE} $(printf 'l10n_%s ' ${KDE_L10N[@]})"
-	fi
-fi
-
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:
 # If set to "none", do nothing.
@@ -150,8 +140,6 @@ KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"
-elif [[ ${KDEBASE} = kdel10n ]]; then
-	HOMEPAGE="https://l10n.kde.org"
 elif [[ ${KMNAME} = kdepim ]]; then
 	HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 else
@@ -373,21 +361,6 @@ _calculate_src_uri() {
 		unset _kdebase
 	fi
 
-	if [[ ${KDEBASE} = kdel10n ]] ; then
-		local uri_base="${SRC_URI/${_kmname}-${PV}.tar.xz/}kde-l10n/kde-l10n"
-		SRC_URI=""
-		for my_l10n in ${KDE_L10N[@]} ; do
-			case ${my_l10n} in
-				sr | sr-ijekavsk | sr-Latn-ijekavsk | sr-Latn)
-					SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${uri_base}-sr-${PV}.tar.xz )"
-					;;
-				*)
-					SRC_URI="${SRC_URI} l10n_${my_l10n}? ( ${uri_base}-$(kde_l10n2lingua ${my_l10n})-${PV}.tar.xz )"
-					;;
-			esac
-		done
-	fi
-
 	if _kde_is_unreleased ; then
 		RESTRICT+=" fetch"
 	fi
@@ -500,16 +473,6 @@ kde5_src_unpack() {
 				git-r3_src_unpack
 				;;
 		esac
-	elif [[ ${KDEBASE} = kdel10n ]]; then
-		local l10npart=5
-		[[ ${PN} = kde4-l10n ]] && l10npart=4
-		mkdir -p "${S}" || die "Failed to create source dir ${S}"
-		cd "${S}"
-		for my_tar in ${A}; do
-			tar -xpf "${DISTDIR}/${my_tar}" --xz \
-				"${my_tar/.tar.xz/}/CMakeLists.txt" "${my_tar/.tar.xz/}/${l10npart}" 2> /dev/null ||
-				elog "${my_tar}: tar extract command failed at least partially - continuing"
-		done
 	else
 		default
 	fi
@@ -521,42 +484,6 @@ kde5_src_unpack() {
 kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ${KDEBASE} = kdel10n ]]; then
-		local l10npart=5
-		[[ ${PN} = kde4-l10n ]] && l10npart=4
-		# move known variant subdirs to root dir, currently sr@*
-		use_if_iuse l10n_sr-ijekavsk && _l10n_variant_subdir2root sr-ijekavsk sr
-		use_if_iuse l10n_sr-Latn-ijekavsk && _l10n_variant_subdir2root sr-Latn-ijekavsk sr
-		use_if_iuse l10n_sr-Latn && _l10n_variant_subdir2root sr-Latn sr
-		if use_if_iuse l10n_sr; then
-			rm -rf kde-l10n-sr-${PV}/${l10npart}/sr/sr@* || die "Failed to cleanup L10N=sr"
-			_l10n_variant_subdir_buster sr
-		elif [[ -d kde-l10n-sr-${PV} ]]; then
-			# having any variant selected means parent lingua will be unpacked as well
-			rm -r kde-l10n-sr-${PV} || die "Failed to remove sr parent lingua"
-		fi
-
-		cat <<-EOF > CMakeLists.txt || die
-		project(${PN})
-		cmake_minimum_required(VERSION 2.8.12)
-		EOF
-		# add all l10n directories to cmake
-		if [[ -n ${A} ]]; then
-			cat <<-EOF >> CMakeLists.txt || die
-			$(printf "add_subdirectory( %s )\n" \
-				`find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`)
-			EOF
-		fi
-
-		# for KF5: drop KDE4-based part; for KDE4: drop KF5-based part
-		case ${l10npart} in
-			5) find -maxdepth 2 -type f -name CMakeLists.txt -exec \
-				sed -i -e "/add_subdirectory(4)/ s/^/#DONT/" {} + || die ;;
-			4) find -maxdepth 2 -type f -name CMakeLists.txt -exec \
-				sed -i -e "/add_subdirectory(5)/ s/^/#DONT/" {} + || die ;;
-		esac
-	fi
-
 	cmake-utils_src_prepare
 
 	# only build examples when required
@@ -807,42 +734,4 @@ kde5_pkg_postrm() {
 	xdg_pkg_postrm
 }
 
-_l10n_variant_subdir2root() {
-	local l10npart=5
-	[[ ${PN} = kde4-l10n ]] && l10npart=4
-	local lingua=$(kde_l10n2lingua ${1})
-	local src=kde-l10n-${2}-${PV}
-	local dest=kde-l10n-${lingua}-${PV}/${l10npart}
-
-	# create variant rootdir structure from parent lingua and adapt it
-	mkdir -p ${dest} || die "Failed to create ${dest}"
-	mv ${src}/${l10npart}/${2}/${lingua} ${dest}/${lingua} || die "Failed to create ${dest}/${lingua}"
-	cp -f ${src}/CMakeLists.txt kde-l10n-${lingua}-${PV} || die "Failed to prepare L10N=${1} subdir"
-	echo "add_subdirectory(${lingua})" > ${dest}/CMakeLists.txt ||
-		die "Failed to prepare ${dest}/CMakeLists.txt"
-	cp -f ${src}/${l10npart}/${2}/CMakeLists.txt ${dest}/${lingua} ||
-		die "Failed to create ${dest}/${lingua}/CMakeLists.txt"
-	sed -e "s/${2}/${lingua}/" -i ${dest}/${lingua}/CMakeLists.txt ||
-		die "Failed to prepare ${dest}/${lingua}/CMakeLists.txt"
-
-	_l10n_variant_subdir_buster ${1}
-}
-
-_l10n_variant_subdir_buster() {
-	local l10npart=5
-	[[ ${PN} = kde4-l10n ]] && l10npart=4
-	local dir=kde-l10n-$(kde_l10n2lingua ${1})-${PV}/${l10npart}/$(kde_l10n2lingua ${1})
-
-	case ${l10npart} in
-		5) sed -e "/^add_subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir" ;;
-		4) sed -e "/^macro.*subdirectory(/d" -i ${dir}/CMakeLists.txt || die "Failed to cleanup ${dir} subdir" ;;
-	esac
-
-	for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do
-		if [[ ${subdir##*/} != "cmake_modules" ]] ; then
-			echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt || die
-		fi
-	done
-}
-
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3dbfa804e5ce912d16939b42a9957d8c3ad33bf6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 14:02:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 14:02:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3dbfa804

kde5.eclass: Fix KDE_DESIGNERPLUGIN for >=kde-apps-17.12

 eclass/kde5.eclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f26aac839b..ac14a699f7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -209,10 +209,9 @@ case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
 		IUSE+=" designer"
-		DEPEND+=" designer? (
-			$(add_frameworks_dep kdesignerplugin)
-			$(add_qt_dep designer)
-		)"
+		DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
+		[[ ${PV} = 9999 || ${PV} = 17.12* ]] || \
+			DEPEND+=" designer? ( $(add_qt_dep designer) )"
 		;;
 esac
 
@@ -614,7 +613,11 @@ kde5_src_configure() {
 	fi
 
 	if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
+		if [[ ${PV} = 9999 || ${PV} = 17.12* ]]; then
+			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
+		else
+			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
+		fi
 	fi
 
 	if [[ ${KDE_QTHELP} != false ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0e50b503a52526101e18c6a86139024ccd51884e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 10:35:47 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 10:53:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e50b503

kde5.eclass: Mark KDE Frameworks 5.38 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ac14a699f7..59fe12b9de 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -136,7 +136,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.38.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4e3d80ca9ddc4e0463baa086d2c6d6bf789df6c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 13:47:45 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 13:48:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4e3d80ca

kde*eclass: Mark KDE Applications 17.08.1 unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ec1082c835..a698afa3b9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.08.1 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 59fe12b9de..530752a728 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -136,7 +136,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.38.0 )
+KDE_UNRELEASED=( kde-apps-17.08.1 kde-frameworks-5.38.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ff709655a9c7f5e600fdc517eab7b113bec889c3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 17:49:08 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 17:49:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff709655

kde*eclass: Mark KDE Applications 17.08.1 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a698afa3b9..ec1082c835 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.1 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 530752a728..59fe12b9de 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -136,7 +136,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.1 kde-frameworks-5.38.0 )
+KDE_UNRELEASED=( kde-frameworks-5.38.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     58a5081de7ff55cd0661013ae65b825a4e04f2e7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 11:15:20 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 11:15:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58a5081d

*.eclass: Include GNOME2_ECLASS_ICONS condition in postrm as well

The original GNOME2_ECLASS_ICONS patch has moved the condition from
gnome2_icon_cache_update to postinst phases of functions using
the preinst/postinst logic but accidentally omitted postrm. Include it
there as well to restore the old behavior.

 eclass/kde4-base.eclass | 4 +++-
 eclass/kde5.eclass      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ec1082c835..0348a5f80f 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1013,7 +1013,9 @@ kde4-base_pkg_postinst() {
 kde4-base_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	gnome2_icon_cache_update
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	buildsycoca

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 59fe12b9de..9870e73a2f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -733,7 +733,9 @@ kde5_pkg_postinst() {
 kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	gnome2_icon_cache_update
+	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+		gnome2_icon_cache_update
+	fi
 	xdg_pkg_postrm
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     39ce486c032a4c71a1c0d7deaae0b3aae17f357e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 11:20:28 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 11:20:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=39ce486c

kde5.eclass: Mark KDE Frameworks 5.38.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9870e73a2f..17763f1640 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -136,7 +136,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.38.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     0da8a08422db5888d4d5a69b1e80bebb60dbae97
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 12:14:08 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 12:14:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0da8a084

kde5-functions.eclass: Raise QT_MINIMAL to 5.7.1

 eclass/kde5-functions.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index e11fdc823e..3fa79d8565 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -33,17 +33,14 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		[[ ${KDE_BUILD_TYPE} = live || $(get_version_component_range 2) -ge 37 ]] \
-			&& : ${QT_MINIMAL:=5.7.1}
+		[[ ${KDE_BUILD_TYPE} = live || $(get_version_component_range 2) -ge 37 ]]
 		;;
 	kde-plasma)
-		: ${QT_MINIMAL:=5.7.1}
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;
 	kde-apps)
-		: ${QT_MINIMAL:=5.7.1}
 		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.37.0}
 		;;
 esac
@@ -51,7 +48,7 @@ esac
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.6.1}
+: ${QT_MINIMAL:=5.7.1}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     9f092c205a6f96f1d9f33887f343986c529adff9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 16:47:10 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 16:47:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f092c20

kde5-functions.eclass: Drop no-op line

Reported-by: Arfrever

 eclass/kde5-functions.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 3fa79d8565..0d59126c3a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -33,7 +33,6 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		[[ ${KDE_BUILD_TYPE} = live || $(get_version_component_range 2) -ge 37 ]]
 		;;
 	kde-plasma)
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     73c8be273d27480f1dfb96666475567e1f87250f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 20:58:10 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 20:58:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=73c8be27

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL to 5.37.0

 eclass/kde5-functions.eclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 0d59126c3a..120471344d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,9 +39,6 @@ case ${CATEGORY} in
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;
-	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.37.0}
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
@@ -52,7 +49,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.34.0}
+: ${FRAMEWORKS_MINIMAL:=5.37.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     3bcc9956ad8f2669d6e6b17f42c5ee541d6dfd34
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 13:18:35 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 13:18:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bcc9956

kde5.eclass: improve documentation

Bug: https://bugs.gentoo.org/629642

 eclass/kde5.eclass | 65 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 17763f1640..738b1268d5 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,9 +4,22 @@
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: Support eclass for KDE 5-related packages.
+# @BLURB: Support eclass for packages that follow KDE packaging conventions.
 # @DESCRIPTION:
-# The kde5.eclass provides support for building KDE 5-related packages.
+# This eclass is intended to streamline the creation of ebuilds for packages
+# that follow KDE upstream packaging conventions. It's primarily intended for
+# the three upstream release groups (Frameworks, Plasma, Applications) but
+# is also for any package that follows similar conventions.
+#
+# This eclass unconditionally inherits kde5-functions.eclass and all its public
+# functions and variables may be considered as part of this eclass's API.
+#
+# This eclass unconditionally inherits cmake-utils.eclass and all its public
+# variables and helper functions (not phase functions) may be considered as part
+# of this eclass's API.
+#
+# This eclass's phase functions are not intended to be mixed and matched, so if
+# any phase functions are overriden the version here should also be called.
 
 if [[ -z ${_KDE5_ECLASS} ]]; then
 _KDE5_ECLASS=1
@@ -35,19 +48,22 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
-# For any other value, add a dependency on dev-qt/qtcore:5 and kde-frameworks/extra-cmake-modules:5.
+# For any other value, add dependencies on dev-qt/qtcore:5, kde-frameworks/kf-env
+# and kde-frameworks/extra-cmake-modules:5. Additionally, required blockers may
+# be set depending on the value of CATEGORY.
 : ${KDE_AUTODEPS:=true}
 
 # @ECLASS-VARIABLE: KDE_BLOCK_SLOT4
 # @DESCRIPTION:
-# This variable is used when KDE_AUTODEPS is set.
-# If set to "true", add RDEPEND block on kde-apps/${PN}:4
+# This variable only has any effect when when CATEGORY = "kde-apps" and
+# KDE_AUTODEPS is also set. If set to "true", add RDEPEND block on kde-apps/${PN}:4
 : ${KDE_BLOCK_SLOT4:=true}
 
 # @ECLASS-VARIABLE: KDE_DEBUG
 # @DESCRIPTION:
-# If set to "false", unconditionally build with -DNDEBUG.
-# Otherwise, add debug to IUSE to control building with that flag.
+# If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and -DQT_NO_DEBUG
+# to CPPFLAGS.
+# Otherwise, add debug to IUSE.
 : ${KDE_DEBUG:=true}
 
 # @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
@@ -76,7 +92,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 
 # @ECLASS-VARIABLE: KDE_DOC_DIR
 # @DESCRIPTION:
-# Defaults to "doc". Otherwise, use alternative KDE handbook path.
+# Specifies the location of the KDE handbook if not the default.
 : ${KDE_DOC_DIR:=doc}
 
 # @ECLASS-VARIABLE: KDE_QTHELP
@@ -416,7 +432,8 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 
 # @FUNCTION: kde5_pkg_pretend
 # @DESCRIPTION:
-# Do some basic settings
+# Checks if the active compiler meets the minimum version requirements.
+# phase function is only exported if KDE_GCC_MINIMAL is defined.
 kde5_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
 	_check_gcc_version
@@ -424,7 +441,7 @@ kde5_pkg_pretend() {
 
 # @FUNCTION: kde5_pkg_setup
 # @DESCRIPTION:
-# Do some basic settings
+# Checks if the active compiler meets the minimum version requirements.
 kde5_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 	_check_gcc_version
@@ -432,7 +449,9 @@ kde5_pkg_setup() {
 
 # @FUNCTION: kde5_pkg_nofetch
 # @DESCRIPTION:
-# Display package publication status
+# Intended for use in the KDE overlay. If this package matches something in
+# KDE_UNRELEASED, display a giant warning that the package has not yet been
+# released upstream and should not be used.
 kde5_pkg_nofetch() {
 	if ! _kde_is_unreleased ; then
 		return
@@ -462,7 +481,7 @@ kde5_pkg_nofetch() {
 
 # @FUNCTION: kde5_src_unpack
 # @DESCRIPTION:
-# Function for unpacking KDE 5.
+# Unpack the sources, automatically handling both release and live ebuilds.
 kde5_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -479,7 +498,8 @@ kde5_src_unpack() {
 
 # @FUNCTION: kde5_src_prepare
 # @DESCRIPTION:
-# Function for preparing the KDE 5 sources.
+# Wrapper for cmake-utils_src_prepare with lots of extra logic for magic
+# handling of linguas, tests, handbook etc.
 kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -589,7 +609,8 @@ kde5_src_prepare() {
 
 # @FUNCTION: kde5_src_configure
 # @DESCRIPTION:
-# Function for configuring the build of KDE 5.
+# Wrapper for cmake-utils_src_configure with extra logic for magic handling of
+# handbook, tests etc.
 kde5_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -635,7 +656,8 @@ kde5_src_configure() {
 
 # @FUNCTION: kde5_src_compile
 # @DESCRIPTION:
-# Function for compiling KDE 5.
+# Wrapper for cmake-utils_src_compile. Currently doesn't do anything extra, but
+# is included as part of the API just in case it's needed in the future.
 kde5_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -644,7 +666,8 @@ kde5_src_compile() {
 
 # @FUNCTION: kde5_src_test
 # @DESCRIPTION:
-# Function for testing KDE 5.
+# Wrapper for cmake-utils_src_test with extra logic for magic handling of dbus
+# and virtualx.
 kde5_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -675,7 +698,9 @@ kde5_src_test() {
 
 # @FUNCTION: kde5_src_install
 # @DESCRIPTION:
-# Function for installing KDE 5.
+# Wrapper for cmake-utils_src_install with extra logic to avoid compressing
+# certain types of files. For example, khelpcenter is not able to read
+# compressed handbooks.
 kde5_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -698,7 +723,7 @@ kde5_src_install() {
 
 # @FUNCTION: kde5_pkg_preinst
 # @DESCRIPTION:
-# Function storing icon caches
+# Sets up environment variables required in kde5_pkg_postinst.
 kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -708,7 +733,7 @@ kde5_pkg_preinst() {
 
 # @FUNCTION: kde5_pkg_postinst
 # @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache after an application has been installed.
+# Updates the various XDG caches (icon, desktop, mime) if necessary.
 kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -729,7 +754,7 @@ kde5_pkg_postinst() {
 
 # @FUNCTION: kde5_pkg_postrm
 # @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache after an application has been removed.
+# Updates the various XDG caches (icon, desktop, mime) if necessary.
 kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     2c1d7fc8177c64a83d0d92956f5699bb3537c555
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 13:47:13 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 13:47:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2c1d7fc8

kde5-functions.eclass: improve documentation

 eclass/kde5-functions.eclass | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 120471344d..95debee53e 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,10 +4,12 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: Common ebuild functions for KDE 5 packages
+# @BLURB: Common ebuild functions for KDE 5-related packages.
 # @DESCRIPTION:
-# This eclass contains all functions shared by the different eclasses,
-# for KDE 5 ebuilds.
+# This eclass contains functions shared by the other KDE 5 eclasses and forms
+# part of their public API.
+#
+# This elass should (almost) never be inherited directly by an ebuild.
 
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1
@@ -22,7 +24,10 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-# determine the build type
+# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @DESCRIPTION:
+# If PV matches "*9999*", this is automatically set to "live".
+# Otherwise, this is automatically set to "release".
 if [[ ${PV} = *9999* ]]; then
 	KDE_BUILD_TYPE="live"
 else
@@ -43,28 +48,29 @@ esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
-# Minimal Qt version to require for the package.
+# Minimum version of Qt to require. This affects add_qt_dep.
 : ${QT_MINIMAL:=5.7.1}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
-# Minimal Frameworks version to require for the package.
+# Minimum version of Frameworks to require. This affects add_frameworks_dep.
 : ${FRAMEWORKS_MINIMAL:=5.37.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
-# Minimal Plasma version to require for the package.
+# Minimum version of Plasma to remove. This affects add_plasma_dep.
 : ${PLASMA_MINIMAL:=5.10.4}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
-# Minimal KDE Applications version to require for the package.
+# Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
 : ${KDE_APPS_MINIMAL:=14.12.0}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Minimal GCC version to require for the package.
+# Minimum version of active GCC to require. This is checked in kde5.eclass in
+# kde5_pkg_pretend and kde5_pkg_setup.
 
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
@@ -78,7 +84,8 @@ debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
 
 # @ECLASS-VARIABLE: KDE_SCM
 # @DESCRIPTION:
-# SCM to use if this is a live ebuild.
+# SCM to use if KDE_BUILD_TYPE is determined to be "live".
+# Currently, only git is supported.
 : ${KDE_SCM:=git}
 
 case ${KDE_SCM} in
@@ -147,7 +154,7 @@ _add_category_dep() {
 }
 
 # @FUNCTION: add_frameworks_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for kde-frameworks/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -179,7 +186,7 @@ add_frameworks_dep() {
 }
 
 # @FUNCTION: add_plasma_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for kde-plasma/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -211,7 +218,7 @@ add_plasma_dep() {
 }
 
 # @FUNCTION: add_kdeapps_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for kde-apps/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -243,7 +250,7 @@ add_kdeapps_dep() {
 }
 
 # @FUNCTION: add_qt_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for dev-qt/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -277,10 +284,13 @@ add_qt_dep() {
 	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
-# @FUNCTION: get_kde_version
+# @FUNCTION: get_kde_version [version]
 # @DESCRIPTION:
-# Translates an ebuild version into a major.minor KDE SC
-# release version. If no version is specified, ${PV} is used.
+# Translates an ebuild version into a major.minor KDE release version, taking
+# into account KDE's prerelease versioning scheme.
+# For example, get_kde_version 17.07.80 will return "17.08".
+# If the version equals 9999, "live" is returned.
+# If no version is specified, ${PV} is used.
 get_kde_version() {
 	local ver=${1:-${PV}}
 	local major=$(get_major_version ${ver})

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e1851d5f33d02068859e53f7d3273b97cabf27f5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 19:37:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 19:37:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1851d5f

kde5-functions.eclass: Raise PLASMA_MINIMAL=5.10.5

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 95debee53e..190443b85a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -59,7 +59,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to remove. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.10.4}
+: ${PLASMA_MINIMAL:=5.10.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e035336de7ef47e9b8e3e4f6cd475b8fe264dc4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 06:40:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 06:42:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e035336d

kde5-functions.eclass: Plasma 5.11 FRAMEWORKS_MINIMAL is 5.38.0

 eclass/kde5-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 190443b85a..86031079b3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -40,9 +40,9 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			: ${FRAMEWORKS_MINIMAL:=9999}
-		fi
+		[[ ${PV} = 5.10.95 ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
+		[[ ${PV} = 5.11* ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     1e3aa43876a04d604758a3287945afbf76ed4a0a
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 08:39:33 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 08:39:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e3aa438

eclass: Fix plasma >=5.10 beta URI

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 738b1268d5..7df4d287f7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -345,7 +345,7 @@ _calculate_src_uri() {
 			local plasmapv=$(get_version_component_range 1-3)
 
 			case ${PV} in
-				5.?.[6-9]? )
+				5.?.[6-9]? | 5.??.[6-9]? )
 					# Plasma 5 beta releases
 					SRC_URI="mirror://kde/unstable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     600e259eef3768a34a6183211f16941050fefc26
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 11:21:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 11:21:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=600e259e

kde5-functions.eclass: Documentation: s/remove/require

Gentoo-bug: 631186

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 86031079b3..0b49851f45 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -58,7 +58,7 @@ esac
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
-# Minimum version of Plasma to remove. This affects add_plasma_dep.
+# Minimum version of Plasma to require. This affects add_plasma_dep.
 : ${PLASMA_MINIMAL:=5.10.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     954578a86a5652fa7356db9444f1527365f427f3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 09:07:36 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 11:15:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=954578a8

cmake-utils.eclass: Add QA check for broken buildsystems

Closes: https://github.com/gentoo/gentoo/pull/4757

 eclass/cmake-utils.eclass | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index c6a52b8d9a..148fbc3cff 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -93,6 +93,12 @@ _CMAKE_UTILS_ECLASS=1
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
+# @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @DESCRIPTION:
+# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
+# a user flag and should under _no circumstances_ be set in the ebuild.
+# Helps in improving QA of build systems that write to source tree.
+
 case ${EAPI} in
 	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
 	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
@@ -442,6 +448,11 @@ cmake-utils_src_prepare() {
 
 	popd > /dev/null || die
 
+	# make ${S} read-only in order to detect broken build-systems
+	if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
+		chmod -R a-w "${S}"
+	fi
+
 	_CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     156f05d94939bfc31b0915977aa2400b41046114
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 09:07:35 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 11:15:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=156f05d9

cmake-utils.eclass: Add QA check that cmake-utils_src_prepare was run

Closes: https://github.com/gentoo/gentoo/pull/4757

 eclass/cmake-utils.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index dbb12f25f3..c6a52b8d9a 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -441,6 +441,8 @@ cmake-utils_src_prepare() {
 	fi
 
 	popd > /dev/null || die
+
+	_CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
 }
 
 # @VARIABLE: mycmakeargs
@@ -465,6 +467,10 @@ cmake-utils_src_prepare() {
 cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
+		eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+	fi
+
 	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
 
 	_cmake_check_build_dir

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     54f1b16262cee137d0efd1d4f3e56e05cda48260
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 15:41:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 15:50:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f1b162

kde5-functions.eclass: Fix default version handling

- don't cut off version components in add_category_dep, instead do it
  in add_plasma_dep and add_kdeapps_dep

 eclass/kde5-functions.eclass | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 0b49851f45..95eac433ab 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -141,7 +141,7 @@ _add_category_dep() {
 
 	if [[ -n ${version} ]] ; then
 		local operator=">="
-		local version="-$(get_version_component_range 1-3 ${version})"
+		local version="-${version}"
 	fi
 
 	if [[ -n ${slot} ]] ; then
@@ -178,7 +178,7 @@ add_frameworks_dep() {
 		version=${3}
 	elif [[ ${CATEGORY} = kde-frameworks ]]; then
 		version=$(get_version_component_range 1-2)
-	elif [[ -z "${version}" ]] ; then
+	elif [[ -z ${3} ]] ; then
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
@@ -209,8 +209,8 @@ add_plasma_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
-		version=${PV}
-	elif [[ -z "${version}" ]] ; then
+		version=$(get_version_component_range 1-3)
+	elif [[ -z ${3} ]] ; then
 		version=${PLASMA_MINIMAL}
 	fi
 
@@ -241,8 +241,8 @@ add_kdeapps_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-apps ]]; then
-		version=${PV}
-	elif [[ -z "${version}" ]] ; then
+		version=$(get_version_component_range 1-3)
+	elif [[ -z ${3} ]] ; then
 		version=${KDE_APPS_MINIMAL}
 	fi
 
@@ -268,15 +268,12 @@ add_qt_dep() {
 		die "${FUNCNAME} was called with too many arguments"
 	fi
 
-	local version
+	local version=${3}
 	local slot=${4}
 
-	if [[ -n ${3} ]]; then
-		version=${3}
-	elif [[ -z "${version}" ]]; then
+	if [[ -z ${version} ]]; then
 		version=${QT_MINIMAL}
 	fi
-
 	if [[ -z ${slot} ]]; then
 		slot="5"
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     629a15311672aa657d82ab39670055926d9e6017
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 21:12:06 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 21:12:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=629a1531

kde5-meta-pkg.eclass: There is no KDE 5

 eclass/kde5-meta-pkg.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index a241d5d8e2..a9417fb7d0 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -4,9 +4,10 @@
 # @ECLASS: kde5-meta-pkg.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: This eclass contains boilerplate for KDE 5 meta packages
+# @BLURB: This eclass contains boilerplate for KDE meta packages.
 # @DESCRIPTION:
-# This eclass should only be used for defining meta packages for KDE 5.
+# This eclass should only be used for defining meta packages bundling
+# software produced by the KDE community.
 
 if [[ -z ${_KDE5_META_PKG_ECLASS} ]]; then
 _KDE5_META_PKG_ECLASS=1

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c3b4273543aea9ec14487797496e86c2fbf7197f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 21:42:37 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 21:11:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3b42735

kde5-functions.eclass: There is no KDE 5

 eclass/kde5-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 95eac433ab..5e0dc3aa96 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,12 +4,12 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: Common ebuild functions for KDE 5-related packages.
+# @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
-# This eclass contains functions shared by the other KDE 5 eclasses and forms
+# This eclass contains functions shared by the other KDE eclasses and forms
 # part of their public API.
 #
-# This elass should (almost) never be inherited directly by an ebuild.
+# This eclass should (almost) never be inherited directly by an ebuild.
 
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f09df0f6d83d3ba2a63e441c574aad071632c06d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 18:07:02 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 18:07:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f09df0f6

kde4-base.eclass: Drop outdated pkg_postinst warning

 eclass/kde4-base.eclass | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index bac6a24fc1..0c7b4c11bb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -994,16 +994,6 @@ kde4-base_pkg_postinst() {
 			einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
 			echo
 		fi
-		# for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta
-		if [[ ${KDEBASE} != kde-base ]] && \
-				! has_version 'kde-apps/kdebase-runtime-meta'; then
-			if [[ ${KDE_REQUIRED} == always ]] || ( [[ ${KDE_REQUIRED} == optional ]] && use kde ); then
-				echo
-				ewarn "WARNING! Your system configuration does not contain \"kde-apps/kdebase-runtime-meta\"."
-				ewarn "With this setting you are unsupported by KDE team."
-				ewarn "All missing features you report for misc packages will be probably ignored or closed as INVALID."
-			fi
-		fi
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c6c821d0284913abd562055d59683fb33d0a13f1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 18:05:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 18:05:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6c821d0

kde4-base.eclass: Switch from fdo-mime to xdg-utils

 eclass/kde4-base.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0348a5f80f..bac6a24fc1 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -33,7 +33,7 @@ _KDE4_BASE_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils virtualx versionator eutils multilib
+inherit kde4-functions toolchain-funcs flag-o-matic gnome2-utils virtualx versionator eutils multilib xdg-utils
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@@ -982,8 +982,8 @@ kde4-base_pkg_postinst() {
 	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	buildsycoca
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
@@ -1016,8 +1016,8 @@ kde4-base_pkg_postrm() {
 	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	buildsycoca
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3e1edf90eeb1cb36f50b8f6d50b07398cf1b0c17
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  5 11:25:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 11:25:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e1edf90

kde5.eclass: Mark KDE Plasma 5.11 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7df4d287f7..32b0b4312d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.11.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     92891b98f7b187b773ec90a0eeeb7c9bb0ddb1ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 21:36:47 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 22:06:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=92891b98

kde5.eclass: Drop obsolete SRC_URI

 eclass/kde5.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3a1e92e267..a596597ce1 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -329,8 +329,6 @@ _calculate_src_uri() {
 	case ${CATEGORY} in
 		kde-apps)
 			case ${PV} in
-				16.12.3)
-					SRC_URI="mirror://kde/Attic/applications/16.12.3/src/${_kmname}-${PV}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[6-9]? )
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     705aa32b129b394fd4e4c27ab02fc279bec6eda1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 21:29:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 22:06:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=705aa32b

kde5.eclass: Drop obsolete conditional

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 32b0b4312d..3a1e92e267 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -100,7 +100,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # If set to "false", do nothing.
 # Otherwise, add "doc" to IUSE, add the appropriate dependency, generate
 # and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
-if [[ ${CATEGORY} = kde-frameworks && ( $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ) ]]; then
+if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_QTHELP:=true}
 else
 	: ${KDE_QTHELP:=false}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2b8402417473ecd56c1b56992f6bb687d5612e10
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 21:41:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 22:06:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b840241

kde5.eclass: Mark KDE Frameworks 5.39.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a596597ce1..bab478d70b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.11.0 )
+KDE_UNRELEASED=( kde-frameworks-5.39.0 kde-plasma-5.11.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     bd55acfb7cfc04a00233d4594e5b4cbe72bf5ea1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 07:57:26 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 07:57:26 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd55acfb

kde5-functions.eclass: Raise minimal versions

Closes: https://bugs.gentoo.org/633330

 eclass/kde5-functions.eclass | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 5e0dc3aa96..7a52044de8 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -42,7 +42,20 @@ case ${CATEGORY} in
 	kde-plasma)
 		[[ ${PV} = 5.10.95 ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
 		[[ ${PV} = 5.11* ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
-		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		if [[ ${PV} = 5.12* ]]; then
+			: ${QT_MINIMAL:=5.9.2}
+			: ${FRAMEWORKS_MINIMAL:=5.38.0}
+		fi
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+			: ${QT_MINIMAL:=5.9.2}
+			: ${FRAMEWORKS_MINIMAL:=9999}
+		fi
+		;;
+	kde-apps)
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
+			: ${QT_MINIMAL:=5.9.2}
+			: ${FRAMEWORKS_MINIMAL:=5.38.0}
+		fi
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     5d0b8bc2b88c46021a6f86c5270142cfad07e694
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 08:51:11 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 08:51:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d0b8bc2

kde5-functions.eclass: Lower QT_MINIMAL to 5.9.1

dev-qt/qtwebkit missing a release in 5.9.2.

 eclass/kde5-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7a52044de8..eaaeac6bb3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -43,17 +43,17 @@ case ${CATEGORY} in
 		[[ ${PV} = 5.10.95 ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
 		[[ ${PV} = 5.11* ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
 		if [[ ${PV} = 5.12* ]]; then
-			: ${QT_MINIMAL:=5.9.2}
+			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=5.38.0}
 		fi
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			: ${QT_MINIMAL:=5.9.2}
+			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;
 	kde-apps)
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
-			: ${QT_MINIMAL:=5.9.2}
+			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=5.38.0}
 		fi
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3277ea6b441f825ae96bcfd556aca849109f15b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 09:11:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 09:11:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3277ea6b

kde*.eclass: Mark KDE Applications 17.08.2 unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0c7b4c11bb..eecb194570 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.08.2 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bab478d70b..980eb6531b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.39.0 kde-plasma-5.11.0 )
+KDE_UNRELEASED=( kde-apps-17.08.2 kde-frameworks-5.39.0 kde-plasma-5.11.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ee469d3e0ab8e52e2c4c2521d45802e6a1e75915
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 12:50:13 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 12:55:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee469d3e

kde5-functions.eclass: Drop obsolete 5.10.95 min version handling

 eclass/kde5-functions.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index eaaeac6bb3..42c54019df 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -40,7 +40,6 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.10.95 ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
 		[[ ${PV} = 5.11* ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
 		if [[ ${PV} = 5.12* ]]; then
 			: ${QT_MINIMAL:=5.9.1}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fe9593b20ef18c26437e7c813c6857911a6b5d33
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 12:49:24 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 12:55:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe9593b2

kde5.eclass: Mark KDE Plasma 5.11.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 980eb6531b..5841e45b04 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.2 kde-frameworks-5.39.0 kde-plasma-5.11.0 )
+KDE_UNRELEASED=( kde-apps-17.08.2 kde-frameworks-5.39.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2a3552475d981fe329ed562b007a53bdf6fe162c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 13:41:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 13:44:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a355247

kde*.eclass: Mark KDE Applications 17.08.2 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index eecb194570..0c7b4c11bb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.2 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5841e45b04..a225560edf 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.2 kde-frameworks-5.39.0 )
+KDE_UNRELEASED=( kde-frameworks-5.39.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     365f8c563e3a249ae080795e526999925f870e75
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 12:51:41 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 12:51:41 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=365f8c56

kde5.eclass: Mark KDE Frameworks 5.39.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a225560edf..52e063c5a6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.39.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bf806ee6299c1e3d78ab7db193f981fe38768fde
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 22:08:04 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 23:19:32 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf806ee6

kde5.eclass: Don't add BUILD_TESTING=OFF if test not in IUSE

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 52e063c5a6..67ac4ac165 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -619,7 +619,7 @@ kde5_src_configure() {
 
 	local cmakeargs
 
-	if ! use_if_iuse test ; then
+	if in_iuse test && ! use test ; then
 		cmakeargs+=( -DBUILD_TESTING=OFF )
 
 		if [[ ${KDE_TEST} = optional ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0c6e6d3dc7bc8a7e84d52a2465b1a6d223b4e3a6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  5 10:40:06 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 10:40:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c6e6d3d

eclass: Mark KDE Frameworks 5.40 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 67ac4ac165..9f425ebe6e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.40 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     16a2df169a8663237fb58484d2e0626f42142da3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  7 07:26:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 07:28:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=16a2df16

kde*eclass: Mark KDE Applications 17.08.3 unreleased

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0c7b4c11bb..6cd13a71f0 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.08.3 )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9f425ebe6e..6bf927321b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.40 )
+KDE_UNRELEASED=( kde-frameworks-5.40 kde-apps-17.08.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0f02894d490e70510bcda7c1434abb73d46c96e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  9 19:11:51 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 19:11:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f02894d

kde*.eclass: Mark KDE Applications 17.08.3 as released

 eclass/kde4-base.eclass | 2 +-
 eclass/kde5.eclass      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 6cd13a71f0..0c7b4c11bb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -188,7 +188,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.08.3 )
+KDE_UNRELEASED=( )
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6bf927321b..9f425ebe6e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.40 kde-apps-17.08.3 )
+KDE_UNRELEASED=( kde-frameworks-5.40 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     608516d7a209419b4e7204247f242e38ac318003
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  8 22:32:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 19:14:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=608516d7

eclass: Drop unused kde4-{base,functions}.eclass

 eclass/kde4-base.eclass      | 1014 ------------------------------------------
 eclass/kde4-functions.eclass |  429 ------------------
 2 files changed, 1443 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
deleted file mode 100644
index 0c7b4c11bb..0000000000
--- a/eclass/kde4-base.eclass
+++ /dev/null
@@ -1,1014 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde4-base.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: This eclass provides functions for kde 4.X ebuilds
-# @DESCRIPTION:
-# The kde4-base.eclass provides support for building KDE4 based ebuilds
-# and KDE4 applications.
-#
-# NOTE: KDE 4 ebuilds currently support EAPI 5. This will be
-# reviewed over time as new EAPI versions are approved.
-
-if [[ -z ${_KDE4_BASE_ECLASS} ]]; then
-_KDE4_BASE_ECLASS=1
-
-# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
-# @DESCRIPTION:
-# 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}
-
-# @ECLASS-VARIABLE: VIRTUALDBUS_TEST
-# @DESCRIPTION:
-# If defined, launch and use a private dbus session during src_test.
-
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
-# @DESCRIPTION:
-# 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}
-
-inherit kde4-functions toolchain-funcs flag-o-matic gnome2-utils virtualx versionator eutils multilib xdg-utils
-
-if [[ ${KDE_BUILD_TYPE} = live ]]; then
-	case ${KDE_SCM} in
-		svn) inherit subversion ;;
-		git) inherit git-r3 ;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: CMAKE_REQUIRED
-# @DESCRIPTION:
-# Specify if cmake buildsystem is being used. Possible values are 'always' and 'never'.
-# Please note that if it's set to 'never' you need to explicitly override following phases:
-# src_configure, src_compile, src_test and src_install.
-# Defaults to 'always'.
-: ${CMAKE_REQUIRED:=always}
-if [[ ${CMAKE_REQUIRED} = always ]]; then
-	buildsystem_eclass="cmake-utils"
-	export_fns="src_configure src_compile src_test src_install"
-fi
-
-# @ECLASS-VARIABLE: KDE_MINIMAL
-# @DESCRIPTION:
-# This variable is used when KDE_REQUIRED is set, to specify required KDE minimal
-# version for apps to work. Currently defaults to 4.4
-# One may override this variable to raise version requirements.
-# Note that it is fixed to ${PV} for kde-base packages.
-KDE_MINIMAL="${KDE_MINIMAL:-4.4}"
-
-# Set slot for KDEBASE known packages
-case ${KDEBASE} in
-	kde-base)
-		SLOT=4/$(get_version_component_range 1-2)
-		KDE_MINIMAL="${PV}"
-		;;
-	kdevelop)
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			# @ECLASS-VARIABLE: KDEVELOP_VERSION
-			# @DESCRIPTION:
-			# Specifies KDevelop version. Default is 4.0.0 for tagged packages and 9999 for live packages.
-			# Applies to KDEBASE=kdevelop only.
-			KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.9999}"
-			# @ECLASS-VARIABLE: KDEVPLATFORM_VERSION
-			# @DESCRIPTION:
-			# Specifies KDevplatform version. Default is 1.0.0 for tagged packages and 9999 for live packages.
-			# Applies to KDEBASE=kdevelop only.
-			KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-4.9999}"
-		else
-			case ${PN} in
-				kdevelop)
-					KDEVELOP_VERSION=${PV}
-					KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)"
-					;;
-				kdevplatform|kdevelop-php*|kdevelop-python)
-					KDEVELOP_VERSION="$(($(get_major_version)+3)).$(get_after_major_version)"
-					KDEVPLATFORM_VERSION=${PV}
-					;;
-				*)
-					KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.0.0}"
-					KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-1.0.0}"
-			esac
-		fi
-		SLOT="4"
-		;;
-esac
-
-inherit ${buildsystem_eclass}
-
-EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare ${export_fns} pkg_preinst pkg_postinst pkg_postrm
-
-unset buildsystem_eclass
-unset export_fns
-
-# @ECLASS-VARIABLE: DECLARATIVE_REQUIRED
-# @DESCRIPTION:
-# Is qtdeclarative required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-DECLARATIVE_REQUIRED="${DECLARATIVE_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: QT3SUPPORT_REQUIRED
-# @DESCRIPTION:
-# Is qt3support required? Possible values are 'true' or 'false'.
-# This variable must be set before inheriting any eclasses. Defaults to 'false'.
-QT3SUPPORT_REQUIRED="${QT3SUPPORT_REQUIRED:-false}"
-
-# @ECLASS-VARIABLE: QTHELP_REQUIRED
-# @DESCRIPTION:
-# Is qthelp required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-QTHELP_REQUIRED="${QTHELP_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: OPENGL_REQUIRED
-# @DESCRIPTION:
-# Is qtopengl required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: MULTIMEDIA_REQUIRED
-# @DESCRIPTION:
-# Is qtmultimedia required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: SQL_REQUIRED
-# @DESCRIPTION:
-# Is qtsql required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-SQL_REQUIRED="${SQL_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: WEBKIT_REQUIRED
-# @DESCRIPTION:
-# Is qtwebkit required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-WEBKIT_REQUIRED="${WEBKIT_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: CPPUNIT_REQUIRED
-# @DESCRIPTION:
-# Is cppunit required for tests? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-CPPUNIT_REQUIRED="${CPPUNIT_REQUIRED:-never}"
-
-# @ECLASS-VARIABLE: KDE_REQUIRED
-# @DESCRIPTION:
-# Is kde required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'always'
-# If set to 'always' or 'optional', KDE_MINIMAL may be overriden as well.
-# Note that for kde-base packages this variable is fixed to 'always'.
-KDE_REQUIRED="${KDE_REQUIRED:-always}"
-
-# @ECLASS-VARIABLE: KDE_HANDBOOK
-# @DESCRIPTION:
-# Set to enable handbook in application. Possible values are 'always', 'optional'
-# (handbook USE flag) and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-# It adds default handbook dirs for kde-base packages to KMEXTRA and in any case it
-# ensures buildtime and runtime dependencies.
-KDE_HANDBOOK="${KDE_HANDBOOK:-never}"
-
-# @ECLASS-VARIABLE: KDE_LINGUAS_LIVE_OVERRIDE
-# @DESCRIPTION:
-# Set this varible if you want your live package to manage its
-# translations. (Mostly all kde ebuilds does not ship documentation
-# and translations in live ebuilds)
-if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
-	# Kdebase actually provides the handbooks even for live stuff
-	[[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never
-	KDE_LINGUAS=""
-fi
-
-# @ECLASS-VARIABLE: KDE_UNRELEASED
-# @INTERNAL
-# @DESCRIPTION
-# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
-# Any package matching this will have fetch restriction enabled, and receive
-# a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
-
-# Setup packages inheriting this eclass
-case ${KDEBASE} in
-	kde-base)
-		HOMEPAGE="https://www.kde.org/"
-		LICENSE="GPL-2"
-		if [[ ${KDE_BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			# Disable tests for live ebuilds by default
-			RESTRICT+=" test"
-		fi
-
-		# This code is to prevent portage from searching GENTOO_MIRRORS for
-		# packages that will never be mirrored. (As they only will ever be in
-		# the overlay).
-		case ${PV} in
-			*9999* | 4.?.[6-9]? | 4.??.[6-9]? | ??.?.[6-9]? | ??.??.[6-9]?)
-				RESTRICT+=" mirror"
-				;;
-		esac
-		;;
-	kdevelop)
-		HOMEPAGE="https://www.kdevelop.org/"
-		LICENSE="GPL-2"
-		;;
-esac
-
-# @ECLASS-VARIABLE: QT_MINIMAL
-# @DESCRIPTION:
-# Determine version of qt we enforce as minimal for the package.
-QT_MINIMAL="${QT_MINIMAL:-4.8.5}"
-
-# Declarative dependencies
-qtdeclarativedepend="
-	>=dev-qt/qtdeclarative-${QT_MINIMAL}:4
-"
-case ${DECLARATIVE_REQUIRED} in
-	always)
-		COMMONDEPEND+=" ${qtdeclarativedepend}"
-		;;
-	optional)
-		IUSE+=" declarative"
-		COMMONDEPEND+=" declarative? ( ${qtdeclarativedepend} )"
-		;;
-	*) ;;
-esac
-unset qtdeclarativedepend
-
-# Qt3Support dependencies
-qt3supportdepend="
-	>=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
-"
-case ${QT3SUPPORT_REQUIRED} in
-	true)
-		COMMONDEPEND+=" ${qt3supportdepend}"
-		[[ -n ${qtcoreuse} ]] && qtcoreuse+=",qt3support" || qtcoreuse="qt3support"
-		[[ -n ${qtsqluse} ]] && qtsqluse+=",qt3support" || qtsqluse="qt3support"
-		[[ -n ${kdelibsuse} ]] && kdelibsuse+=",qt3support(+)" || kdelibsuse="qt3support(+)"
-		;;
-	*) ;;
-esac
-unset qt3supportdepend
-
-# QtHelp dependencies
-qthelpdepend="
-	>=dev-qt/qthelp-${QT_MINIMAL}:4
-"
-case ${QTHELP_REQUIRED} in
-	always)
-		COMMONDEPEND+=" ${qthelpdepend}"
-		;;
-	optional)
-		IUSE+=" qthelp"
-		COMMONDEPEND+=" qthelp? ( ${qthelpdepend} )"
-		;;
-esac
-unset qthelpdepend
-
-# OpenGL dependencies
-qtopengldepend="
-	>=dev-qt/qtopengl-${QT_MINIMAL}:4
-"
-case ${OPENGL_REQUIRED} in
-	always)
-		COMMONDEPEND+=" ${qtopengldepend}"
-		;;
-	optional)
-		IUSE+=" opengl"
-		COMMONDEPEND+=" opengl? ( ${qtopengldepend} )"
-		;;
-	*) ;;
-esac
-unset qtopengldepend
-
-# MultiMedia dependencies
-qtmultimediadepend="
-	>=dev-qt/qtmultimedia-${QT_MINIMAL}:4
-"
-case ${MULTIMEDIA_REQUIRED} in
-	always)
-		COMMONDEPEND+=" ${qtmultimediadepend}"
-		;;
-	optional)
-		IUSE+=" multimedia"
-		COMMONDEPEND+=" multimedia? ( ${qtmultimediadepend} )"
-		;;
-	*) ;;
-esac
-unset qtmultimediadepend
-
-# Sql dependencies
-[[ -n ${qtsqluse} ]] && qtsqluse="[${qtsqluse}]"
-qtsqldepend="
-	>=dev-qt/qtsql-${QT_MINIMAL}:4${qtsqluse}
-"
-case ${SQL_REQUIRED} in
-	always)
-		COMMONDEPEND+=" ${qtsqldepend}"
-		;;
-	optional)
-		IUSE+=" sql"
-		COMMONDEPEND+=" sql? ( ${qtsqldepend} )"
-		;;
-	*) ;;
-esac
-unset qtsqluse
-unset qtsqldepend
-
-# WebKit dependencies
-qtwebkitdepend="
-	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
-"
-case ${WEBKIT_REQUIRED} in
-	always)
-		COMMONDEPEND+=" ${qtwebkitdepend}"
-		[[ -n ${kdelibsuse} ]] && kdelibsuse+=",webkit(+)" || kdelibsuse="webkit(+)"
-		;;
-	optional)
-		IUSE+=" +webkit"
-		COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )"
-		[[ -n ${kdelibsuse} ]] && kdelibsuse+=",webkit?" || kdelibsuse="webkit?"
-		;;
-	*) ;;
-esac
-unset qtwebkitdepend
-
-# CppUnit dependencies
-cppuintdepend="
-	dev-util/cppunit
-"
-case ${CPPUNIT_REQUIRED} in
-	always)
-		DEPEND+=" ${cppuintdepend}"
-		;;
-	optional)
-		IUSE+=" test"
-		DEPEND+=" test? ( ${cppuintdepend} )"
-		;;
-	*) ;;
-esac
-unset cppuintdepend
-
-# KDE dependencies
-# Qt accessibility classes are needed in various places, bug 325461
-[[ -n ${qtcoreuse} ]] && qtcoreuse+=",ssl" || qtcoreuse="ssl"
-[[ -n ${qtcoreuse} ]] && qtcoreuse="[${qtcoreuse}]"
-kdecommondepend="
-	dev-lang/perl
-	>=dev-qt/designer-${QT_MINIMAL}:4
-	>=dev-qt/qtcore-${QT_MINIMAL}:4${qtcoreuse}
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
-	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	>=dev-qt/qttest-${QT_MINIMAL}:4
-"
-unset qtcoreuse
-
-if [[ ${PN} != kdelibs ]]; then
-	[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]"
-	kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}"
-	if [[ ${KDEBASE} = kdevelop ]]; then
-		if [[ ${PN} != kdevplatform ]]; then
-			# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
-			# @DESCRIPTION:
-			# Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'.
-			# Applies to KDEBASE=kdevelop only.
-			KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
-			case ${KDEVPLATFORM_REQUIRED} in
-				always)
-					kdecommondepend+="
-						>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4
-					"
-					;;
-				*) ;;
-			esac
-		fi
-	fi
-fi
-unset kdelibsuse
-
-kdedepend="
-	dev-util/automoc
-	virtual/pkgconfig
-	>=x11-libs/libXtst-1.1.0
-	x11-proto/xf86vidmodeproto
-"
-
-kderdepend=""
-
-# all packages needs oxygen icons for basic iconset
-if [[ ${PN} != oxygen-icons ]]; then
-	kderdepend+=" kde-frameworks/oxygen-icons"
-fi
-
-# add a dependency over kde4-l10n
-if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
-	for _lingua in $(kde4_lingua_to_l10n ${KDE_LINGUAS}); do
-		# if our package has linguas, pull in kde4-l10n with selected lingua enabled,
-		# but only for selected ones.
-		# this can't be done on one line because if user doesn't use any localisation
-		# then he is probably not interested in kde4-l10n at all.
-		kderdepend+="
-		l10n_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "l10n_${_lingua}(+)") )
-		"
-	done
-	unset _lingua
-fi
-
-kdehandbookdepend="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-"
-kdehandbookrdepend="
-	kde-frameworks/kdelibs:4[handbook]
-"
-case ${KDE_HANDBOOK} in
-	always)
-		kdedepend+=" ${kdehandbookdepend}"
-		[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
-		;;
-	optional)
-		IUSE+=" +handbook"
-		kdedepend+=" handbook? ( ${kdehandbookdepend} )"
-		[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
-		;;
-	*) ;;
-esac
-unset kdehandbookdepend kdehandbookrdepend
-
-case ${KDE_SELINUX_MODULE} in
-	none)	;;
-	*)
-		IUSE+=" selinux"
-		kderdepend+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} )"
-		;;
-esac
-
-case ${KDE_REQUIRED} in
-	always)
-		[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" ${kdecommondepend}"
-		[[ -n ${kdedepend} ]] && DEPEND+=" ${kdedepend}"
-		[[ -n ${kderdepend} ]] && RDEPEND+=" ${kderdepend}"
-		;;
-	optional)
-		IUSE+=" kde"
-		[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" kde? ( ${kdecommondepend} )"
-		[[ -n ${kdedepend} ]] && DEPEND+=" kde? ( ${kdedepend} )"
-		[[ -n ${kderdepend} ]] && RDEPEND+=" kde? ( ${kderdepend} )"
-		;;
-	*) ;;
-esac
-
-unset kdecommondepend kdedepend kderdepend
-
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: COMMONDEPEND is ${COMMONDEPEND}"
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND (only) is ${DEPEND}"
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND (only) is ${RDEPEND}"
-
-# Accumulate dependencies set by this eclass
-DEPEND+=" ${COMMONDEPEND}"
-RDEPEND+=" ${COMMONDEPEND}"
-unset COMMONDEPEND
-
-_kde_is_unreleased() {
-	local pair
-	for pair in "${KDE_UNRELEASED[@]}" ; do
-		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
-# kdevelop ebuild, the URI should be set in the ebuild itself
-_calculate_src_uri() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local _kmname _kmname_pv
-
-	# we calculate URI only for known KDEBASE modules
-	[[ -n ${KDEBASE} ]] || return
-
-	# calculate tarball module name
-	if [[ -n ${KMNAME} ]]; then
-		_kmname="${KMNAME}"
-	else
-		_kmname=${PN}
-	fi
-	_kmname_pv="${_kmname}-${PV}"
-	case ${KDEBASE} in
-		kde-base)
-			case ${PV} in
-				4.4.20*)
-					# KDEPIM 4.4 no-akonadi branch, special case
-					# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
-					SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz" ;;
-				4.?.[6-9]? | 4.??.[6-9]?)
-					# Unstable KDE SC releases
-					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.11.22)
-					# Part of 15.08.0 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/Attic/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
-				4.14.3)
-					# Last SC release
-					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.14.10)
-					# Part of 15.04.3 actually, sigh. Used by last version of KDE PIM 4.
-					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.11*)
-					# KDEPIM 4.14 snapshot with Gentoo patches
-					SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${_kmname_pv}.tar.xz" ;;
-				16.12.3)
-					SRC_URI="mirror://kde/Attic/applications/16.12.3/src/${_kmname_pv}.tar.xz" ;;
-				??.?.[6-9]? | ??.??.[4-9]?)
-					# Unstable KDE Applications releases
-					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
-				*)
-					# Stable KDE Applications releases
-					SRC_URI="mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
-				;;
-			esac
-			;;
-		kdevelop|kdevelop-php*|kdevplatform)
-			case ${KDEVELOP_VERSION} in
-				4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
-				4.7.3) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
-				4.7.4) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/${P}.tar.xz" ;;
-				*) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
-			esac
-			;;
-	esac
-
-	if _kde_is_unreleased ; then
-		RESTRICT+=" fetch"
-	fi
-}
-
-_calculate_live_repo() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	SRC_URI=""
-	case ${KDE_SCM} in
-		svn)
-			# Determine branch URL based on live type
-			local branch_prefix
-			case ${PV} in
-				9999*)
-					# trunk
-					branch_prefix="trunk/KDE"
-					;;
-				*)
-					# branch
-					branch_prefix="branches/KDE/$(get_kde_version)"
-
-					if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-						branch_prefix="branches/Applications/$(get_kde_version)"
-					fi
-
-					# @ECLASS-VARIABLE: ESVN_PROJECT_SUFFIX
-					# @DESCRIPTION
-					# Suffix appended to ESVN_PROJECT depending on fetched branch.
-					# Defaults is empty (for -9999 = trunk), and "-${PV}" otherwise.
-					ESVN_PROJECT_SUFFIX="-${PV}"
-					;;
-			esac
-			# @ECLASS-VARIABLE: ESVN_MIRROR
-			# @DESCRIPTION:
-			# This variable allows easy overriding of default kde mirror service
-			# (anonsvn) with anything else you might want to use.
-			ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
-			# Split ebuild, or extragear stuff
-			if [[ -n ${KMNAME} ]]; then
-				ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}"
-				if [[ -z ${KMNOMODULE} ]] && [[ -z ${KMMODULE} ]]; then
-					KMMODULE="${PN}"
-				fi
-				# Split kde-base/ ebuilds: (they reside in trunk/KDE)
-				case ${KMNAME} in
-					kdebase-*)
-						ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/kdebase/${KMNAME#kdebase-}"
-						;;
-					kdelibs-*)
-						ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/kdelibs/${KMNAME#kdelibs-}"
-						;;
-					kdereview*)
-						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
-						;;
-					kdesupport)
-						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
-						ESVN_PROJECT="${PN}${ESVN_PROJECT_SUFFIX}"
-						;;
-					kde*)
-						ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${KMNAME}"
-						;;
-					extragear*|playground*)
-						# Unpack them in toplevel dir, so that they won't conflict with kde4-meta
-						# build packages from same svn location.
-						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
-						ESVN_PROJECT="${PN}${ESVN_PROJECT_SUFFIX}"
-						;;
-					*)
-						ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
-						;;
-				esac
-			else
-				# kdelibs, kdepimlibs
-				ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${PN}"
-				ESVN_PROJECT="${PN}${ESVN_PROJECT_SUFFIX}"
-			fi
-			# @ECLASS-VARIABLE: ESVN_UP_FREQ
-			# @DESCRIPTION:
-			# This variable is used for specifying the timeout between svn synces
-			# for kde-base modules. Does not affect misc apps.
-			# Default value is 1 hour.
-			[[ ${KDEBASE} = kde-base ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
-			;;
-		git)
-			local _kmname
-			# @ECLASS-VARIABLE: EGIT_MIRROR
-			# @DESCRIPTION:
-			# This variable allows easy overriding of default kde mirror service
-			# (anongit) with anything else you might want to use.
-			EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
-
-			# @ECLASS-VARIABLE: EGIT_REPONAME
-			# @DESCRIPTION:
-			# This variable allows overriding of default repository
-			# name. Specify only if this differ from PN and KMNAME.
-			if [[ -n ${EGIT_REPONAME} ]]; then
-				# the repository and kmname different
-				_kmname=${EGIT_REPONAME}
-			elif [[ -n ${KMNAME} ]]; then
-				_kmname=${KMNAME}
-			else
-				_kmname=${PN}
-			fi
-
-			# default branching
-			[[ ${PV} != 4.9999* && ${PV} != 9999 && ${KDEBASE} == kde-base ]] && \
-				EGIT_BRANCH="KDE/$(get_kde_version)"
-
-			# Applications branching
-			[[ ${PV} == ??.??.49.9999 && ${KDEBASE} == kde-base ]] && \
-				EGIT_BRANCH="Applications/$(get_kde_version)"
-
-			# default repo uri
-			EGIT_REPO_URI+=( "${EGIT_MIRROR}/${_kmname}" )
-
-			debug-print "${FUNCNAME}: Repository: ${EGIT_REPO_URI}"
-			debug-print "${FUNCNAME}: Branch: ${EGIT_BRANCH}"
-			;;
-	esac
-}
-
-case ${KDE_BUILD_TYPE} in
-	live) _calculate_live_repo ;;
-	*) _calculate_src_uri ;;
-esac
-
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
-
-# @ECLASS-VARIABLE: PREFIX
-# @DESCRIPTION:
-# Set the installation PREFIX for non kde-base applications. It defaults to /usr.
-# kde-base packages go into KDE4 installation directory (/usr).
-# No matter the PREFIX, package will be built against KDE installed in /usr.
-
-# @FUNCTION: kde4-base_pkg_setup
-# @DESCRIPTION:
-# Do some basic settings
-kde4-base_pkg_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if has handbook ${IUSE} || has "+handbook" ${IUSE} && [[ "${KDE_HANDBOOK}" != optional ]] ; then
-		eqawarn "Handbook support is enabled via KDE_HANDBOOK=optional in the ebuild."
-		eqawarn "Please do not just set IUSE=handbook, as this leads to dependency errors."
-	fi
-
-	# Don't set KDEHOME during compilation, it will cause access violations
-	unset KDEHOME
-
-	KDEDIR=/usr
-	: ${PREFIX:=/usr}
-	EKDEDIR=${EPREFIX}/usr
-
-	# Point to correct QT plugins path
-	QT_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/kde4/plugins/"
-
-	# Fix XDG collision with sandbox
-	export XDG_CONFIG_HOME="${T}"
-}
-
-# @FUNCTION: kde4-base_pkg_nofetch
-# @DESCRIPTION:
-# Display package publication status
-kde4-base_pkg_nofetch() {
-	if ! _kde_is_unreleased ; then
-		return
-	fi
-
-	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
-	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
-	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"
-	eerror "| |_| | |\  |  _ <| |___| |___| |___ / ___ \ ___) | |___| |_| |"
-	eerror " \___/|_| \_|_| \_\_____|_____|_____/_/   \_\____/|_____|____/ "
-	eerror "                                                               "
-	eerror " ____   _    ____ _  __    _    ____ _____ "
-	eerror "|  _ \ / \  / ___| |/ /   / \  / ___| ____|"
-	eerror "| |_) / _ \| |   | ' /   / _ \| |  _|  _|  "
-	eerror "|  __/ ___ \ |___| . \  / ___ \ |_| | |___ "
-	eerror "|_| /_/   \_\____|_|\_\/_/   \_\____|_____|"
-	eerror
-	eerror "${CATEGORY}/${P} has not been released to the public yet"
-	eerror "and is only available to packagers right now."
-	eerror ""
-	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
-	eerror ""
-	eerror "Please consult the upstream release schedule to see when this "
-	eerror "package is scheduled to be released:"
-	eerror "https://community.kde.org/Schedules"
-}
-
-# @FUNCTION: kde4-base_src_unpack
-# @DESCRIPTION:
-# This function unpacks the source tarballs for KDE4 applications.
-kde4-base_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		case ${KDE_SCM} in
-			svn)
-				subversion_src_unpack
-				;;
-			git)
-				git-r3_src_unpack
-				;;
-		esac
-	else
-		unpack ${A}
-	fi
-}
-
-# @FUNCTION: kde4-base_src_prepare
-# @DESCRIPTION:
-# General pre-configure and pre-compile function for KDE4 applications.
-# It also handles translations if KDE_LINGUAS is defined. See KDE_LINGUAS and
-# enable_selected_linguas() and enable_selected_doc_linguas()
-# in kde4-functions.eclass(5) for further details.
-kde4-base_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# enable handbook and linguas only when not using live ebuild
-
-	# Only enable selected languages, used for KDE extragear apps.
-	if [[ -n ${KDE_LINGUAS} ]]; then
-		enable_selected_linguas
-	fi
-
-	# Enable/disable handbooks for kde4-base packages
-	# kde4-l10n inherits kde4-base but is metapackage, so no check for doc
-	# kdelibs inherits kde4-base but handle installing the handbook itself
-	if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
-		if [[ ${KDEBASE} == kde-base ]]; then
-			if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
-				# documentation in kde4-functions
-				: ${KDE_DOC_DIRS:=doc}
-				local dir
-				for dir in ${KDE_DOC_DIRS}; do
-					sed -e "\!^[[:space:]]*add_subdirectory[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
-						-e "\!^[[:space:]]*ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
-						-e "\!^[[:space:]]*macro_optional_add_subdirectory[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
-						-e "\!^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
-						-i CMakeLists.txt || die "failed to comment out handbook"
-				done
-			fi
-		else
-			enable_selected_doc_linguas
-		fi
-	fi
-
-	# SCM bootstrap
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		case ${KDE_SCM} in
-			svn) subversion_src_prepare ;;
-		esac
-	fi
-
-	# Apply patches, cmake-utils does the job already
-	cmake-utils_src_prepare
-
-	# Save library dependencies
-	if [[ -n ${KMSAVELIBS} ]] ; then
-		save_library_dependencies
-	fi
-
-	# Inject library dependencies
-	if [[ -n ${KMLOADLIBS} ]] ; then
-		load_library_dependencies
-	fi
-
-	# Hack for manuals relying on outdated DTD, only outside kde-base/...
-	if [[ -z ${KDEBASE} ]]; then
-		find "${S}" -name "*.docbook" \
-			-exec sed -i -r \
-				-e 's:-//KDE//DTD DocBook XML V4\.1(\..)?-Based Variant V1\.[01]//EN:-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN:g' {} + \
-			|| die 'failed to fix DocBook variant version'
-	fi
-}
-
-# @FUNCTION: kde4-base_src_configure
-# @DESCRIPTION:
-# Function for configuring the build of KDE4 applications.
-kde4-base_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Build tests in src_test only, where we override this value
-	local cmakeargs=(-DKDE4_BUILD_TESTS=OFF)
-
-	if use_if_iuse debug; then
-		# Set "real" debug mode
-		CMAKE_KDE_BUILD_TYPE="Debugfull"
-	else
-		# Handle common release builds
-		append-cppflags -DQT_NO_DEBUG
-	fi
-
-	# Set distribution name
-	[[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
-
-	# Here we set the install prefix
-	tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")
-
-	# Use colors
-	QTEST_COLORED=1
-
-	# Shadow existing installations
-	unset KDEDIRS
-
-	#qmake -query QT_INSTALL_LIBS unavailable when cross-compiling
-	tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/$(get_libdir)/qt4)
-	#kde-config -path data unavailable when cross-compiling
-	tc-is-cross-compiler && cmakeargs+=(-DKDE4_DATA_DIR=${ROOT}/usr/share/apps/)
-
-	# sysconf needs to be /etc, not /usr/etc
-	cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
-
-	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
-		if [[ ${mycmakeargs} ]]; then
-			eqawarn "mycmakeargs should always be declared as an array, not a string"
-		fi
-		mycmakeargs=(${mycmakeargs})
-	fi
-
-	mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}")
-
-	cmake-utils_src_configure
-}
-
-# @FUNCTION: kde4-base_src_compile
-# @DESCRIPTION:
-# General function for compiling KDE4 applications.
-kde4-base_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	cmake-utils_src_compile "$@"
-}
-
-# @FUNCTION: kde4-base_src_test
-# @DESCRIPTION:
-# Function for testing KDE4 applications.
-kde4-base_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local kded4_pid
-
-	_test_runner() {
-		if [[ -n "${VIRTUALDBUS_TEST}" ]]; then
-			export $(dbus-launch)
-			kded4 2>&1 > /dev/null &
-			kded4_pid=$!
-		fi
-
-		cmake-utils_src_test
-	}
-
-	# When run as normal user during ebuild development with the ebuild command, the
-	# kde 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
-
-	# Override this value, set in kde4-base_src_configure()
-	mycmakeargs+=(-DKDE4_BUILD_TESTS=ON)
-	cmake-utils_src_configure
-	kde4-base_src_compile
-
-	if [[ ${VIRTUALX_REQUIRED} == always || ${VIRTUALX_REQUIRED} == test ]]; then
-		# check for sanity if anyone already redefined VIRTUALX_COMMAND from the default
-		if [[ ${VIRTUALX_COMMAND} != emake ]]; then
-			# surprise- we are already INSIDE virtualmake!!!
-			debug-print "QA Notice: This version of kde4-base.eclass includes the virtualx functionality."
-			debug-print "           You may NOT set VIRTUALX_COMMAND or call virtualmake from the ebuild."
-			debug-print "           Setting VIRTUALX_REQUIRED is completely sufficient. See the"
-			debug-print "           kde4-base.eclass docs for details... Applying workaround."
-			_test_runner
-		else
-			virtx _test_runner
-		fi
-	else
-		_test_runner
-	fi
-
-	if [ -n "${kded4_pid}" ] ; then
-		kill ${kded4_pid}
-	fi
-
-	if [ -n "${DBUS_SESSION_BUS_PID}" ] ; then
-		kill ${DBUS_SESSION_BUS_PID}
-	fi
-}
-
-# @FUNCTION: kde4-base_src_install
-# @DESCRIPTION:
-# Function for installing KDE4 applications.
-kde4-base_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${KMSAVELIBS} ]] ; then
-		install_library_dependencies
-	fi
-
-	# Install common documentation of KDE4 applications
-	local doc
-	if ! has kde4-meta ${INHERITED}; then
-		for doc in "${S}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-			[[ -f ${doc} && -s ${doc} ]] && dodoc "${doc}"
-		done
-		for doc in "${S}"/*/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-			[[ -f ${doc} && -s ${doc} ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
-		done
-	fi
-
-	cmake-utils_src_install
-
-	# We don't want ${PREFIX}/share/doc/HTML to be compressed,
-	# because then khelpcenter can't find the docs
-	[[ -d ${ED}/${PREFIX}/share/doc/HTML ]] &&
-		docompress -x ${PREFIX}/share/doc/HTML
-}
-
-# @FUNCTION: kde4-base_pkg_preinst
-# @DESCRIPTION:
-# Function storing icon caches
-kde4-base_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	gnome2_icon_savelist
-	if [[ ${KDE_BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then
-		subversion_pkg_preinst
-	fi
-}
-
-# @FUNCTION: kde4-base_pkg_postinst
-# @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache after an application has been installed.
-kde4-base_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	buildsycoca
-
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			echo
-			einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}"
-			einfo "Use it at your own risk."
-			einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
-			echo
-		fi
-	fi
-}
-
-# @FUNCTION: kde4-base_pkg_postrm
-# @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache after an application has been removed.
-kde4-base_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	buildsycoca
-}
-
-fi

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
deleted file mode 100644
index 558191db5e..0000000000
--- a/eclass/kde4-functions.eclass
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde4-functions.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: Common ebuild functions for KDE 4 packages
-# @DESCRIPTION:
-# This eclass contains all functions shared by the different eclasses,
-# for KDE 4 ebuilds.
-
-if [[ -z ${_KDE4_FUNCTIONS_ECLASS} ]]; then
-_KDE4_FUNCTIONS_ECLASS=1
-
-inherit versionator
-
-# @ECLASS-VARIABLE: EAPI
-# @DESCRIPTION:
-# Currently kde4 eclasses support EAPI 5 and 6.
-case ${EAPI} in
-	5|6) : ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: KDE_OVERRIDE_MINIMAL
-# @DESCRIPTION:
-# For use only in very few well-defined cases; normally it should be unset.
-# If this variable is set, all calls to add_kdebase_dep return a dependency on
-# at least this version, independent of the version of the package itself.
-# If you know exactly that one specific NEW KDE component builds and runs fine
-# with all the rest of KDE at an OLDER version, you can set this old version here.
-# Warning- may lead to general instability and kill your pet targh.
-
-# @ECLASS-VARIABLE: KDEBASE
-# @DESCRIPTION:
-# This gets set to a non-zero value when a package is considered a kde or
-# kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base || ${CATEGORY} == kde-plasma || ${CATEGORY} = kde-apps || ${CATEGORY} = kde-frameworks ]]; then
-	debug-print "${ECLASS}: KDEBASE ebuild recognized"
-	KDEBASE=kde-base
-elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
-	KDEBASE=kdevelop
-fi
-
-debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
-
-# determine the build type
-if [[ ${PV} = *9999* ]]; then
-	KDE_BUILD_TYPE="live"
-else
-	KDE_BUILD_TYPE="release"
-fi
-export KDE_BUILD_TYPE
-
-# Set reponame and SCM for modules that have fully migrated to git
-# (hack - it's here because it needs to be before SCM inherits from kde4-base)
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	case "${KMNAME}" in
-		kdebase-workspace)
-			EGIT_REPONAME=${EGIT_REPONAME:=kde-workspace}
-		;;
-		kdebase-runtime)
-			EGIT_REPONAME=${EGIT_REPONAME:=kde-runtime}
-		;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: KDE_SCM
-# @DESCRIPTION:
-# If this is a live package which scm does it use
-# Everything else uses git by default
-KDE_SCM="${KDE_SCM:-git}"
-case ${KDE_SCM} in
-	svn|git) ;;
-	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
-esac
-
-# @FUNCTION: kde4_lingua_to_l10n
-# @USAGE: <lingua>...
-# @INTERNAL
-# @DESCRIPTION:
-# Output l10n flag name(s) (without prefix(es)) appropriate for given KDE
-# locale(s).
-kde4_lingua_to_l10n() {
-	local l
-	for l; do
-		case ${l} in
-			ca@valencia) echo ca-valencia;;
-			sr@ijekavian) echo sr-ijekavsk;;
-			sr@ijekavianlatin) echo sr-Latn-ijekavsk;;
-			sr@latin|sr@Latn) echo sr-Latn;;
-			uz@cyrillic) echo uz-Cyrl;;
-			*@*) die "${FUNCNAME}: Unhandled KDE_LINGUAS: ${l}";;
-			*) echo "${l/_/-}";;
-		esac
-	done
-}
-
-# @ECLASS-VARIABLE: KDE_LINGUAS
-# @DESCRIPTION:
-# This is a whitespace-separated list of translations this ebuild supports.
-# These translations are automatically added to IUSE. Therefore ebuilds must set
-# this variable before inheriting any eclasses. To enable only selected
-# translations, ebuilds must call enable_selected_linguas(). kde4-{base,meta}.eclass does
-# this for you.
-#
-# Example: KDE_LINGUAS="de en_GB nl"
-if [[ ${KDE_BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
-	for _lingua in $(kde4_lingua_to_l10n ${KDE_LINGUAS}); do
-		IUSE="${IUSE} l10n_${_lingua}"
-	done
-fi
-
-# @FUNCTION: buildsycoca
-# @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache.
-# All KDE ebuilds should run this in pkg_postinst and pkg_postrm.
-buildsycoca() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# We no longer need to run kbuildsycoca4, as kded does that automatically, as needed
-
-	# fix permission for some directories
-	for x in usr/share/{config,kde4}; do
-		DIRS=${EROOT}usr
-		[[ -d "${EROOT}${x}" ]] || break # nothing to do if directory does not exist
-		# fixes Bug 318237
-		if use userland_BSD ; then
-			[[ $(stat -f %p "${EROOT}${x}") != 40755 ]]
-			local stat_rtn="$?"
-		else
-			[[ $(stat --format=%a "${EROOT}${x}") != 755 ]]
-			local stat_rtn=$?
-		fi
-		if [[ $stat_rtn != 1 ]] ; then
-			ewarn "QA Notice:"
-			ewarn "Package ${PN} is breaking ${EROOT}${x} permissions."
-			ewarn "Please report this issue to gentoo bugzilla."
-			einfo "Permissions will get adjusted automatically now."
-			find "${EROOT}${x}" -type d -print0 | xargs -0 chmod 755
-		fi
-	done
-}
-
-# @FUNCTION: comment_all_add_subdirectory
-# @USAGE: [list of directory names]
-# @DESCRIPTION:
-# Recursively comment all add_subdirectory instructions in listed directories,
-# except those in cmake/.
-comment_all_add_subdirectory() {
-	find "$@" -name CMakeLists.txt -print0 | grep -vFzZ "./cmake" | \
-		xargs -0 sed -i \
-			-e '/^[[:space:]]*add_subdirectory/s/^/#DONOTCOMPILE /' \
-			-e '/^[[:space:]]*ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' \
-			-e '/^[[:space:]]*macro_optional_add_subdirectory/s/^/#DONOTCOMPILE /' \
-			-e '/^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY/s/^/#DONOTCOMPILE /' \
-			|| die "${LINENO}: Initial sed died"
-}
-
-# @FUNCTION: enable_selected_linguas
-# @DESCRIPTION:
-# Enable translations based on L10N settings and translations supported by
-# the package (see KDE_LINGUAS). By default, translations are found in "${S}"/po
-# but this default can be overridden by defining KDE_LINGUAS_DIR.
-enable_selected_linguas() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local x
-
-	# @ECLASS-VARIABLE: KDE_LINGUAS_DIR
-	# @DESCRIPTION:
-	# Specified folder where application translations are located.
-	# Can be defined as array of folders where translations are located.
-	# Note that space separated list of dirs is not supported.
-	# Default value is set to "po".
-	if [[ "$(declare -p KDE_LINGUAS_DIR 2>/dev/null 2>&1)" == "declare -a"* ]]; then
-		debug-print "$FUNCNAME: we have these subfolders defined: ${KDE_LINGUAS_DIR}"
-		for x in ${KDE_LINGUAS_DIR[@]}; do
-			_enable_selected_linguas_dir ${x}
-		done
-	else
-		KDE_LINGUAS_DIR=${KDE_LINGUAS_DIR:="po"}
-		_enable_selected_linguas_dir ${KDE_LINGUAS_DIR}
-	fi
-}
-
-# @FUNCTION: enable_selected_doc_linguas
-# @DESCRIPTION:
-# Enable only selected L10N enabled doc folders.
-enable_selected_doc_linguas() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# @ECLASS-VARIABLE: KDE_DOC_DIRS
-	# @DESCRIPTION:
-	# Variable specifying whitespace separated patterns for documentation locations.
-	# Default is "doc/%lingua"
-	KDE_DOC_DIRS=${KDE_DOC_DIRS:='doc/%lingua'}
-	local linguas
-	for pattern in ${KDE_DOC_DIRS}; do
-
-		local handbookdir=`dirname ${pattern}`
-		local translationdir=`basename ${pattern}`
-		# Do filename pattern supplied, treat as directory
-		[[ ${handbookdir} = '.' ]] && handbookdir=${translationdir} && translationdir=
-		[[ -d ${handbookdir} ]] || die 'wrong doc dir specified'
-
-		if ! use handbook; then
-			# Disable whole directory
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-				-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-				-i CMakeLists.txt || die 'failed to comment out all handbooks'
-		else
-			# Disable subdirectories recursively
-			comment_all_add_subdirectory "${handbookdir}"
-
-			# In certain packages, the default handbook is en_US instead of the usual en. Since there is no en_US 'translation',
-			# it makes no sense to add to KDE_LINGUAS which causes this type of handbook to not be installed.
-			if [[ -d "${handbookdir}/en_US" && ! -d "${handbookdir}/en" ]]; then
-				mv "${handbookdir}/en_US" "${handbookdir}/en" || die
-				sed -e "s/en_US/en/" -i "${handbookdir}/CMakeLists.txt"
-			fi
-
-			# Add requested translations
-			local lingua
-			for lingua in en ${KDE_LINGUAS}; do
-				if [[ ${lingua} = en ]] || use "l10n_$(kde4_lingua_to_l10n "${lingua}")"; then
-					if [[ -d ${handbookdir}/${translationdir//%lingua/${lingua}} ]]; then
-						sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \
-							-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${translationdir//%lingua/${lingua}}/s/^#DONOTCOMPILE //" \
-							-i "${handbookdir}"/CMakeLists.txt && ! has ${lingua} ${linguas} && linguas="${linguas} ${lingua}"
-					fi
-				fi
-			done
-		fi
-
-	done
-	[[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}"
-}
-
-# Functions handling KMLOADLIBS and KMSAVELIBS
-
-# @FUNCTION: save_library_dependencies
-# @DESCRIPTION:
-# Add exporting CMake dependencies for current package
-save_library_dependencies() {
-	local depsfile="${T}/${PN}"
-
-	ebegin "Saving library dependencies in ${depsfile##*/}"
-	echo "EXPORT_LIBRARY_DEPENDENCIES(\"${depsfile}\")" >> "${S}/CMakeLists.txt" || \
-		die "Failed to save the library dependencies."
-	eend $?
-}
-
-# @FUNCTION: install_library_dependencies
-# @DESCRIPTION:
-# Install generated CMake library dependencies to /var/lib/kde
-install_library_dependencies() {
-	local depsfile="${T}/${PN}"
-
-	ebegin "Installing library dependencies as ${depsfile##*/}"
-	insinto /var/lib/kde
-	doins "${depsfile}" || die "Failed to install library dependencies."
-	eend $?
-}
-
-# @FUNCTION: load_library_dependencies
-# @DESCRIPTION:
-# Inject specified library dependencies in current package
-load_library_dependencies() {
-	local pn i depsfile
-	ebegin "Injecting library dependencies from '${KMLOADLIBS}'"
-
-	i=0
-	for pn in ${KMLOADLIBS} ; do
-		((i++))
-		depsfile="${EPREFIX}/var/lib/kde/${pn}"
-		[[ -r ${depsfile} ]] || depsfile="${EPREFIX}/var/lib/kde/${pn}:$(get_kde_version)"
-		[[ -r ${depsfile} ]] || die "Depsfile '${depsfile}' not accessible. You probably need to reinstall ${pn}."
-		sed -i -e "${i}iINCLUDE(\"${depsfile}\")" "${S}/CMakeLists.txt" || \
-			die "Failed to include library dependencies for ${pn}"
-	done
-	eend $?
-}
-
-# @FUNCTION: add_kdeapps_dep
-# @DESCRIPTION:
-# Create proper dependency for kde-apps/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-add_kdeapps_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local ver
-
-	if [[ -n ${2} ]] ; then
-		local use="[${2}]"
-	fi
-
-	if [[ -n ${3} ]]; then
-		ver=${3}
-	elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
-		ver=${KDE_OVERRIDE_MINIMAL}
-	elif [[ ${KDEBASE} != kde-base ]]; then
-		ver=${KDE_MINIMAL}
-	# if building kde-apps, live master or stable-live branch,
-	# use the final SC version since there are no further general releases.
-	# except when it is kdepim split packages, which rely on same-version deps
-	elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]] && [[ ${KMNAME} != "kdepim" ]]; then
-		ver=4.14.3
-	else
-		ver=${PV}
-	fi
-
-	[[ -z ${1} ]] && die "Missing parameter"
-
-	echo " >=kde-apps/${1}-${ver}:4${use}"
-}
-
-# @FUNCTION: add_kdebase_dep
-# @DESCRIPTION:
-# Create proper dependency for kde-base/ dependencies.
-# This takes 1 to 3 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-add_kdebase_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local ver
-
-	if [[ -n ${2} ]] ; then
-		local use="[${2}]"
-	fi
-
-	if [[ -n ${3} ]]; then
-		ver=${3}
-	elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
-		ver=${KDE_OVERRIDE_MINIMAL}
-	elif [[ ${KDEBASE} != kde-base ]]; then
-		ver=${KDE_MINIMAL}
-	# if building live master or kde-apps, use the final SC version
-	# since there are no further general releases.
-	elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then
-		ver=4.14.3
-	# if building a live version branch (eg. 4.11.49.9999) use the major version
-	elif [[ ${PV} == *.9999 ]]; then
-		ver=$(get_kde_version)
-	else
-		ver=${PV}
-	fi
-
-	[[ -z ${1} ]] && die "Missing parameter"
-
-	echo " >=kde-base/${1}-${ver}:4${use}"
-}
-
-# local function to enable specified translations for specified directory
-# used from kde4-functions_enable_selected_linguas function
-_enable_selected_linguas_dir() {
-	local lingua linguas sr_mess wp
-	local dir=${1}
-
-	[[ -d  ${dir} ]] || die "linguas dir \"${dir}\" does not exist"
-	comment_all_add_subdirectory "${dir}"
-	pushd "${dir}" > /dev/null || die
-
-	# fix all various crazy sr@Latn variations
-	# this part is only ease for ebuilds, so there wont be any die when this
-	# fail at any point
-	sr_mess="sr@latn sr@latin sr@Latin"
-	for wp in ${sr_mess}; do
-		[[ -e ${wp}.po ]] && mv "${wp}.po" "sr@Latn.po"
-		if [[ -d ${wp} ]]; then
-			# move dir and fix cmakelists
-			mv "${wp}" "sr@Latn"
-			sed -i \
-				-e "s:${wp}:sr@Latn:g" \
-				CMakeLists.txt
-		fi
-	done
-
-	for lingua in ${KDE_LINGUAS}; do
-		if [[ -e ${lingua}.po ]]; then
-			mv "${lingua}.po" "${lingua}.po.old"
-		fi
-	done
-
-	for lingua in ${KDE_LINGUAS}; do
-		if use "l10n_$(kde4_lingua_to_l10n ${lingua})" ; then
-			if [[ -d ${lingua} ]]; then
-				linguas="${linguas} ${lingua}"
-				sed -e "/add_subdirectory([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \
-					-e "/ADD_SUBDIRECTORY([[:space:]]*${lingua}[[:space:]]*)[[:space:]]*$/ s/^#DONOTCOMPILE //" \
-					-i CMakeLists.txt || die "Sed to uncomment linguas_${lingua} failed."
-			fi
-			if [[ -e ${lingua}.po.old ]]; then
-				linguas="${linguas} ${lingua}"
-				mv "${lingua}.po.old" "${lingua}.po"
-			fi
-		fi
-	done
-	[[ -n ${linguas} ]] && echo ">>> Enabling languages: ${linguas}"
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: get_kde_version
-# @DESCRIPTION:
-# Translates an ebuild version into a major.minor KDE SC
-# release version. If no version is specified, ${PV} is used.
-get_kde_version() {
-	local ver=${1:-${PV}}
-	local major=$(get_major_version ${ver})
-	local minor=$(get_version_component_range 2 ${ver})
-	local micro=$(get_version_component_range 3 ${ver})
-	if [[ ${ver} == 9999 ]]; then
-		echo live
-	else
-		(( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1))
-	fi
-}
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5b9ef6cfdc3fab7e8069604514b2d99c6a9d5408
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 11 13:47:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 13:47:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b9ef6cf

kde5.eclass: Mark KDE Frameworks 5.40.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9f425ebe6e..67ac4ac165 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -152,7 +152,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.40 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     864968afd7c5169e4c2fe5b3d8039985d060459f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 17:13:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 17:26:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=864968af

kde5-functions.eclass: Add 17.11* minimum deps

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 42c54019df..81dca34e68 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -51,7 +51,7 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=5.38.0}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     d5bb6f3460d55e83b90f7ebce0d331ee7442a249
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 01:02:29 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 01:02:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d5bb6f34

cmake-utils.eclass: mark some eclass variables as unset by default

Bug: https://bugs.gentoo.org/637726

 eclass/cmake-utils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 148fbc3cff..58990e624d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -44,6 +44,7 @@ _CMAKE_UTILS_ECLASS=1
 : ${CMAKE_BUILD_TYPE:=Gentoo}
 
 # @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set to enable in-source build.
 
@@ -88,12 +89,14 @@ _CMAKE_UTILS_ECLASS=1
 # "no" to disable (default) or anything else to enable.
 
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 # @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # After running cmake-utils_src_prepare, sets ${S} to read-only. This is
 # a user flag and should under _no circumstances_ be set in the ebuild.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b51b99feae822d3a89b38d22828f39ec364142d6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 22:59:44 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 23:19:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b51b99fe

kde5.eclass: Fix KDE_DESIGNERPLUGIN for 17.11

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 67ac4ac165..58bc990feb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -226,7 +226,7 @@ case ${KDE_DESIGNERPLUGIN} in
 	*)
 		IUSE+=" designer"
 		DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
-		[[ ${PV} = 9999 || ${PV} = 17.12* ]] || \
+		[[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]] || \
 			DEPEND+=" designer? ( $(add_qt_dep designer) )"
 		;;
 esac
@@ -632,7 +632,7 @@ kde5_src_configure() {
 	fi
 
 	if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		if [[ ${PV} = 9999 || ${PV} = 17.12* ]]; then
+		if [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
 			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
 		else
 			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6525e9c479dfddd8fdba39283e36b18aa6528743
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 02:14:41 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 02:19:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6525e9c4

kde5-functions.eclass: use new EAPI documentation method

Bug: https://bugs.gentoo.org/637778

 eclass/kde5-functions.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 81dca34e68..8494732379 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
+# @SUPPORTED_EAPIS: 6
 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
 # This eclass contains functions shared by the other KDE eclasses and forms
@@ -16,9 +17,6 @@ _KDE5_FUNCTIONS_ECLASS=1
 
 inherit toolchain-funcs versionator
 
-# @ECLASS-VARIABLE: EAPI
-# @DESCRIPTION:
-# Currently EAPI 6 is supported.
 case ${EAPI} in
 	6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     fbbe4a7b9806408975f82991529865f32e6557e9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 02:18:56 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 02:19:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbbe4a7b

cmake-utils.eclass: add supported EAPI documentation

 eclass/cmake-utils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 58990e624d..28b29eb3f0 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -9,6 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
+# @SUPPORTED_EAPIS: 5 6
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0c1928a1d437709c2540fe1fc01302d65afb7bcb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 13:19:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 17:25:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c1928a1

kde5.eclass: Fix eclassdoc

Bug: https://bugs.gentoo.org/637776

 eclass/kde5.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 58bc990feb..94fdae9f81 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -102,9 +102,8 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_QTHELP:=true}
-else
-	: ${KDE_QTHELP:=false}
 fi
+: ${KDE_QTHELP:=false}
 
 # @ECLASS-VARIABLE: KDE_TESTPATTERN
 # @DESCRIPTION:
@@ -127,9 +126,8 @@ fi
 # fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_TEST:=true}
-else
-	: ${KDE_TEST:=false}
 fi
+: ${KDE_TEST:=false}
 
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a326d0dd76c396f43949c03c40f8938538de288a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 17:40:11 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 17:40:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a326d0dd

kde5-functions.eclass: Fix eclassdoc

Bug: https://bugs.gentoo.org/637778

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8494732379..6beaf698dc 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,10 +26,9 @@ esac
 # @DESCRIPTION:
 # If PV matches "*9999*", this is automatically set to "live".
 # Otherwise, this is automatically set to "release".
+KDE_BUILD_TYPE="release"
 if [[ ${PV} = *9999* ]]; then
 	KDE_BUILD_TYPE="live"
-else
-	KDE_BUILD_TYPE="release"
 fi
 export KDE_BUILD_TYPE
 
@@ -83,6 +82,7 @@ esac
 # kde5_pkg_pretend and kde5_pkg_setup.
 
 # @ECLASS-VARIABLE: KDEBASE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a
 # kdevelop ebuild.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     82dcbb56a54266c7ece3c2ed09228e08d403ea16
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 10:06:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 10:06:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=82dcbb56

kde5.eclass: Mark KDE Applications 17.11.90 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 94fdae9f81..d3d3d60b70 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -150,7 +150,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-17.11.90 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ea06dfc157270fa9807dd50627277bdb8f24d8b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 13:39:20 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 13:39:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea06dfc1

kde5-functions: Raise FRAMEWORKS_MINIMAL to 5.39 for kde-apps-17.12

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 6beaf698dc..3bbc010089 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -50,7 +50,7 @@ case ${CATEGORY} in
 	kde-apps)
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
-			: ${FRAMEWORKS_MINIMAL:=5.38.0}
+			: ${FRAMEWORKS_MINIMAL:=5.39.0}
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fb3967252bb52e8416a8dc0336c1e9a5f2f7ae02
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 17:44:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 17:44:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb396725

kde5.eclass: Mark KDE Applications 17.11.90 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d3d3d60b70..94fdae9f81 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -150,7 +150,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.11.90 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     23858329a86af6548aedb63bb6afd6de2038c07d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 18:30:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 18:30:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=23858329

cmake-utils.eclass: Use xdg_environment_reset from xdg-utils.eclass

Bug: https://bugs.gentoo.org/639460

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 28b29eb3f0..7b12a6e7d7 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -110,7 +110,7 @@ case ${EAPI} in
 esac
 
 inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
-	multiprocessing versionator
+	multiprocessing versionator xdg-utils
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
@@ -491,7 +491,7 @@ cmake-utils_src_configure() {
 	_cmake_check_build_dir
 
 	# Fix xdg collision with sandbox
-	local -x XDG_CONFIG_HOME="${T}"
+	xdg_environment_reset
 
 	# @SEE CMAKE_BUILD_TYPE
 	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6071d566d3146036144891b0875eea3eec81a8fb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 22:38:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 22:44:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6071d566

kde5.eclass: Mark KDE Frameworks 5.41.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 94fdae9f81..02f1741e62 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -150,7 +150,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.41.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     37438e567e86ddf05c8ab47e4e65003f9e25e7af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 13:47:19 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 13:47:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=37438e56

kde5.eclass: Mark KDE Applications 17.12.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 02f1741e62..9bc3f8c956 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -150,7 +150,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.41.0 )
+KDE_UNRELEASED=( kde-frameworks-5.41.0 kde-apps-17.12.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7614c4aa93958661c89081ae6797c8d746241b5d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 21:49:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 09:38:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7614c4aa

kde5.eclass: Mark KDE Frameworks 5.41 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9bc3f8c956..2d7a5a332b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -150,7 +150,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.41.0 kde-apps-17.12.0 )
+KDE_UNRELEASED=( kde-apps-17.12.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e990b3214b778b57dd9d8be75aa1791578913199
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 21:55:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 10:29:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e990b321

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL to 5.40.0

 eclass/kde5-functions.eclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 3bbc010089..f2e835725e 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,10 +37,8 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.11* ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0}
 		if [[ ${PV} = 5.12* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
-			: ${FRAMEWORKS_MINIMAL:=5.38.0}
 		fi
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${QT_MINIMAL:=5.9.1}
@@ -50,7 +48,6 @@ case ${CATEGORY} in
 	kde-apps)
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
-			: ${FRAMEWORKS_MINIMAL:=5.39.0}
 		fi
 		;;
 esac
@@ -63,7 +60,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.37.0}
+: ${FRAMEWORKS_MINIMAL:=5.40.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f584e341d9ab77da5b0363cf70ed3dd749093dab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 22:43:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 07:35:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f584e341

kde5*.eclass: Drop kde-apps-17.11* quirks

 eclass/kde5-functions.eclass | 2 +-
 eclass/kde5.eclass           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f2e835725e..19f0a856d8 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -46,7 +46,7 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 		fi
 		;;

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2d7a5a332b..7ef21b7ad6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -224,7 +224,7 @@ case ${KDE_DESIGNERPLUGIN} in
 	*)
 		IUSE+=" designer"
 		DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
-		[[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]] || \
+		[[ ${PV} = 17.08* ]] && \
 			DEPEND+=" designer? ( $(add_qt_dep designer) )"
 		;;
 esac
@@ -630,10 +630,10 @@ kde5_src_configure() {
 	fi
 
 	if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		if [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
-			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
-		else
+		if [[ ${PV} = 17.08* ]]; then
 			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
+		else
+			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
 		fi
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9d382413588a4fe407047a919e5afab64b01035d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 21:51:10 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 21:23:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d382413

kde5.eclass: Mark KDE Applications 17.12.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7ef21b7ad6..81d4b8a373 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -150,7 +150,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.12.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4bf568ab97ef043b9840f947e562a42b1c77022d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 08:05:14 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 23:13:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4bf568ab

kde5.eclass: Add icons as runtime dependency

Most applications use icons at runtime, so add them when KDE_AUTODEPS is
enabled.

Bug: https://bugs.gentoo.org/564838

 eclass/kde5.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 81d4b8a373..826e0abf10 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -194,6 +194,11 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
+		# all packages need breeze/oxygen icons for basic iconset, bug #564838
+		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
+			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
+		fi
+
 		case ${CATEGORY} in
 			kde-frameworks | \
 			kde-plasma)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cfbd0e399fcd6ccd5c0af3f96b484ca1a5001bda
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 17:43:03 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 17:43:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cfbd0e39

kde5-functions.eclass: add_qt_dep qtwebkit exception

Upstream stopped at 5.9.1 and releases are going to be
independent from there on.

 eclass/kde5-functions.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d531908079..fd118d5cce 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -280,7 +280,11 @@ add_qt_dep() {
 	local slot=${4}
 
 	if [[ -z ${version} ]]; then
-		version=${QT_MINIMAL}
+		if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then
+			version=5.9.1 # no more upstream release, need bug #624404
+		else
+			version=${QT_MINIMAL}
+		fi
 	fi
 	if [[ -z ${slot} ]]; then
 		slot="5"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b9c899f4f9e0225b7b5d200950e1ed5a1f49822f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 17:32:21 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 17:32:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9c899f4

kde5-functions.eclass: Fix FRAMEWORKS_MINIMAL for Plasma 5.12 branch

 eclass/kde5-functions.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 19f0a856d8..d531908079 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,8 +37,9 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.12* ]]; then
+		if [[ ${PV} = 5.12* || ${PV} = 5.11.95 ]]; then
 			: ${QT_MINIMAL:=5.9.1}
+			: ${FRAMEWORKS_MINIMAL:=5.42.0}
 		fi
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${QT_MINIMAL:=5.9.1}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     661e1ffe79b209b435ad344e1535d91aa60bb4ba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 20:23:47 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 20:23:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=661e1ffe

kde5.eclass: Add KDE_PO_DIRS

 eclass/kde5.eclass | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 826e0abf10..adce61555e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -95,6 +95,11 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # Specifies the location of the KDE handbook if not the default.
 : ${KDE_DOC_DIR:=doc}
 
+# @ECLASS-VARIABLE: KDE_PO_DIRS
+# @DESCRIPTION:
+# Specifies the possible locations of KDE l10n files if not the default.
+: ${KDE_PO_DIRS:="po poqm"}
+
 # @ECLASS-VARIABLE: KDE_QTHELP
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -523,18 +528,18 @@ kde5_src_prepare() {
 
 	# drop translations when nls is not wanted
 	if in_iuse nls && ! use nls ; then
-		if [[ -d po ]] ; then
-			rm -r po || die
-		fi
-		if [[ -d poqm ]] ; then
-			rm -r poqm || die
-		fi
+		local po
+		for po in ${KDE_PO_DIRS}; do
+			if [[ -d ${po} ]] ; then
+				rm -r ${po} || die
+			fi
+		done
 	fi
 
 	# enable only the requested translations when required
 	if [[ -v LINGUAS ]] ; then
 		local po
-		for po in po poqm; do
+		for po in ${KDE_PO_DIRS}; do
 		if [[ -d ${po} ]] ; then
 			pushd ${po} > /dev/null || die
 			local lang

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5b994c174e855b38c8c6cef78278ea28b43c81c0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 23:23:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 23:23:17 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b994c17

kde5.eclass: Cleanup obsolete blocker

 eclass/kde5.eclass | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 84346f5a00..346838570a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -204,21 +204,14 @@ case ${KDE_AUTODEPS} in
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
 
-		case ${CATEGORY} in
-			kde-frameworks | \
-			kde-plasma)
-				RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
-				;;
-			kde-apps)
-				[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-				[[ $(get_version_component_range 1) -ge 17 ]] && \
-					RDEPEND+="
-						!kde-apps/kde-l10n
-						!<kde-apps/kde4-l10n-16.12.0:4
-						!kde-apps/kdepim-l10n:5
-					"
-				;;
-		esac
+		if [[ ${CATEGORY} = kde-apps ]]; then
+			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
+			RDEPEND+="
+				!kde-apps/kde-l10n
+				!<kde-apps/kde4-l10n-16.12.0:4
+				!kde-apps/kdepim-l10n:5
+			"
+		fi
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     25f474171f5aa7dcd551985c231ba44bd50a6639
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 17:52:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 17:52:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=25f47417

kde5.eclass: Mark KDE Frameworks 5.42.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 346838570a..75c4da2b67 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( 5.42.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3b75147d6a5bdad37a77d6b76c65509801f32673
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 10:58:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 10:58:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b75147d

kde5.eclass: Drop unused eutils.eclass

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8e6a6a5363..318e102565 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -31,7 +31,7 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
+inherit cmake-utils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ae700e793d5f31db7162dfe1e96bf5fdac426e15
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 10:32:59 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 10:32:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae700e79

kde5.eclass: Mark KDE Applications 17.12.1 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 75c4da2b67..8e6a6a5363 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( 5.42.0 )
+KDE_UNRELEASED=( kde-apps-17.12.1 kde-frameworks-5.42.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     906a92ef2b6a34e0a16bcb91ba0e2a65e4dcbb4e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 12:52:52 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 12:52:52 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=906a92ef

kde5.eclass: Mark KDE Applications 17.12.1 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 318e102565..614a1826dd 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-17.12.1 kde-frameworks-5.42.0 )
+KDE_UNRELEASED=( kde-frameworks-5.42.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cecd5ed13720bc9869488c570f86c6d53cf3bafc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 12:56:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 12:56:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cecd5ed1

kde5.eclass: Mark KDE Frameworks 5.42.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 614a1826dd..dfe0807184 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.42.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9e43bd2c824690215dfb39461ea8279377ed5528
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 15:41:40 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 15:41:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9e43bd2c

kde5.eclass: Mark KDE Plasma 5.12.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index dfe0807184..e3bdde5b40 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.12.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     81fc514336d008bb58da81178c6fae6b422c31f6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 09:26:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 09:26:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=81fc5143

kde5.eclass: Mark KDE Applications 17.12.2 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 21d00b1ddb..1d9ce1e5b3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.12.0 kde-frameworks-5.43.0 )
+KDE_UNRELEASED=( kde-plasma-5.12.0 kde-frameworks-5.43.0 kde-apps-17.12.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ebbe70ec014c0cb88a46f521be2ab6108d518787
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 22:26:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 01:28:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ebbe70ec

kde5.eclass: Mark KDE Frameworks 5.43.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e3bdde5b40..21d00b1ddb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.12.0 )
+KDE_UNRELEASED=( kde-plasma-5.12.0 kde-frameworks-5.43.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a483e1d28f9e6a6675a5317ec05b66f608e92fe0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 17:46:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 17:58:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a483e1d2

kde5.eclass: Mark KDE Plasma 5.12.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1d9ce1e5b3..50b8ebf4e5 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.12.0 kde-frameworks-5.43.0 kde-apps-17.12.2 )
+KDE_UNRELEASED=( kde-frameworks-5.43.0 kde-apps-17.12.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     165a00f1cb9b3a9389053e69e42055cde3d839ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 20:33:57 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 20:34:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=165a00f1

kde5-functions.eclass: Drop obsolete Plasma 5.11.95 min deps

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8b71dfc7c7..cd0151eb29 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,7 +37,7 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.12* || ${PV} = 5.11.95 ]]; then
+		if [[ ${PV} = 5.12* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=5.42.0}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9f786a1627db11a8cf78ad4266f345a29cd8ac9c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 12:22:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 12:22:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f786a16

kde5.eclass: Mark KDE Applications 17.12.2 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 50b8ebf4e5..cd385237ec 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.43.0 kde-apps-17.12.2 )
+KDE_UNRELEASED=( kde-frameworks-5.43.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     aea6e01d29c876c983a7cfc225b0cb457817f022
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 12:34:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 21:59:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aea6e01d

kde5.eclass: Mark KDE Frameworks 5.43.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index cd385237ec..dfe0807184 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.43.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     5bf7eac4ccee5315cd88bc47106dc0b9bab5b8c6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 15:53:08 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 08:47:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5bf7eac4

cmake-utils.eclass: switch Darwin to rpath mode, bug #642668

By Michael Weiser, relying on the other support that enables @rpath
entries, supported in macOS 10.5 and up.

Closes: https://bugs.gentoo.org/642668

 eclass/cmake-utils.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 623c353b46..de58d37add 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -586,12 +586,10 @@ cmake-utils_src_configure() {
 			ELSE ()
 
 			SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
+			SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
 			SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
 			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
-			SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
 			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE)
 
 			ENDIF (NOT APPLE)
 		_EOF_

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     879bbe5cf40fb49b62b0ae69eb2ba79b01e5fad2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 13:41:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 13:42:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=879bbe5c

kde5.eclass: Mark KDE Frameworks 5.44 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index dfe0807184..0cde219e68 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.44.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     59761e3c6be156eb0472fc32961a7437da7cc8a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 22:51:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 22:51:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=59761e3c

kde5.eclass: Mark KDE Applications 17.12.3 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0cde219e68..51fe304f2b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -155,7 +155,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.44.0 )
+KDE_UNRELEASED=( kde-frameworks-5.44.0 kde-apps-17.12.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     abd1214b198cea68416a92d9b6e63417037542dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:28:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 22:10:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=abd1214b

kde5-functions.eclass: versionator -> eapi7-ver

 eclass/kde5-functions.eclass | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index cd0151eb29..63a0d83a75 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -15,10 +15,11 @@
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1
 
-inherit toolchain-funcs versionator
+inherit toolchain-funcs
 
 case ${EAPI} in
-	6) ;;
+	7) ;;
+	6) inherit eapi7-ver ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -185,7 +186,7 @@ add_frameworks_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-frameworks ]]; then
-		version=$(get_version_component_range 1-2)
+		version=$(ver_cut 1-2)
 	elif [[ -z ${3} ]] ; then
 		version=${FRAMEWORKS_MINIMAL}
 	fi
@@ -217,7 +218,7 @@ add_plasma_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
-		version=$(get_version_component_range 1-3)
+		version=$(ver_cut 1-3)
 	elif [[ -z ${3} ]] ; then
 		version=${PLASMA_MINIMAL}
 	fi
@@ -249,7 +250,7 @@ add_kdeapps_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-apps ]]; then
-		version=$(get_version_component_range 1-3)
+		version=$(ver_cut 1-3)
 	elif [[ -z ${3} ]] ; then
 		version=${KDE_APPS_MINIMAL}
 	fi
@@ -302,9 +303,9 @@ add_qt_dep() {
 # If no version is specified, ${PV} is used.
 get_kde_version() {
 	local ver=${1:-${PV}}
-	local major=$(get_major_version ${ver})
-	local minor=$(get_version_component_range 2 ${ver})
-	local micro=$(get_version_component_range 3 ${ver})
+	local major=$(ver_cut 1 ${ver})
+	local minor=$(ver_cut 2 ${ver})
+	local micro=$(ver_cut 3 ${ver})
 	if [[ ${ver} == 9999 ]]; then
 		echo live
 	else

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f3fbceca1d7c6958364606a545b81c4fbeb194ce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 22:27:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 22:27:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3fbceca

cmake-utils.eclass: inherit eutils,multilib only pre-EAPI-7

 eclass/cmake-utils.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index de58d37add..814cc78f8d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -109,8 +109,12 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \
-	multiprocessing versionator xdg-utils
+inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils
+
+case ${EAPI} in
+	7) ;;
+	*) inherit eutils multilib ;;
+esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8cf5b402a053da21a1102e4c1c802d97f7b75c43
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 22:30:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 22:30:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cf5b402

kde5.eclass: eutils was inherited up to EAPI-6, avoid ebuild breakage

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 434ee7ec0a..c493eeb5ee 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -34,7 +34,7 @@ _KDE5_ECLASS=1
 inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg
 
 case ${EAPI} in
-	6) inherit eapi7-ver ;;
+	6) inherit eapi7-ver eutils ;;
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9aba5b04a031ec120d8e42c2accfa4f69a9c36a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:35:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 22:10:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9aba5b04

kde5.eclass: versionator -> eapi7-ver

 eclass/kde5.eclass | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 51fe304f2b..434ee7ec0a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -31,7 +31,11 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
+inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg
+
+case ${EAPI} in
+	6) inherit eapi7-ver ;;
+esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@@ -180,7 +184,7 @@ case ${KDE_SUBSLOT} in
 			kde-frameworks | \
 			kde-plasma | \
 			kde-apps)
-				SLOT+="/$(get_version_component_range 1-2)"
+				SLOT+="/$(ver_cut 1-2)"
 				;;
 			*)
 				SLOT+="/${PV}"
@@ -341,7 +345,7 @@ _calculate_src_uri() {
 		kde-frameworks)
 			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
 		kde-plasma)
-			local plasmapv=$(get_version_component_range 1-3)
+			local plasmapv=$(ver_cut 1-3)
 
 			case ${PV} in
 				5.?.[6-9]? | 5.??.[6-9]? )
@@ -410,11 +414,11 @@ _calculate_live_repo() {
 			fi
 
 			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-				EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
+				EGIT_BRANCH="Applications/$(ver_cut 1-2)"
 			fi
 
 			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-				EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)"
+				EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 			fi
 
 			EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1b4b50113519ca507ce10f069199afe27e191994
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 23:48:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 23:48:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b4b5011

kde5-functions.eclass: Raise PLASMA_MINIMAL to 5.11.5

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 63a0d83a75..de63b7956c 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -67,7 +67,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.10.5}
+: ${PLASMA_MINIMAL:=5.11.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e728d8a7a2d2e623fc6dc99ec5e741790181b234
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 14:41:21 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 14:41:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e728d8a7

kde5.eclass: Mark KDE Applications 17.12.3 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c493eeb5ee..0130939596 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.44.0 kde-apps-17.12.3 )
+KDE_UNRELEASED=( kde-frameworks-5.44.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c80666fcd6197b3fbe942b086d921fae73cb10e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 15:39:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 15:39:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c80666fc

kde5.eclass: Mark KDE Frameworks 5.44 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0130939596..bb4d4f9051 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.44.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     555fcc6bd1c4572edc4477c08be224211767827a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 15:37:23 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 00:18:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=555fcc6b

cmake-utils.eclass: Override CMAKE_INSTALL_{INFO,MAN}DIR

Provide an explicit override for CMAKE_INSTALL_INFODIR
and CMAKE_INSTALL_MANDIR to force Gentoo standards for those locations.
This is needed for Gentoo/FreeBSD where CMake defaults to /usr/info
and /usr/man; while PMS specifies /usr/share/info and /usr/share/man
via econf & do* helpers.

Closes: https://bugs.gentoo.org/649200

 eclass/cmake-utils.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 814cc78f8d..c71ccfd64b 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -606,6 +606,8 @@ cmake-utils_src_configure() {
 		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
+		set (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		set (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     4e3361d04d9a07f9e585ec6c3b2781c0dfd4092b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 00:29:11 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 00:29:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4e3361d0

cmake-utils.eclass: use consistent style for SET

 eclass/cmake-utils.eclass | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index c71ccfd64b..5d89de88ed 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -570,10 +570,10 @@ cmake-utils_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_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-				set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-				set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+				SET (CMAKE_FIND_ROOT_PATH "${SYSROOT}")
+				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
 	fi
@@ -589,11 +589,11 @@ cmake-utils_src_configure() {
 
 			ELSE ()
 
-			SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
-			SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
-			SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
+			SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
+			SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
+			SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
 
 			ENDIF (NOT APPLE)
 		_EOF_
@@ -606,8 +606,8 @@ cmake-utils_src_configure() {
 		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
-		set (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
-		set (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
+		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     1bdd9d8423eb737121e5a2c8c63493fca2e15625
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 00:13:22 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:17:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bdd9d84

cmake-utils.eclass: raise CMAKE_MIN_VERSION to 3.9.6

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 6d5ded8f90..f8853be502 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -58,7 +58,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.7.2}
+: ${CMAKE_MIN_VERSION:=3.9.6}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     460ffd9c15ee42497bf7a802d097915b71479dd8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 09:06:06 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:17:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=460ffd9c

cmake-utils.eclass: Extend ASM rules to ASM-ATT

Some CMake projects use ASM-ATT rather than ASM, so extend our rule
overrides to that.

Closes: https://bugs.gentoo.org/625844

 eclass/cmake-utils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 5d89de88ed..6d5ded8f90 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -520,6 +520,7 @@ cmake-utils_src_configure() {
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
@@ -535,6 +536,7 @@ cmake-utils_src_configure() {
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
 		SET (CMAKE_C_COMPILER "${myCC/ /;}")
 		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
 		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
@@ -615,6 +617,7 @@ cmake-utils_src_configure() {
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
 			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4dcacb4fe07d92b58670637a0feff494f136cd68
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 01:13:30 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 01:17:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4dcacb4f

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL to 5.43.0

 eclass/kde5-functions.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index de63b7956c..46d2c4974a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,10 +38,7 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.12* ]]; then
-			: ${QT_MINIMAL:=5.9.1}
-			: ${FRAMEWORKS_MINIMAL:=5.42.0}
-		fi
+		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=9999}
@@ -62,7 +59,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.40.0}
+: ${FRAMEWORKS_MINIMAL:=5.43.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     63f180e63d83badb265fb9c8586f85f87502ec73
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 18:21:25 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 18:21:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=63f180e6

kde5-functions.eclass: Avoid 5.12 stable branch depend on KF-9999

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 46d2c4974a..69971b4e4c 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,7 +39,7 @@ case ${CATEGORY} in
 		;;
 	kde-plasma)
 		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a3de86fd26775bccf4be5bc75e827453d585d19e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 18:28:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 19:29:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3de86fd

kde5-functions.eclass: FRAMEWORKS_MINIMAL=5.44.0 for >=kde-apps-18.04

 eclass/kde5-functions.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 69971b4e4c..edfe2142cb 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,6 +45,9 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.44.0}
+		fi
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0d701084f7babd5f3c477548c4a71e5cdf697fc4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 18:35:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 18:51:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d701084

kde5-functions.eclass: Fix FRAMEWORKS_MINIMAL for kde-apps-18.03.x

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index edfe2142cb..1dfb1817cb 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,10 +45,10 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.44.0}
 		fi
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 18* ]]; then
 			: ${QT_MINIMAL:=5.9.1}
 		fi
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     f73d21cbe6317ec0baa2858a4ce4ead72dc7b832
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 21:16:34 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 00:09:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f73d21cb

cmake-utils.eclass: Make the new ASM-ATT rules actually work

The previous attempt actually broke ASM in media-libs/vulkan-loader
entirely so that it fell back to C code. After much experimentation
and combing through strace output, I found that -x assembler is needed
to handle non-standard file extentions and linking is done as a
separate step. CMAKE_ASM-ATT_LINK_FLAGS therefore needs to be defined
with -nostdlib to avoid errors about undefined main symbols.

Bug: https://bugs.gentoo.org/625844

 eclass/cmake-utils.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index f8853be502..f6952ec09e 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -520,7 +520,8 @@ cmake-utils_src_configure() {
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
+		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     682611ba42bb94df5a2abe7e906d848d81e65956
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 18:31:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 18:06:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=682611ba

kde5-functions.eclass: Raise QT_MINIMAL to 5.9.4

 eclass/kde5-functions.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 1dfb1817cb..ea310f2b3d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,9 +38,7 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
-			: ${QT_MINIMAL:=5.9.1}
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;
@@ -48,16 +46,13 @@ case ${CATEGORY} in
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.44.0}
 		fi
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 18* ]]; then
-			: ${QT_MINIMAL:=5.9.1}
-		fi
 		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.
-: ${QT_MINIMAL:=5.7.1}
+: ${QT_MINIMAL:=5.9.4}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     202f13a096032e2263ed607134485db316c9195e
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Thu Mar 29 02:33:34 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 20:21:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=202f13a0

eclass: misc spelling fixes

 eclass/cmake-utils.eclass | 2 +-
 eclass/kde5.eclass        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index f6952ec09e..3302f27608 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -653,7 +653,7 @@ cmake-utils_src_configure() {
 	fi
 
 	# Common configure parameters (overridable)
-	# NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
+	# NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable
 	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
 	local cmakeargs=(
 		${warn_unused_cli}

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bb4d4f9051..ff6ae46e2d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -19,7 +19,7 @@
 # of this eclass's API.
 #
 # This eclass's phase functions are not intended to be mixed and matched, so if
-# any phase functions are overriden the version here should also be called.
+# any phase functions are overridden the version here should also be called.
 
 if [[ -z ${_KDE5_ECLASS} ]]; then
 _KDE5_ECLASS=1

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5450cd3f6ac7677a13975265c96200b2fb21f050
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 12:00:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 15:45:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5450cd3f

kde5.eclass: Mark KDE Frameworks 5.45 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ff6ae46e2d..c11a8eee49 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.45 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1784546b8e1e1007846bc43067b2069f33e65ad4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 22:09:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 22:09:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1784546b

kde5.eclass: Fix kde-frameworks-5.45.0 mark as unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c11a8eee49..e28213b656 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.45 )
+KDE_UNRELEASED=( kde-frameworks-5.45.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3e67377d1c8643fbd677aa4dce0d688b8a4ca2b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  8 14:49:00 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 14:49:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e67377d

kde5.eclass: Drop obsolete kde-apps-17.08 conditionals

 eclass/kde5.eclass | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e28213b656..da5b785f6e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -231,9 +231,6 @@ case ${KDE_DESIGNERPLUGIN} in
 	*)
 		IUSE+=" designer"
 		DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
-		[[ ${PV} = 17.08* ]] && \
-			DEPEND+=" designer? ( $(add_qt_dep designer) )"
-		;;
 esac
 
 case ${KDE_EXAMPLES} in
@@ -637,11 +634,7 @@ kde5_src_configure() {
 	fi
 
 	if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		if [[ ${PV} = 17.08* ]]; then
-			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
-		else
-			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
-		fi
+		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
 	fi
 
 	if [[ ${KDE_QTHELP} != false ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     222b6f1ca358a809de9c95f07f7ab65a080b7671
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 08:31:27 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 08:31:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=222b6f1c

kde5.eclass: Mark KDE Applications 18.04.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index da5b785f6e..475eb3ca38 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.45.0 )
+KDE_UNRELEASED=( kde-frameworks-5.45.0 kde-apps-18.04.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     85c2f9d2e80466db4cf0143a4abf97d3025feba4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 10:57:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 10:57:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=85c2f9d2

kde5.eclass: Mark KDE Frameworks 5.45.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 475eb3ca38..f72baab44c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.45.0 kde-apps-18.04.0 )
+KDE_UNRELEASED=( kde-apps-18.04.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c4528ed574f95ccb251f0ddbd7dc2991d28c5f1a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 10:58:52 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 10:58:52 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c4528ed5

kde5.eclass: Mark KDE Applications 18.04.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f72baab44c..b1a8b064b9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-18.04.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b26da74425ea5b8163d072952ca3c64e58cc0746
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 15:04:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 15:04:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b26da744

kde5-functions.eclass: Drop kde-apps-18.03.x compat after removal

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index fd0ead79c2..e5ec092411 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -44,7 +44,7 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18* ]]; then
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.44.0}
 		fi
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1a0a9c1107bb12ec33987093e44aef4952f91716
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 12:54:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 12:54:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a0a9c11

kde5-functions.eclass: Raise QT_MINIMAL to 5.10.1 for kde-plasma live

Upstream commit 84d17532b029be587eb9361702eac394b0748cae
See also: https://mail.kde.org/pipermail/release-team/2018-February/010843.html

 eclass/kde5-functions.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ea310f2b3d..fd0ead79c2 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -40,6 +40,7 @@ case ${CATEGORY} in
 	kde-plasma)
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
+			: ${QT_MINIMAL:=5.10.1}
 		fi
 		;;
 	kde-apps)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     817fb6ed3fcbe8c36734f32985d32cdf67cbf0d0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 20:44:16 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 20:44:16 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=817fb6ed

kde5-functions.eclass: Fix add_qt_dep for QT_MINIMAL >=5.10

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index e5ec092411..7cafd8c0ff 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -277,7 +277,7 @@ add_qt_dep() {
 	local slot=${4}
 
 	if [[ -z ${version} ]]; then
-		if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then
+		if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then
 			version=5.9.1 # no more upstream release, need bug #624404
 		else
 			version=${QT_MINIMAL}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6a0ea6c709877bd7b2f19513f5eb492843454574
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May  5 21:15:56 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May  5 21:41:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a0ea6c7

kde5.eclass: Mark KDE Frameworks 5.46 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b1a8b064b9..3efcda93ac 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.46.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bedf66f7582ee88664c3239bac22a0c4f963cff2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 17:38:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  8 17:38:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bedf66f7

kde5.eclass: Mark KDE Applications 18.04.1 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3efcda93ac..9813e4b4f9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.46.0 )
+KDE_UNRELEASED=( kde-frameworks-5.46.0 kde-apps-18.04.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     865cec1715b9bedcd452da3a73e1e0f767a9f23c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 12:39:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 12:39:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=865cec17

kde5.eclass: Mark KDE Applications 18.04.1 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9813e4b4f9..3efcda93ac 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.46.0 kde-apps-18.04.1 )
+KDE_UNRELEASED=( kde-frameworks-5.46.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b5e20d3aa8c19707e7384a3dd5626ec633c116e1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 12 12:23:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 12 12:23:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5e20d3a

kde5.eclass: Mark KDE Frameworks 5.46 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3efcda93ac..b1a8b064b9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.46.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7ca2c8cc2fe7f6d269d8aa699860b947f8e0b8c0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 21:24:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 13 21:27:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ca2c8cc

kde5-functions.eclass: Raise KDE_APPS_MINIMAL to 17.12.3

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7cafd8c0ff..d66f0babde 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -68,7 +68,7 @@ esac
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=14.12.0}
+: ${KDE_APPS_MINIMAL:=17.12.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1720b64eb22950db744a0bfe2e8726457d7b3819
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 20:42:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 13 22:47:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1720b64e

cmake-utils.eclass: Switch to eapi7-ver

 eclass/cmake-utils.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 3302f27608..cbce280625 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -109,11 +109,11 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils
+inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
 	7) ;;
-	*) inherit eutils multilib ;;
+	*) inherit eapi7-ver eutils multilib ;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
@@ -512,7 +512,7 @@ cmake-utils_src_configure() {
 	# we need to add "<INCLUDES>"
 	local includes=
 	if [[ ${PN} == cmake ]] ; then
-		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
+		if $(version_is_at_least 3.4.0 $(ver_cut 1-3 ${PV})) ; then
 			includes="<INCLUDES>"
 		fi
 	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b77e44c72f28f474e6206eeabe56470343d342f5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 10:07:25 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 18 13:52:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b77e44c7

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL for kde-apps 9999/18.04

5.46.0 will be the next stable Frameworks version.

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 01b4cf8d5b..8df91bf362 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -49,7 +49,7 @@ case ${CATEGORY} in
 		;;
 	kde-apps)
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.44.0}
+			: ${FRAMEWORKS_MINIMAL:=5.46.0}
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5e30b2d437af43aa05b40f46fd84f632aac99845
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 09:29:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 18 13:52:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e30b2d4

kde5-functions.eclass: Add minimum deps for Plasma 5.13

 eclass/kde5-functions.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d66f0babde..01b4cf8d5b 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,6 +38,10 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
+		if [[ ${PV} = 5.13* || ${PV} = 5.12.90 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.46.0}
+			: ${QT_MINIMAL:=5.10.1}
+		fi
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 			: ${QT_MINIMAL:=5.10.1}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     06009685e315e4c2656336d064e0af305996c123
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 23:06:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 18 23:06:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=06009685

cmake-utils.eclass: version_is_at_least -> ver_test

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index cbce280625..558ff3a1ef 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -512,7 +512,7 @@ cmake-utils_src_configure() {
 	# we need to add "<INCLUDES>"
 	local includes=
 	if [[ ${PN} == cmake ]] ; then
-		if $(version_is_at_least 3.4.0 $(ver_cut 1-3 ${PV})) ; then
+		if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then
 			includes="<INCLUDES>"
 		fi
 	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     a8d5b1da360ab6e7a09bceda8a34d37e2182b963
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 09:37:56 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 26 09:38:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8d5b1da

cmake-utils.eclass: port has_version usage handle EAPI=7

 eclass/cmake-utils.eclass | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 558ff3a1ef..1df60398e8 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -226,9 +226,18 @@ _cmake_generator_to_use() {
 		ninja)
 			# 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 ! ROOT=/ has_version dev-util/ninja; then
-				die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-			fi
+			case ${EAPI} in
+				5|6)
+					if ! ROOT=/ has_version dev-util/ninja; then
+						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+					fi
+				;;
+				*)
+					if ! has_version -b dev-util/ninja; then
+						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+					fi
+				;;
+			esac
 			generator_name="Ninja"
 			;;
 		emake)
@@ -511,11 +520,23 @@ cmake-utils_src_configure() {
 	# Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus
 	# we need to add "<INCLUDES>"
 	local includes=
+
+	local has_cmake_340=
+	case ${EAPI} in
+		5|6)
+			has_cmake_34=$(ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1)
+		;;
+		*)
+			has_cmake_34=$(has_version -b \>=dev-util/cmake-3.4.0_rc1)
+		;;
+	esac
+
+
 	if [[ ${PN} == cmake ]] ; then
 		if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then
 			includes="<INCLUDES>"
 		fi
-	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
+	elif [[ ${has_cmake_340} ]]; then
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     16a1fe34aa0e4be7b9b55b523685e1de12a20ed1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 09:39:33 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 26 09:39:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=16a1fe34

cmake-utils.eclass: enable EAPI=7

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 1df60398e8..3d571fef08 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -9,7 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.
@@ -105,7 +105,7 @@ _CMAKE_UTILS_ECLASS=1
 
 case ${EAPI} in
 	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
+	6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     14231bc3a1f4f4db038ae7c1b40ab2afbf0410b5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 09:48:41 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 26 09:59:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14231bc3

kde5-functions.eclass: update SUPPORTED_EAPIS to match code

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8df91bf362..eb4cf7a0e4 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
 # This eclass contains functions shared by the other KDE eclasses and forms

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     50317d0a65f26eae6d5c56b5fa034fdcb42bdd74
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 09:55:39 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 26 09:59:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=50317d0a

kde5.eclass: add todo for when EAPI <7 support is dropped

 eclass/kde5.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b1a8b064b9..16468590aa 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -706,12 +706,14 @@ kde5_src_install() {
 	# cmake can't find the tags and qthelp viewers can't find the docs
 	local p=$(best_version dev-qt/qtcore:5)
 	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
+	#todo: clean up trailing space check when EAPI <7 is removed
 	if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
 		docompress -x /usr/share/doc/qt-${pv}
 	fi
 
 	# We don't want /usr/share/doc/HTML to be compressed,
 	# because then khelpcenter can't find the docs
+	#todo: clean up trailing space check when EAPI <7 is removed
 	if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
 		docompress -x /usr/share/doc/HTML
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     b0a9a1202bbd68857aeffcfb7b1715962a39cc7c
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun May 27 08:17:52 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 27 08:44:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0a9a120

cmake-utils.eclass: Drop remaining support for <dev-util/cmake-3.4.0_rc1.

Default value of CMAKE_MIN_VERSION is already set to "3.9.6".

 eclass/cmake-utils.eclass | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index a9bafef264..07d89d7f90 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -517,35 +517,14 @@ cmake-utils_src_configure() {
 
 	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
 	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
-	# Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus
-	# we need to add "<INCLUDES>"
-	local includes=
-
-	local has_cmake_3_4_0=false
-	case ${EAPI} in
-		5|6)
-			ROOT=/ has_version ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true
-			;;
-		*)
-			has_version -b ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true
-			;;
-	esac
 
-
-	if [[ ${PN} == cmake ]] ; then
-		if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then
-			includes="<INCLUDES>"
-		fi
-	elif ${has_cmake_3_4_0}; then
-		includes="<INCLUDES>"
-	fi
 	cat > "${build_rules}" <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
+		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
 		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
+		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
+		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
+		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
 	_EOF_
 
 	local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC)

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     b6c48cc0aae681ff9b5e9e67398002408dbc3fe5
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun May 27 08:16:41 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 27 08:44:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6c48cc0

cmake-utils.eclass: Fix usage of has_version.

has_version has no output, and its result is provided by exit status.

Fixes: a8d5b1da360ab6e7a09bceda8a34d37e2182b963

 eclass/cmake-utils.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 3d571fef08..a9bafef264 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -521,14 +521,14 @@ cmake-utils_src_configure() {
 	# we need to add "<INCLUDES>"
 	local includes=
 
-	local has_cmake_340=
+	local has_cmake_3_4_0=false
 	case ${EAPI} in
 		5|6)
-			has_cmake_34=$(ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1)
-		;;
+			ROOT=/ has_version ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true
+			;;
 		*)
-			has_cmake_34=$(has_version -b \>=dev-util/cmake-3.4.0_rc1)
-		;;
+			has_version -b ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true
+			;;
 	esac
 
 
@@ -536,7 +536,7 @@ cmake-utils_src_configure() {
 		if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then
 			includes="<INCLUDES>"
 		fi
-	elif [[ ${has_cmake_340} ]]; then
+	elif ${has_cmake_3_4_0}; then
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1206f1c8271241c4e73261f79554c1c84deab19f
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Jun  2 14:56:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 15:19:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1206f1c8

cmake-utils.eclass: Stop inheriting eapi7-ver.eclass.

eapi7-ver.eclass is not used since commit b0a9a1202bbd68857aeffcfb7b1715962a39cc7c.

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 07d89d7f90..4dc7c4456f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -113,7 +113,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
 	7) ;;
-	*) inherit eapi7-ver eutils multilib ;;
+	*) inherit eutils multilib ;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     11ddbefe34d0cdbda28e58c67eec255eb20b8094
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 19:05:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 15:24:03 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=11ddbefe

cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7

Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7.
We do not need add it retroactively to avoid breaking something
accidentally.

 eclass/cmake-utils.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 4dc7c4456f..6541f2af0f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -614,6 +614,12 @@ cmake-utils_src_configure() {
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
+	if [[ ${EAPI} != [56] ]]; then
+		cat >> "${common_config}" <<- _EOF_ || die
+			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
+		_EOF_
+	fi
+
 	# Wipe the default optimization flags out of CMake
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
 		cat >> ${common_config} <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     916acc5f76dbdbf4ab025e05d8477e033a6cac8b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 19:59:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 19:59:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=916acc5f

kde5.eclass: Mark KDE Frameworks 5.47 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 16468590aa..b2f023dc80 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.47.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c4072414e01265f5bcc49fa792530b21fa4eba4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  5 14:55:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  5 14:55:09 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c4072414

kde5.eclass: Mark KDE Applications 18.04.2 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b2f023dc80..44000dac35 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.47.0 )
+KDE_UNRELEASED=( kde-frameworks-5.47.0 kde-apps-18.04.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d964c44a114e14cb56ce7e609cb6dcfa3750f77b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 16:25:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 16:25:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d964c44a

kde5.eclass: Mark KDE Applications 18.04.2 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 44000dac35..b2f023dc80 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.47.0 kde-apps-18.04.2 )
+KDE_UNRELEASED=( kde-frameworks-5.47.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9f0c3db54ffbcd0b562dafb7da987981d3610507
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 16:36:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 16:36:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f0c3db5

kde5.eclass: Mark KDE Plasma 5.13.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b2f023dc80..2c4ba28bc7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.47.0 )
+KDE_UNRELEASED=( kde-frameworks-5.47.0 kde-plasma-5.13.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     968e0af2f26b5a13b4e06d0056b2068395539ad0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  9 15:29:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 15:29:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=968e0af2

kde5.eclass: Mark KDE Frameworks 5.47.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2c4ba28bc7..f984ce95e6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.47.0 kde-plasma-5.13.0 )
+KDE_UNRELEASED=( kde-plasma-5.13.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     251c1c036407953a719149c40d958f269e8937e5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 14:42:00 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 14:42:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=251c1c03

virtualx.eclass: Drop prefix access w/o define

 eclass/virtualx.eclass | 260 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 260 insertions(+)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
new file mode 100644
index 0000000000..749c051bf1
--- /dev/null
+++ b/eclass/virtualx.eclass
@@ -0,0 +1,260 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: virtualx.eclass
+# @MAINTAINER:
+# x11@gentoo.org
+# @AUTHOR:
+# Original author: Martin Schlemmer <azarah@gentoo.org>
+# @BLURB: This eclass can be used for packages that needs a working X environment to build.
+
+if [[ ! ${_VIRTUAL_X} ]]; then
+
+case "${EAPI:-0}" in
+	0|1|2|3)
+		die "virtualx.eclass: EAPI ${EAPI} is too old."
+		;;
+	4|5|6)
+		;;
+	*)
+		die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
+		;;
+esac
+
+[[ ${EAPI} == [45] ]] && inherit eutils
+
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# Variable specifying the dependency on xorg-server and xhost.
+# Possible special values are "always" and "manual", which specify
+# the dependency to be set unconditionaly or not at all.
+# Any other value is taken as useflag desired to be in control of
+# the dependency (eg. VIRTUALX_REQUIRED="kde" will add the dependency
+# into "kde? ( )" and add kde into IUSE.
+: ${VIRTUALX_REQUIRED:=test}
+
+# @ECLASS-VARIABLE: VIRTUALX_DEPEND
+# @DESCRIPTION:
+# Dep string available for use outside of eclass, in case a more
+# complicated dep is needed.
+# You can specify the variable BEFORE inherit to add more dependencies.
+VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
+	x11-apps/xhost
+	x11-base/xorg-server[xvfb]
+"
+
+# @ECLASS-VARIABLE: VIRTUALX_COMMAND
+# @DESCRIPTION:
+# Command (or eclass function call) to be run in the X11 environment
+# (within virtualmake function).
+: ${VIRTUALX_COMMAND:="emake"}
+
+case ${VIRTUALX_REQUIRED} in
+	manual)
+		;;
+	always)
+		DEPEND="${VIRTUALX_DEPEND}"
+		RDEPEND=""
+		;;
+	optional|tests)
+		[[ ${EAPI} == [45] ]] \
+			|| die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5'
+		# deprecated section YAY.
+		eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
+		eqawarn "You can drop the variable definition completely from ebuild,"
+		eqawarn "because it is default behaviour."
+
+		if [[ -n ${VIRTUALX_USE} ]]; then
+			# so they like to specify the useflag
+			eqawarn "VIRTUALX_USE variable is deprecated."
+			eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
+			eqawarn "to achieve the same behaviour."
+		fi
+
+		[[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
+		DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
+		RDEPEND=""
+		IUSE="${VIRTUALX_USE}"
+		;;
+	*)
+		DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
+		RDEPEND=""
+		IUSE="${VIRTUALX_REQUIRED}"
+		;;
+esac
+
+# @FUNCTION: virtualmake
+# @DESCRIPTION:
+# Function which start new Xvfb session
+# where the VIRTUALX_COMMAND variable content gets executed.
+virtualmake() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${EAPI} == [45] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx"
+
+	# backcompat for maketype
+	if [[ -n ${maketype} ]]; then
+		[[ ${EAPI} == [45] ]] || die "maketype is banned in EAPI > 5"
+		eqawarn "ebuild is exporting \$maketype=${maketype}"
+		eqawarn "Ebuild should be migrated to use 'virtx command' instead."
+		VIRTUALX_COMMAND=${maketype}
+	fi
+
+	virtx "${VIRTUALX_COMMAND}" "${@}"
+}
+
+
+# @FUNCTION: virtx
+# @USAGE: <command> [command arguments]
+# @DESCRIPTION:
+# Start new Xvfb session and run commands in it.
+#
+# IMPORTANT: The command is run nonfatal !!!
+#
+# This means we are checking for the return code and raise an exception if it
+# isn't 0. So you need to make sure that all commands return a proper
+# code and not just die. All eclass function used should support nonfatal
+# calls properly.
+#
+# The rational behind this is the tear down of the started Xfvb session. A
+# straight die would leave a running session behind.
+#
+# Example:
+#
+# @CODE
+# src_test() {
+# 	virtx default
+# }
+# @CODE
+#
+# @CODE
+# python_test() {
+# 	virtx py.test --verbose
+# }
+# @CODE
+#
+# @CODE
+# my_test() {
+#   some_command
+#   return $?
+# }
+#
+# src_test() {
+#   virtx my_test
+# }
+# @CODE
+virtx() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+
+	local i=0
+	local retval=0
+	local OLD_SANDBOX_ON="${SANDBOX_ON}"
+	local XVFB XHOST XDISPLAY
+	local xvfbargs="-screen 0 1280x1024x24 +extension RANDR"
+	XVFB=$(type -p Xvfb) || die
+	XHOST=$(type -p xhost) || die
+
+	debug-print "${FUNCNAME}: running Xvfb hack"
+	export XAUTHORITY=
+	# The following is derived from Mandrake's hack to allow
+	# compiling without the X display
+
+	einfo "Scanning for an open DISPLAY to start Xvfb ..."
+	# If we are in a chrooted environment, and there is already a
+	# X server started outside of the chroot, Xvfb will fail to start
+	# on the same display (most cases this is :0 ), so make sure
+	# Xvfb is started, else bump the display number
+	#
+	# Azarah - 5 May 2002
+	XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
+	debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}"
+
+	# We really do not want SANDBOX enabled here
+	export SANDBOX_ON="0"
+
+	debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
+	${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
+	sleep 2
+
+	local start=${XDISPLAY}
+	while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
+		# Stop trying after 15 tries
+		if ((XDISPLAY - start > 15)) ; then
+			eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:"
+			echo
+			${XVFB} :${XDISPLAY} ${xvfbargs}
+			echo
+			eerror "If possible, correct the above error and try your emerge again."
+			die "Unable to start Xvfb"
+		fi
+			((XDISPLAY++))
+		debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
+		${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
+		sleep 2
+	done
+
+	# Now enable SANDBOX again if needed.
+	export SANDBOX_ON="${OLD_SANDBOX_ON}"
+
+	einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
+
+	export DISPLAY=:${XDISPLAY}
+	# Do not break on error, but setup $retval, as we need
+	# to kill Xvfb
+	debug-print "${FUNCNAME}: $@"
+	nonfatal "$@"
+	retval=$?
+
+	# Now kill Xvfb
+	kill $(cat /tmp/.X${XDISPLAY}-lock)
+
+	# die if our command failed
+	[[ ${retval} -ne 0 ]] && die "Failed to run '$@'"
+
+	return 0 # always return 0, it can be altered by failed kill for Xvfb
+}
+
+# @FUNCTION: Xmake
+# @DESCRIPTION:
+# Same as "make", but set up the Xvfb hack if needed.
+# Deprecated call.
+Xmake() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${EAPI} == [45] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'"
+
+	eqawarn "you should not execute make directly"
+	eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
+	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
+}
+
+# @FUNCTION: Xemake
+# @DESCRIPTION:
+# Same as "emake", but set up the Xvfb hack if needed.
+Xemake() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${EAPI} == [45] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'"
+
+	VIRTUALX_COMMAND="emake" virtualmake "$@"
+}
+
+# @FUNCTION: Xeconf
+# @DESCRIPTION:
+# Same as "econf", but set up the Xvfb hack if needed.
+Xeconf() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${EAPI} == [45] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'"
+
+	VIRTUALX_COMMAND="econf" virtualmake "$@"
+}
+
+_VIRTUAL_X=1
+fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     60c2870d5851ba3f67724969760cb5b032d20c61
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 20:46:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 20:46:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=60c2870d

kde5-functions.eclass: Sync *_MINIMAL defs with tree

 eclass/kde5-functions.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index eb4cf7a0e4..8f8406bdf1 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,7 +39,6 @@ case ${CATEGORY} in
 		;;
 	kde-plasma)
 		if [[ ${PV} = 5.13* || ${PV} = 5.12.90 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.46.0}
 			: ${QT_MINIMAL:=5.10.1}
 		fi
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
@@ -47,11 +46,6 @@ case ${CATEGORY} in
 			: ${QT_MINIMAL:=5.10.1}
 		fi
 		;;
-	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.46.0}
-		fi
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
@@ -62,12 +56,12 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.43.0}
+: ${FRAMEWORKS_MINIMAL:=5.46.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.11.5}
+: ${PLASMA_MINIMAL:=5.12.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e5c955d150694be0a1fe2a2fc2e9c3716d18d685
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 13:55:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 14:07:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5c955d1

cmake-utils.eclass: Use BDEPEND

 eclass/cmake-utils.eclass | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 6541f2af0f..db6d0f7047 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -123,10 +123,10 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
-		DEPEND="sys-devel/make"
+		BDEPEND="sys-devel/make"
 		;;
 	ninja)
-		DEPEND="dev-util/ninja"
+		BDEPEND="dev-util/ninja"
 		;;
 	*)
 		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@@ -135,9 +135,14 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	DEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
+	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
 fi
 
+case ${EAPI} in
+	7) ;;
+	*) DEPEND=" ${BDEPEND}" ;;
+esac
+
 # Internal functions used by cmake-utils_use_*
 _cmake_use_me_now() {
 	debug-print-function ${FUNCNAME} "$@"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     89e86ab5a01e08fd689416119723aabaa9d063b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 09:49:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 14:07:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=89e86ab5

kde5.eclass: Use BDEPEND

 eclass/kde5.eclass | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 586aad4b04..0462b1caab 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -199,7 +199,7 @@ esac
 case ${KDE_AUTODEPS} in
 	false)	;;
 	*)
-		DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
+		BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
 		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
@@ -230,7 +230,7 @@ case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
 		IUSE+=" designer"
-		DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
+		BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
 esac
 
 case ${KDE_EXAMPLES} in
@@ -244,7 +244,7 @@ case ${KDE_HANDBOOK} in
 	false)	;;
 	*)
 		IUSE+=" +handbook"
-		DEPEND+=" handbook? ( $(add_frameworks_dep kdoctools) )"
+		BDEPEND+=" handbook? ( $(add_frameworks_dep kdoctools) )"
 		;;
 esac
 
@@ -253,7 +253,7 @@ case ${KDE_QTHELP} in
 	*)
 		IUSE+=" doc"
 		COMMONDEPEND+=" doc? ( $(add_qt_dep qt-docs) )"
-		DEPEND+=" doc? (
+		BDEPEND+=" doc? (
 			$(add_qt_dep qthelp)
 			>=app-doc/doxygen-1.8.13-r1
 		)"
@@ -276,6 +276,10 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
+case ${EAPI} in
+	6) DEPEND+=" ${BDEPEND}" ;;
+esac
+
 DEPEND+=" ${COMMONDEPEND} dev-util/desktop-file-utils"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dd11325ae36aaa40e7c2bf96c4de6f22fa3f13a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 09:27:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 14:07:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd11325a

kde5.eclass: Use eqawarn for KDE_TEST=forceoptional-recursive

 eclass/kde5.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f984ce95e6..586aad4b04 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -592,10 +592,10 @@ kde5_src_prepare() {
 				diff -Naur ${f}.old ${f} 1>>${pf}
 				rm ${f}.old || die "Failed to clean up"
 			done
-			einfo "Build system was modified by KDE_TEST=forceoptional-recursive."
-			einfo "Unified diff file ready for pickup in:"
-			einfo "  ${pf}"
-			einfo "Push it upstream to make this message go away."
+			eqawarn "Build system was modified by KDE_TEST=forceoptional-recursive."
+			eqawarn "Unified diff file ready for pickup in:"
+			eqawarn "  ${pf}"
+			eqawarn "Push it upstream to make this message go away."
 		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
 			cmake_comment_add_subdirectory autotests test tests
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     56f39030b818a84b77693180f2e3653b2b13db50
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 14:40:46 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 14:40:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=56f39030

kde5.eclass: Mark KDE Plasma 5.13.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0462b1caab..6aa25e69b2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.13.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     83647a51bd254fc98d1ee5add3d9b9ec01f11f37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 15:21:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 15:21:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=83647a51

kde5-functions: Drop obsolete 5.12.90 conditional

 eclass/kde5-functions.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8f8406bdf1..348406ce1a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,10 +38,8 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.13* || ${PV} = 5.12.90 ]]; then
-			: ${QT_MINIMAL:=5.10.1}
-		fi
-		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
+		[[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.10.1}
+		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 			: ${QT_MINIMAL:=5.10.1}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     89d3c51c59a04401408ec6eb597ead8879d0fefa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 20:01:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 20:01:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=89d3c51c

cmake-utils.eclass: EAPI future-proof inherit-stop

 eclass/cmake-utils.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index db6d0f7047..4ac0951d46 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -112,8 +112,7 @@ esac
 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
-	7) ;;
-	*) inherit eutils multilib ;;
+	5|6) inherit eutils multilib ;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     58787fc6fa717c89deb23e538a8e6344559b0821
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 19:58:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 19:58:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58787fc6

kde5.eclass: Drop use_if_iuse (implicit use of eutils.eclass)

 eclass/kde5.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6aa25e69b2..7f27ac6925 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -510,12 +510,12 @@ kde5_src_prepare() {
 	cmake-utils_src_prepare
 
 	# only build examples when required
-	if ! use_if_iuse examples || ! use examples ; then
+	if ! (in_iuse examples && use examples) ; then
 		cmake_comment_add_subdirectory examples
 	fi
 
 	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
+	if in_iuse handbook && ! use handbook ; then
 		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
 
 		if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
@@ -575,7 +575,7 @@ kde5_src_prepare() {
 	fi
 
 	# only build unit tests when required
-	if ! use_if_iuse test ; then
+	if ! (in_iuse test && use test) ; then
 		if [[ ${KDE_TEST} = forceoptional ]] ; then
 			punt_bogus_dep Qt5 Test
 			# if forceoptional, also cover non-kde categories
@@ -619,7 +619,7 @@ kde5_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# we rely on cmake-utils.eclass to append -DNDEBUG too
-	if ! use_if_iuse debug; then
+	if in_iuse debug && ! use debug; then
 		append-cppflags -DQT_NO_DEBUG
 	fi
 
@@ -633,11 +633,11 @@ kde5_src_configure() {
 		fi
 	fi
 
-	if ! use_if_iuse handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then
+	if in_iuse handbook && ! use handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON )
 	fi
 
-	if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
+	if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b1d7905936336ce6dc68e49107b43f2d426ce208
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 11:06:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 11:06:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1d79059

kde5-functions.eclass: Raise QT_MINIMAL

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 348406ce1a..f9b315a28c 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,10 +38,10 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.10.1}
+		[[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.11.1}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.10.1}
+			: ${QT_MINIMAL:=5.11.1}
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b6344f9567dcd8a491165a5557f187c9c488f7cf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 19:28:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 19:28:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6344f95

kde5.eclass: No subshells

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7f27ac6925..6168c600c7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -510,7 +510,7 @@ kde5_src_prepare() {
 	cmake-utils_src_prepare
 
 	# only build examples when required
-	if ! (in_iuse examples && use examples) ; then
+	if ! { in_iuse examples && use examples; } ; then
 		cmake_comment_add_subdirectory examples
 	fi
 
@@ -575,7 +575,7 @@ kde5_src_prepare() {
 	fi
 
 	# only build unit tests when required
-	if ! (in_iuse test && use test) ; then
+	if ! { in_iuse test && use test; } ; then
 		if [[ ${KDE_TEST} = forceoptional ]] ; then
 			punt_bogus_dep Qt5 Test
 			# if forceoptional, also cover non-kde categories

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5e8c35d02851828333203cc7d4877ca6ad9d8e57
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 22:13:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 22:13:01 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e8c35d0

kde5.eclass: Mark KDE Frameworks 5.48.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6168c600c7..5aeadc5e44 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.48.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a82b9314175edd5caab414460c27502e84c92fc6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 08:14:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 08:14:09 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a82b9314

kde5.eclass: Mark KDE Applications 18.04.3 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5aeadc5e44..23fa95704c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,7 +159,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.48.0 )
+KDE_UNRELEASED=( kde-frameworks-5.48.0 kde-apps-18.04.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     14086fdb73293887bbbaae89e1f8e93fbc7b1bcd
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 08:21:40 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 08:21:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14086fdb

kde*.eclass: Drop var KDE_SCM

No consumers and provided only git as option, which won't change anytime
soon.

 eclass/kde5-functions.eclass | 11 -------
 eclass/kde5.eclass           | 68 +++++++++++++++++++-------------------------
 2 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f9b315a28c..ba16df3b66 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -83,17 +83,6 @@ fi
 
 debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
 
-# @ECLASS-VARIABLE: KDE_SCM
-# @DESCRIPTION:
-# SCM to use if KDE_BUILD_TYPE is determined to be "live".
-# Currently, only git is supported.
-: ${KDE_SCM:=git}
-
-case ${KDE_SCM} in
-	git) ;;
-	*) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
-esac
-
 # @FUNCTION: _check_gcc_version
 # @INTERNAL
 # @DESCRIPTION:

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 23fa95704c..780789ec14 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -38,9 +38,7 @@ case ${EAPI} in
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
-	case ${KDE_SCM} in
-		git) inherit git-r3 ;;
-	esac
+	inherit git-r3
 fi
 
 if [[ -v KDE_GCC_MINIMAL ]]; then
@@ -391,40 +389,36 @@ _calculate_live_repo() {
 
 	SRC_URI=""
 
-	case ${KDE_SCM} in
-		git)
-			# @ECLASS-VARIABLE: EGIT_MIRROR
-			# @DESCRIPTION:
-			# This variable allows easy overriding of default kde mirror service
-			# (anongit) with anything else you might want to use.
-			EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
-
-			local _kmname
-
-			# @ECLASS-VARIABLE: EGIT_REPONAME
-			# @DESCRIPTION:
-			# This variable allows overriding of default repository
-			# name. Specify only if this differ from PN and KMNAME.
-			if [[ -n ${EGIT_REPONAME} ]]; then
-				# the repository and kmname different
-				_kmname=${EGIT_REPONAME}
-			elif [[ -n ${KMNAME} ]]; then
-				_kmname=${KMNAME}
-			else
-				_kmname=${PN}
-			fi
+	# @ECLASS-VARIABLE: EGIT_MIRROR
+	# @DESCRIPTION:
+	# This variable allows easy overriding of default kde mirror service
+	# (anongit) with anything else you might want to use.
+	EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
 
-			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-				EGIT_BRANCH="Applications/$(ver_cut 1-2)"
-			fi
+	local _kmname
 
-			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-				EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
-			fi
+	# @ECLASS-VARIABLE: EGIT_REPONAME
+	# @DESCRIPTION:
+	# This variable allows overriding of default repository
+	# name. Specify only if this differ from PN and KMNAME.
+	if [[ -n ${EGIT_REPONAME} ]]; then
+		# the repository and kmname different
+		_kmname=${EGIT_REPONAME}
+	elif [[ -n ${KMNAME} ]]; then
+		_kmname=${KMNAME}
+	else
+		_kmname=${PN}
+	fi
 
-			EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
-			;;
-	esac
+	if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+		EGIT_BRANCH="Applications/$(ver_cut 1-2)"
+	fi
+
+	if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
+	fi
+
+	EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
 }
 
 case ${KDE_BUILD_TYPE} in
@@ -490,11 +484,7 @@ kde5_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		case ${KDE_SCM} in
-			git)
-				git-r3_src_unpack
-				;;
-		esac
+		git-r3_src_unpack
 	else
 		default
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d2717a8b870bf24888080b59cb19909a6aa5db56
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 17:44:13 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 17:44:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d2717a8b

kde5.eclass: Mark KDE Applications 18.04.3 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 780789ec14..454e3364eb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.48.0 kde-apps-18.04.3 )
+KDE_UNRELEASED=( kde-frameworks-5.48.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     16496a605e81e56500375918a02ca4b8f1c6fedf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 20:01:37 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 20:09:37 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=16496a60

kde5.eclass: Fix KDE_INSTALL_LIBEXECDIR for EAPI-7 ebuilds

Reported-by: GinoM <onigino <AT> protonmail.com>

 eclass/kde5.eclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bc2bba2173..a3c86fee22 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -51,7 +51,8 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # For any other value, assume the package is using KDEInstallDirs macro and switch
-# KDE_INSTALL_USE_QT_SYS_PATHS to ON.
+# KDE_INSTALL_USE_QT_SYS_PATHS to ON. For EAPI-7 and above, fix KDE_INSTALL_LIBEXECDIR
+# to use the correct location.
 : ${ECM_KDEINSTALLDIRS:=true}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
@@ -647,6 +648,12 @@ kde5_src_configure() {
 			# install mkspecs in the same directory as qt stuff
 			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 		)
+		if [[ ${EAPI} != 6 ]] ; then
+			cmakeargs+=(
+				# install to correct libexec location
+				-DKDE_INSTALL_LIBEXECDIR=${EPREFIX}/usr/libexec
+			)
+		fi
 	fi
 
 	# allow the ebuild to override what we set here

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8d6a36a6266dcf43e147b28b813493a8b504b6ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 19:45:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 19:45:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d6a36a6

kde5.eclass: Add ECM_KDEINSTALLDIRS

 eclass/kde5.eclass | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 454e3364eb..bc2bba2173 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -47,6 +47,13 @@ fi
 
 EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
+# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# For any other value, assume the package is using KDEInstallDirs macro and switch
+# KDE_INSTALL_USE_QT_SYS_PATHS to ON.
+: ${ECM_KDEINSTALLDIRS:=true}
+
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -635,8 +642,12 @@ kde5_src_configure() {
 		cmakeargs+=( -DBUILD_QCH=$(usex doc) )
 	fi
 
-	# install mkspecs in the same directory as qt stuff
-	cmakeargs+=(-DKDE_INSTALL_USE_QT_SYS_PATHS=ON)
+	if [[ ${ECM_KDEINSTALLDIRS} != false ]] ; then
+		cmakeargs+=(
+			# install mkspecs in the same directory as qt stuff
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+		)
+	fi
 
 	# allow the ebuild to override what we set here
 	mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}")

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3473adfa0adce6d1fe7127b26dd31a9403d5365c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 11:14:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 11:14:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3473adfa

kde5.eclass: Mark KDE Frameworks 5.48.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a3c86fee22..74a2fd793a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.48.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2b1be46ce6868983ec237ac977aaac6ff614b75e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 23:13:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 23:13:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b1be46c

kde5.eclass: Mark KDE Frameworks 5.49.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 74a2fd793a..8db0e9e052 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.49.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a8c709fa1218ed7f4229b258d8725984eb195a74
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 07:09:44 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 07:09:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8c709fa

virtualx.eclass: Remove outdated copy

 eclass/virtualx.eclass | 260 -------------------------------------------------
 1 file changed, 260 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
deleted file mode 100644
index 749c051bf1..0000000000
--- a/eclass/virtualx.eclass
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: virtualx.eclass
-# @MAINTAINER:
-# x11@gentoo.org
-# @AUTHOR:
-# Original author: Martin Schlemmer <azarah@gentoo.org>
-# @BLURB: This eclass can be used for packages that needs a working X environment to build.
-
-if [[ ! ${_VIRTUAL_X} ]]; then
-
-case "${EAPI:-0}" in
-	0|1|2|3)
-		die "virtualx.eclass: EAPI ${EAPI} is too old."
-		;;
-	4|5|6)
-		;;
-	*)
-		die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
-		;;
-esac
-
-[[ ${EAPI} == [45] ]] && inherit eutils
-
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
-# @DESCRIPTION:
-# Variable specifying the dependency on xorg-server and xhost.
-# Possible special values are "always" and "manual", which specify
-# the dependency to be set unconditionaly or not at all.
-# Any other value is taken as useflag desired to be in control of
-# the dependency (eg. VIRTUALX_REQUIRED="kde" will add the dependency
-# into "kde? ( )" and add kde into IUSE.
-: ${VIRTUALX_REQUIRED:=test}
-
-# @ECLASS-VARIABLE: VIRTUALX_DEPEND
-# @DESCRIPTION:
-# Dep string available for use outside of eclass, in case a more
-# complicated dep is needed.
-# You can specify the variable BEFORE inherit to add more dependencies.
-VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
-	x11-apps/xhost
-	x11-base/xorg-server[xvfb]
-"
-
-# @ECLASS-VARIABLE: VIRTUALX_COMMAND
-# @DESCRIPTION:
-# Command (or eclass function call) to be run in the X11 environment
-# (within virtualmake function).
-: ${VIRTUALX_COMMAND:="emake"}
-
-case ${VIRTUALX_REQUIRED} in
-	manual)
-		;;
-	always)
-		DEPEND="${VIRTUALX_DEPEND}"
-		RDEPEND=""
-		;;
-	optional|tests)
-		[[ ${EAPI} == [45] ]] \
-			|| die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5'
-		# deprecated section YAY.
-		eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
-		eqawarn "You can drop the variable definition completely from ebuild,"
-		eqawarn "because it is default behaviour."
-
-		if [[ -n ${VIRTUALX_USE} ]]; then
-			# so they like to specify the useflag
-			eqawarn "VIRTUALX_USE variable is deprecated."
-			eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
-			eqawarn "to achieve the same behaviour."
-		fi
-
-		[[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
-		DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
-		RDEPEND=""
-		IUSE="${VIRTUALX_USE}"
-		;;
-	*)
-		DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
-		RDEPEND=""
-		IUSE="${VIRTUALX_REQUIRED}"
-		;;
-esac
-
-# @FUNCTION: virtualmake
-# @DESCRIPTION:
-# Function which start new Xvfb session
-# where the VIRTUALX_COMMAND variable content gets executed.
-virtualmake() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx"
-
-	# backcompat for maketype
-	if [[ -n ${maketype} ]]; then
-		[[ ${EAPI} == [45] ]] || die "maketype is banned in EAPI > 5"
-		eqawarn "ebuild is exporting \$maketype=${maketype}"
-		eqawarn "Ebuild should be migrated to use 'virtx command' instead."
-		VIRTUALX_COMMAND=${maketype}
-	fi
-
-	virtx "${VIRTUALX_COMMAND}" "${@}"
-}
-
-
-# @FUNCTION: virtx
-# @USAGE: <command> [command arguments]
-# @DESCRIPTION:
-# Start new Xvfb session and run commands in it.
-#
-# IMPORTANT: The command is run nonfatal !!!
-#
-# This means we are checking for the return code and raise an exception if it
-# isn't 0. So you need to make sure that all commands return a proper
-# code and not just die. All eclass function used should support nonfatal
-# calls properly.
-#
-# The rational behind this is the tear down of the started Xfvb session. A
-# straight die would leave a running session behind.
-#
-# Example:
-#
-# @CODE
-# src_test() {
-# 	virtx default
-# }
-# @CODE
-#
-# @CODE
-# python_test() {
-# 	virtx py.test --verbose
-# }
-# @CODE
-#
-# @CODE
-# my_test() {
-#   some_command
-#   return $?
-# }
-#
-# src_test() {
-#   virtx my_test
-# }
-# @CODE
-virtx() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
-
-	local i=0
-	local retval=0
-	local OLD_SANDBOX_ON="${SANDBOX_ON}"
-	local XVFB XHOST XDISPLAY
-	local xvfbargs="-screen 0 1280x1024x24 +extension RANDR"
-	XVFB=$(type -p Xvfb) || die
-	XHOST=$(type -p xhost) || die
-
-	debug-print "${FUNCNAME}: running Xvfb hack"
-	export XAUTHORITY=
-	# The following is derived from Mandrake's hack to allow
-	# compiling without the X display
-
-	einfo "Scanning for an open DISPLAY to start Xvfb ..."
-	# If we are in a chrooted environment, and there is already a
-	# X server started outside of the chroot, Xvfb will fail to start
-	# on the same display (most cases this is :0 ), so make sure
-	# Xvfb is started, else bump the display number
-	#
-	# Azarah - 5 May 2002
-	XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
-	debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}"
-
-	# We really do not want SANDBOX enabled here
-	export SANDBOX_ON="0"
-
-	debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
-	${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
-	sleep 2
-
-	local start=${XDISPLAY}
-	while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
-		# Stop trying after 15 tries
-		if ((XDISPLAY - start > 15)) ; then
-			eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:"
-			echo
-			${XVFB} :${XDISPLAY} ${xvfbargs}
-			echo
-			eerror "If possible, correct the above error and try your emerge again."
-			die "Unable to start Xvfb"
-		fi
-			((XDISPLAY++))
-		debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
-		${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
-		sleep 2
-	done
-
-	# Now enable SANDBOX again if needed.
-	export SANDBOX_ON="${OLD_SANDBOX_ON}"
-
-	einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
-
-	export DISPLAY=:${XDISPLAY}
-	# Do not break on error, but setup $retval, as we need
-	# to kill Xvfb
-	debug-print "${FUNCNAME}: $@"
-	nonfatal "$@"
-	retval=$?
-
-	# Now kill Xvfb
-	kill $(cat /tmp/.X${XDISPLAY}-lock)
-
-	# die if our command failed
-	[[ ${retval} -ne 0 ]] && die "Failed to run '$@'"
-
-	return 0 # always return 0, it can be altered by failed kill for Xvfb
-}
-
-# @FUNCTION: Xmake
-# @DESCRIPTION:
-# Same as "make", but set up the Xvfb hack if needed.
-# Deprecated call.
-Xmake() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'"
-
-	eqawarn "you should not execute make directly"
-	eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
-	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
-}
-
-# @FUNCTION: Xemake
-# @DESCRIPTION:
-# Same as "emake", but set up the Xvfb hack if needed.
-Xemake() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'"
-
-	VIRTUALX_COMMAND="emake" virtualmake "$@"
-}
-
-# @FUNCTION: Xeconf
-# @DESCRIPTION:
-# Same as "econf", but set up the Xvfb hack if needed.
-Xeconf() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'"
-
-	VIRTUALX_COMMAND="econf" virtualmake "$@"
-}
-
-_VIRTUAL_X=1
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3f90986105140170e802579f60ca1a0a7a33e7ae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 08:40:11 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 12:14:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f909861

kde5.eclass: Mark KDE Applications 18.08.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8db0e9e052..af3f631309 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.49.0 )
+KDE_UNRELEASED=( kde-frameworks-5.49.0 kde-apps-18.08.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     edd54bd7e60ad3f96b4b012e00fd486b88a16660
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 11:43:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 12:14:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=edd54bd7

kde5.eclass: Mark KDE Frameworks 5.49.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index af3f631309..30183e7bc3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.49.0 kde-apps-18.08.0 )
+KDE_UNRELEASED=( kde-apps-18.08.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     17a02fea1eb46e73c5ae82e57d6858a9a08c9ccc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 14:23:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 14:23:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=17a02fea

kde5-functions.eclass: Add >=kde-apps-18.08 FRAMEWORKS_MINIMAL=5.49.0

 eclass/kde5-functions.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ba16df3b66..118011b524 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -44,6 +44,11 @@ case ${CATEGORY} in
 			: ${QT_MINIMAL:=5.11.1}
 		fi
 		;;
+	kde-apps)
+		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.08* ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.49.0}
+		fi
+		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2c8fc8e43bc0c980b026b9c617e731b1b93de80b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 17:13:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 17:15:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2c8fc8e4

kde5.eclass: Drop obsolete blockers after kde-apps-18.04.3 removal

 eclass/kde5.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 30183e7bc3..9532e522f3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -216,11 +216,12 @@ case ${KDE_AUTODEPS} in
 
 		if [[ ${CATEGORY} = kde-apps ]]; then
 			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+="
-				!kde-apps/kde-l10n
-				!<kde-apps/kde4-l10n-16.12.0:4
-				!kde-apps/kdepim-l10n:5
-			"
+			RDEPEND+=" !kde-apps/kde-l10n" # TODO: drop after 18.08.3 removal
+			[[ ${PV} = 18.04.3* ]] && \
+				RDEPEND+="
+					!<kde-apps/kde4-l10n-16.12.0:4
+					!kde-apps/kdepim-l10n:5
+				"
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     aab904f4e548a5e45f6beb7948a0b1c602bfba04
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 19:06:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 19:06:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aab904f4

kde5.eclass: Mark KDE Applications 18.08.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9532e522f3..3f2d1b1823 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-18.08.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0ec1d95505ee3408f4bc49eabd34559c1323a44e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 13:00:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 13:00:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ec1d955

kde5.eclass: Mark KDE Frameworks 5.50.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3f2d1b1823..8fd572796b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.50.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0b7383b87a9e2d55e2cfa544e192401332d0cbc9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 18:29:56 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 18:29:56 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0b7383b8

kde5-functions.eclass: QT_MINIMAL=5.11.1 is default for kde-plasma/*

KDE Plasma 5.14 has this as minimum dependency and 5.13 effectively already,
only 5.12 LTS can build with old Qt.

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 118011b524..37fbdae238 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,11 +38,11 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.11.1}
+		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.11.1}
 		fi
+		: ${QT_MINIMAL:=5.11.1}
 		;;
 	kde-apps)
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.08* ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6635567b93df108105c22d53cffab5012d73637e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 07:41:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 07:41:39 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6635567b

kde5.eclass: Mark KDE Applications 18.08.1 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8fd572796b..5680aca2da 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.50.0 )
+KDE_UNRELEASED=( kde-frameworks-5.50.0 kde-apps-18.08.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     876839ab8f9bd7a4b1f6bf35810e144e2704457d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 18:09:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 18:14:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=876839ab

kde5-functions.eclass: KDE_FRAMEWORKS=5.49 is default for kde-apps/*

KDE Applications 18.08 have this as minimum dependency already,
only 18.04.3 can build with old Frameworks.

 eclass/kde5-functions.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 37fbdae238..a56fed8a47 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,9 +45,8 @@ case ${CATEGORY} in
 		: ${QT_MINIMAL:=5.11.1}
 		;;
 	kde-apps)
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.08* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.49.0}
-		fi
+		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
+		: ${FRAMEWORKS_MINIMAL:=5.49.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     116dd1ff40c3de566ec9a72df578dcfa9201da38
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  6 17:21:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  6 17:21:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=116dd1ff

kde5.eclass: Mark KDE Applications 18.08.1 as released

Keeping it masked until release of KDE Frameworks 5.50 though.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5680aca2da..8fd572796b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.50.0 kde-apps-18.08.1 )
+KDE_UNRELEASED=( kde-frameworks-5.50.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     daccff4eaf6fa56203e697ace301eb84c1904d01
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  8 10:57:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 10:57:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=daccff4e

kde5.eclass: Mark KDE Frameworks 5.50 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8fd572796b..3f2d1b1823 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.50.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     59c2cc8a93a644cc42bf8fb7f91d1f19a52b41da
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 23:04:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 17:39:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=59c2cc8a

kde5-functions.eclass: Set KDE Plasma 5.14 FRAMEWORKS_MINIMAL=5.50

 eclass/kde5-functions.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index a56fed8a47..7414b48b00 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,6 +39,7 @@ case ${CATEGORY} in
 		;;
 	kde-plasma)
 		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
+		[[ ${PV} = 5.14* ]] && : ${FRAMEWORKS_MINIMAL:=5.50.0}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     71a8967b163ca82738eb047dc7643d88028039e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 23:10:02 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 17:39:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=71a8967b

kde5-functions.eclass: Raise kde-apps/* default FRAMEWORKS_MINIMAL=5.50

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7414b48b00..222f6fbc4d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -47,7 +47,7 @@ case ${CATEGORY} in
 		;;
 	kde-apps)
 		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
-		: ${FRAMEWORKS_MINIMAL:=5.49.0}
+		: ${FRAMEWORKS_MINIMAL:=5.50.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f8198adf433f5b252b63f8c60616c0f08c18dcfa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 18:49:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 18:49:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8198adf

kde5-functions.eclass: Fix FRAMEWORKS_MINIMAL for 5.13.90 and 5.13.95

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 222f6fbc4d..dc0123f863 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,7 +39,7 @@ case ${CATEGORY} in
 		;;
 	kde-plasma)
 		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
-		[[ ${PV} = 5.14* ]] && : ${FRAMEWORKS_MINIMAL:=5.50.0}
+		[[ ${PV} = 5.13.?? || ${PV} = 5.14* ]] && : ${FRAMEWORKS_MINIMAL:=5.50.0}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5d77485a6461bf03e2d6c5f340aa21cbe4f4cd67
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 09:35:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 09:38:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d77485a

cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 4ac0951d46..73e7f0b73a 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -615,6 +615,7 @@ cmake-utils_src_configure() {
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
 		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
+		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
@@ -673,7 +674,6 @@ cmake-utils_src_configure() {
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
-		-DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
 		"${MYCMAKEARGS}"
 	)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     aad70a4fb8d5afc8f63754ccad14a2e88e9a5d0c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 19:24:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 20:03:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aad70a4f

kde5.eclass: Mark KDE Plasma 5.14.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3f2d1b1823..6fe06de333 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.14.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a3cf2369a989b6989b9db33a6ec45f2a675d4744
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 00:03:03 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 18:36:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3cf2369

cmake-utils.eclass: Enable BUILD_SHARED_LIBS by default in EAPI >= 7

* Many upstreams build static libraries by default, as this is
  simpler for distribution. Developers can still override this
  variable if required.

  Examples:
  https://github.com/pezmaster31/bamtools/blob/master/CMakeLists.txt#L64

 eclass/cmake-utils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index a75574505c..527b26de80 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -630,6 +630,7 @@ cmake-utils_src_configure() {
 	if [[ ${EAPI} != [56] ]]; then
 		cat >> "${common_config}" <<- _EOF_ || die
 			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
+			SET (BUILD_SHARED_LIBS ON CACHE BOOLEAN "")
 		_EOF_
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7481f997ac2739fa95800092eed45269f52826cb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 00:41:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 18:36:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7481f997

cmake-utils.eclass: Turn `eqawarn` into `die` for >= EAPI 7

 eclass/cmake-utils.eclass | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 527b26de80..0bb3ec7131 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -125,7 +125,13 @@ esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
-[[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+if [[ ${WANT_CMAKE} ]]; then
+	if [[ ${EAPI} != [56] ]]; then
+		die "\${WANT_CMAKE} has been removed and is a no-op now"
+	else
+		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+	fi
+fi
 [[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
@@ -208,8 +214,13 @@ _cmake_check_build_dir() {
 		# Respect both the old variable and the new one, depending
 		# on which one was set by the ebuild.
 		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
-			eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-			eqawarn "Please migrate the ebuild to use the new one."
+			if [[ ${EAPI} != [56] ]]; then
+				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				die "The ebuild must be migrated to BUILD_DIR."
+			else
+				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				eqawarn "Please migrate the ebuild to use the new one."
+			fi
 
 			# In the next call, both variables will be set already
 			# and we'd have to know which one takes precedence.
@@ -224,7 +235,7 @@ _cmake_check_build_dir() {
 	fi
 
 	# Backwards compatibility for getting the value.
-	CMAKE_BUILD_DIR=${BUILD_DIR}
+	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
 
 	mkdir -p "${BUILD_DIR}" || die
 	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
@@ -508,7 +519,11 @@ cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
-		eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		if [[ ${EAPI} != [56] ]]; then
+			die "FATAL: cmake-utils_src_prepare has not been run"
+		else
+			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		fi
 	fi
 
 	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     42f0d29b4942e60b70fc708ad67d96d839e87c70
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 00:03:00 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 18:36:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=42f0d29b

cmake-utils.eclass: Make ninja default backend in EAPI >= 7

* Using the ninja backend as a default is the only way to
  massively improve src_compile core utilization, given that
  it seems unlikely that CMake will ever produce non-recursive
  Makefiles.

  See also:
  http://www.kaizou.org/2016/09/build-benchmark-large-c-project/

 eclass/cmake-utils.eclass | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 73e7f0b73a..a75574505c 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -50,10 +50,12 @@ _CMAKE_UTILS_ECLASS=1
 # Set to enable in-source build.
 
 # @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specify a makefile generator to be used by cmake.
 # At this point only "emake" and "ninja" are supported.
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+# In EAPI 7 and above, the default is set to "ninja",
+# whereas in EAPIs below 7, it is set to "emake".
 
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
@@ -112,7 +114,13 @@ esac
 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
-	5|6) inherit eutils multilib ;;
+	[56])
+		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+		inherit eapi7-ver eutils multilib
+		;;
+	*)
+		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+		;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4737c4c64145d954a4bb5ed1b6e291e883b5d03b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  8 15:35:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct  8 15:35:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4737c4c6

kde5.eclass: Mark KDE Frameworks 5.51.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6fe06de333..a88eb3f860 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.14.0 )
+KDE_UNRELEASED=( kde-plasma-5.14.0 kde-frameworks-5.51.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d7f56615ec4294682022442cf0f6c3b417ef8f1f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 07:37:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 07:37:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7f56615

kde5.eclass: Mark KDE Applications 18.08.2 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a88eb3f860..9978365740 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.14.0 kde-frameworks-5.51.0 )
+KDE_UNRELEASED=( kde-plasma-5.14.0 kde-frameworks-5.51.0 kde-apps-18.08.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d71678ed524c0a2c36ef8abe44ab5dd1f9ba83f6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 10:10:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 10:10:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d71678ed

kde5.eclass: Mark KDE Plasma 5.14.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9978365740..ef7116a460 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.14.0 kde-frameworks-5.51.0 kde-apps-18.08.2 )
+KDE_UNRELEASED=( kde-frameworks-5.51.0 kde-apps-18.08.2 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9896f79cbdc2fb0c16744f68af908dbca938013a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 20:53:34 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 20:53:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9896f79c

cmake-utils.eclass: Drop accidentally re-added eapi7-ver

Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 0bb3ec7131..776de76b31 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -116,7 +116,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 case ${EAPI} in
 	[56])
 		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-		inherit eapi7-ver eutils multilib
+		inherit eutils multilib
 		;;
 	*)
 		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fd5347201158b69e59ebd0b194bc2a0ee787aed1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 10:23:59 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 10:23:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd534720

kde5.eclass: Mark KDE Applications 18.08.2 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ef7116a460..0372662e0b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.51.0 kde-apps-18.08.2 )
+KDE_UNRELEASED=( kde-frameworks-5.51.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     eeb7b7910a6df1e61720aa3cbb930e2547acbd57
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 17:53:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 17:55:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eeb7b791

kde5-functions.eclass: Sync with Gentoo ebuild repository

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index dc0123f863..95a4dff9aa 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,8 +38,7 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
-		[[ ${PV} = 5.13.?? || ${PV} = 5.14* ]] && : ${FRAMEWORKS_MINIMAL:=5.50.0}
+		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.6}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
@@ -47,7 +46,6 @@ case ${CATEGORY} in
 		;;
 	kde-apps)
 		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
-		: ${FRAMEWORKS_MINIMAL:=5.50.0}
 		;;
 esac
 
@@ -59,7 +57,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.46.0}
+: ${FRAMEWORKS_MINIMAL:=5.50.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
@@ -69,7 +67,7 @@ esac
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=17.12.3}
+: ${KDE_APPS_MINIMAL:=18.04.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     55346f081efe16c4149b5664075953ee48566b79
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 20:36:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 20:36:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=55346f08

kde5-functions.eclass: Drop remaining KDE Plasma 5.12 reference

 eclass/kde5-functions.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 95a4dff9aa..c59a3dc01d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,7 +38,6 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.6}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e93af796fa65a93c4b986d61fb120aaf1d8d8a10
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 21:44:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 21:44:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e93af796

kde5.eclass: Mark KDE Frameworks 5.51.0 as released

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0372662e0b..3f2d1b1823 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.51.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     be57e2f5bc60960d31d38dab34b5613f09c1ed6d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  3 19:16:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  3 19:16:15 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=be57e2f5

kde5.eclass: Mark KDE Frameworks 5.52.0 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3f2d1b1823..e31270db14 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.52.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2cfee47b473a8e67c9b445cf576e49443932efa0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 08:58:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 08:58:17 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2cfee47b

kde5.eclass: Mark KDE Applications 18.08.3 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e31270db14..24364dbc52 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.52.0 )
+KDE_UNRELEASED=( kde-frameworks-5.52.0 kde-apps-18.08.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     54b3f95437fa62b2b354296db3658abc92450f8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  8 11:49:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  8 11:54:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=54b3f954

kde5.eclass: Mark KDE Applications 18.08.3 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 24364dbc52..e31270db14 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.52.0 kde-apps-18.08.3 )
+KDE_UNRELEASED=( kde-frameworks-5.52.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b108dc62e501a42a6114215c26c4f04106723f1e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 09:57:39 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 09:59:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b108dc62

kde5.eclass: Mark KDE Frameworks 5.52 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e31270db14..3f2d1b1823 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.52.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2a547811c7b85df52888cabaf75f2e60077e6193
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 19:34:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 19:47:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a547811

kde5.eclass: Drop obsolete blockers

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3f2d1b1823..29a4e213ce 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -217,11 +217,6 @@ case ${KDE_AUTODEPS} in
 		if [[ ${CATEGORY} = kde-apps ]]; then
 			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
 			RDEPEND+=" !kde-apps/kde-l10n" # TODO: drop after 18.08.3 removal
-			[[ ${PV} = 18.04.3* ]] && \
-				RDEPEND+="
-					!<kde-apps/kde4-l10n-16.12.0:4
-					!kde-apps/kdepim-l10n:5
-				"
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     91f83a9d887f2051c1a633496fc172b99e9067d7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 19:33:48 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 19:47:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=91f83a9d

kde5-functions.eclass: Drop obsolete minimum deps

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index c59a3dc01d..7d8dfa5a20 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -43,9 +43,6 @@ case ${CATEGORY} in
 		fi
 		: ${QT_MINIMAL:=5.11.1}
 		;;
-	kde-apps)
-		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
@@ -56,7 +53,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.50.0}
+: ${FRAMEWORKS_MINIMAL:=5.52.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
@@ -66,7 +63,7 @@ esac
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=18.04.3}
+: ${KDE_APPS_MINIMAL:=18.08.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6b9db35863c465d9563e1f2ca7c915b599d987e3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 19:34:53 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 19:48:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b9db358

kde5.eclass: Mark KDE Frameworks 5.53.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 29a4e213ce..9eca24d5ca 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.53.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8a2882e59aa54b562ce98ac919045e0925cc4eea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 16:06:48 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 16:06:48 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a2882e5

kde5.eclass: Mark KDE Applications 18.12.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9eca24d5ca..5311162097 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.53.0 )
+KDE_UNRELEASED=( kde-frameworks-5.53.0 kde-apps-18.12.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     115aab9dd8a58005895ac1f8626495cee19a62f5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 22:34:44 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 22:34:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=115aab9d

kde5.eclass: Mark KDE Frameworks 5.53.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5311162097..ce0433fc01 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.53.0 kde-apps-18.12.0 )
+KDE_UNRELEASED=( kde-apps-18.12.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4abeb2253642610c64cd87e25f18b81a145a5c5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 22:29:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 22:32:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4abeb225

kde5-functions: Raise QT_MINIMAL to 5.11.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7d8dfa5a20..c6cdc4ba9d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -36,19 +36,22 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		[[ ${PV} = 5.52.0* ]] && : ${QT_MINIMAL:=5.9.4}
 		;;
 	kde-plasma)
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
-		: ${QT_MINIMAL:=5.11.1}
+		;;
+	kde-apps)
+		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
 		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.
-: ${QT_MINIMAL:=5.9.4}
+: ${QT_MINIMAL:=5.11.1}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bedd1678c2e255908db1febb635925a54a563342
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 12:32:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 13:48:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bedd1678

kde5.eclass: Mark KDE Applications 18.12.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ce0433fc01..29a4e213ce 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-18.12.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2a3b8a4d1736d6881a97d170420c100a4f9c9602
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 14:03:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 14:05:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a3b8a4d

kde5-meta-pkg.eclass: Remove unused eclass

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-meta-pkg.eclass | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
deleted file mode 100644
index 6dd348276b..0000000000
--- a/eclass/kde5-meta-pkg.eclass
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde5-meta-pkg.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: This eclass contains boilerplate for KDE meta packages.
-# @DESCRIPTION:
-# This eclass should only be used for defining meta packages bundling
-# software produced by the KDE community.
-
-if [[ -z ${_KDE5_META_PKG_ECLASS} ]]; then
-_KDE5_META_PKG_ECLASS=1
-
-inherit kde5-functions
-
-HOMEPAGE="https://www.kde.org/"
-LICENSE="metapackage"
-SLOT="5"
-
-if [[ ${CATEGORY} = kde-apps ]]; then
-	RDEPEND+=" !kde-apps/${PN}:4"
-fi
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     745947923ea0650caed20ec94170554d6a3b98eb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 13:12:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 13:12:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=74594792

kde5-functions.eclass: Set FRAMEWORKS_MINIMAL to 5.53.0 for 9999 only

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index c6cdc4ba9d..09bc4bc255 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,6 +45,9 @@ case ${CATEGORY} in
 		;;
 	kde-apps)
 		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
+		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != ??.??.49* ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.53.0}
+		fi
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e5d7a41a64ca4a73f7ee4e2f18da92cafda66469
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  6 21:25:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  6 21:25:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5d7a41a

kde5.eclass: Mark KDE Frameworks 5.54.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 29a4e213ce..7a36bae0e2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.54.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     27ad092ce22687970b4324432faa4795efb4a3e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 00:44:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 00:44:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=27ad092c

kde5.eclass: Mark KDE Applications 18.12.1 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7a36bae0e2..fdabf26e85 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -165,7 +165,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.54.0 )
+KDE_UNRELEASED=( kde-frameworks-5.54.0 kde-apps-18.12.1 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9b5037ebc0bb0ca8684ecd637b0bb819cdfab884
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 23:04:14 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 23:04:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b5037eb

kde5.eclass: Drop KDE_TESTPATTERN

Never used by many ebuilds, completely unused right now.

Bug: https://bugs.gentoo.org/674922
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index fdabf26e85..d2f8515782 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -120,13 +120,6 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${KDE_QTHELP:=false}
 
-# @ECLASS-VARIABLE: KDE_TESTPATTERN
-# @DESCRIPTION:
-# DANGER: Only touch it if you know what you are doing.
-# By default, matches autotest(s), unittest(s) and test(s) pattern inside
-# cmake add_subdirectory calls.
-: ${KDE_TESTPATTERN:="\(auto|unit\)\?tests\?"}
-
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -136,7 +129,7 @@ fi
 # If set to "forceoptional", remove a Qt5Test dependency and comment test
 # subdirs from the root CMakeLists.txt in addition to the above.
 # If set to "forceoptional-recursive", remove Qt5Test dependencies and make
-# test subdirs according to KDE_TESTPATTERN from *any* CMakeLists.txt in ${S}
+# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in ${S}
 # and below conditional on BUILD_TESTING. 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
@@ -579,12 +572,12 @@ kde5_src_prepare() {
 			local f pf="${T}/${P}"-tests-optional.patch
 			touch ${pf} || die "Failed to touch patch file"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
-				grep -l "^\s*add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)" {} \;); do
+				grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
 				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
 				pushd ${f%/*} > /dev/null || die
 					punt_bogus_dep Qt5 Test
 					sed -i CMakeLists.txt -e \
-						"/^#/! s/add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
+						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
 						|| die
 				popd > /dev/null || die
 				diff -Naur ${f}.old ${f} 1>>${pf}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     39b66747da4b649b5eb878dba993cb7dd9f47952
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  9 00:25:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  9 00:40:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=39b66747

kde5-functions.eclass: Ban get_kde_version, kde_l10n2lingua in EAPI-7

* get_kde_version was never used and is broken for Jan-Sep kde-apps releases
* kde_l10n2lingua is not used since kde-l10n and kde4-l10n packages are gone

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b2d8813736..4ff518f841 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -288,6 +288,7 @@ add_qt_dep() {
 # If the version equals 9999, "live" is returned.
 # If no version is specified, ${PV} is used.
 get_kde_version() {
+	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
 	local ver=${1:-${PV}}
 	local major=$(ver_cut 1 ${ver})
 	local minor=$(ver_cut 2 ${ver})
@@ -306,6 +307,7 @@ get_kde_version() {
 # Output KDE lingua flag name(s) (without prefix(es)) appropriate for
 # given l10n(s).
 kde_l10n2lingua() {
+	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
 	local l
 	for l; do
 		case ${l} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bb32ea7f1c50ccb8df64f19da963acaf2626e614
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  9 01:51:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  9 01:52:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb32ea7f

kde5.eclass: Deprecate kde-apps blockers with 18.08.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d304267654..8db0fa00d9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -207,9 +207,9 @@ case ${KDE_AUTODEPS} in
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
 
-		if [[ ${CATEGORY} = kde-apps ]]; then
+		if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then
 			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+=" !kde-apps/kde-l10n" # TODO: drop after 18.08.3 removal
+			RDEPEND+=" !kde-apps/kde-l10n"
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2e0a0801f541af21c7f1a06b5308b623addce5f1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 15:43:39 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 15:43:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e0a0801

kde5.eclass: Mark KDE Applications 18.12.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8db0fa00d9..7f632183c9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -158,7 +158,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.54.0 kde-apps-18.12.1 )
+KDE_UNRELEASED=( kde-frameworks-5.54.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0c1b208a247fc530f8f9c5402f8183e1d0f495cd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 09:32:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 09:32:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c1b208a

kde5.eclass: Mark KDE Frameworks 5.54 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7f632183c9..1c705c03f9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -158,7 +158,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.54.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ee96b6c02f2d577fe4d77576129615ce630707c0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 10:55:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 10:55:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee96b6c0

kde5-functions.eclass: Set FRAMEWORKS_MINIMAL=5.54.0 for Plasma-5.15

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4ff518f841..14cb4db3b0 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,6 +39,9 @@ case ${CATEGORY} in
 		[[ ${PV} = 5.52.0* ]] && : ${QT_MINIMAL:=5.9.4}
 		;;
 	kde-plasma)
+		if [[ ${PV} = 5.14.90 || ${PV} = 5.15.49* ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.54.0}
+		fi
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
@@ -46,7 +49,7 @@ case ${CATEGORY} in
 	kde-apps)
 		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != ??.??.49* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.53.0}
+			: ${FRAMEWORKS_MINIMAL:=5.54.0}
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     501c3a8e73368fa4bf71544303724d0df04fd181
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 20:49:25 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 21:16:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=501c3a8e

kde5-functions.eclass: add_qt_dep: Drop obsolete qtwebkit ver check

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 14cb4db3b0..622c38dd36 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -270,8 +270,8 @@ add_qt_dep() {
 	local slot=${4}
 
 	if [[ -z ${version} ]]; then
-		if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then
-			version=5.9.1 # no more upstream release, need bug #624404
+		if [[ ${1} = qtwebkit ]]; then
+			version=5.9.1 # no more upstream release
 		else
 			version=${QT_MINIMAL}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     290bbd89e17c723ca268f36ed01d2256c372a015
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 19:29:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 22:34:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=290bbd89

kde5.eclass: Relocate KDE_INSTALL_DOCBUNDLEDIR to /usr/share/help

These are handbook files installed by hundreds of packages to a
central location, to be accessed by KDE Helpcenter application,
with compressed index cache files.

This leads to the following QA issues on every package w/ USE handbook:
* The ebuild is installing to one or more unexpected paths
* One or more compressed files were found in docompress-ed directories

We'll use the EAPI-7 transition to move the location from previously
/usr/share/doc/HTML to /usr/share/help [1]. Transition for khelpcenter
will be seemless as kde-frameworks/kdoctools can be easily patched to
accept both locations, until eventually /usr/share/doc/HTML is empty.

As a side-effect, we will be able to drop the workaround for disabling
auto compression of files beneath /usr/share/doc together with EAPI-6.

[1] See also: https://www.freedesktop.org/wiki/Specifications/help-system/
    It is also the path upstream intends to migrate to in the future.

Bug: https://bugs.gentoo.org/667138
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d6c790fe52..b25679a76c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -636,6 +636,8 @@ kde5_src_configure() {
 			# install mkspecs in the same directory as qt stuff
 			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 		)
+		# move handbook outside of doc dir for at least two QA warnings, bug 667138
+		[[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" )
 	fi
 
 	# allow the ebuild to override what we set here
@@ -705,11 +707,13 @@ kde5_src_install() {
 		docompress -x /usr/share/doc/qt-${pv}
 	fi
 
-	# We don't want /usr/share/doc/HTML to be compressed,
-	# because then khelpcenter can't find the docs
-	#todo: clean up trailing slash check when EAPI <7 is removed
-	if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
-		docompress -x /usr/share/doc/HTML
+	if [[ ${EAPI} = 6 ]]; then
+		# We don't want /usr/share/doc/HTML to be compressed,
+		# because then khelpcenter can't find the docs
+		#todo: clean up trailing slash check when EAPI <7 is removed
+		if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
+			docompress -x /usr/share/doc/HTML
+		fi
 	fi
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e409e9cea6e064b3373af5756c9dcd0206d9c692
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 21:32:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 10:20:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e409e9ce

kde5-functions.eclass: Disallow add_qt_dep for discontinued qtwebkit

Drop support for it as packages are slowly being ported away from it.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 622c38dd36..8860f3f068 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -270,10 +270,10 @@ add_qt_dep() {
 	local slot=${4}
 
 	if [[ -z ${version} ]]; then
+		version=${QT_MINIMAL}
 		if [[ ${1} = qtwebkit ]]; then
-			version=5.9.1 # no more upstream release
-		else
-			version=${QT_MINIMAL}
+			version=5.9.1
+			[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later"
 		fi
 	fi
 	if [[ -z ${slot} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e0a52efbf71db63575ecccc611590726c824e934
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 21:52:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 10:20:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0a52efb

kde5-functions.eclass: Cleanup _add_category_dep slot def

There's no SLOT 4 for a long time.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8860f3f068..6ad74bd966 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -144,7 +144,7 @@ _add_category_dep() {
 
 	if [[ -n ${slot} ]] ; then
 		slot=":${slot}"
-	elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
+	elif [[ ${SLOT%\/*} = 5 ]] ; then
 		slot=":${SLOT%\/*}"
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1a35788ec1bbdf2f14014318b2c49232d20b7a33
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  2 23:02:21 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  2 23:02:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a35788e

kde5.eclass: Mark KDE Frameworks 5.55.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b25679a76c..571de1158a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.55.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e5a37303ed46ebfb8039f894dd4b6395dbe5f99a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 13:34:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 15:04:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5a37303

kde5.eclass: Mark KDE Applications 18.12.2 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 571de1158a..a1083c267b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.55.0 )
+KDE_UNRELEASED=( kde-apps-18.12.2 kde-frameworks-5.55.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8b54ba0db1427637bc97955246696be3389afa23
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 18:37:52 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 19:47:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b54ba0d

gnome2-utils.eclass, xdg-utils.eclass, xdg.eclass: Drop obsolete

What we need is now in kde5.eclass.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/gnome2-utils.eclass | 474 ---------------------------------------------
 eclass/xdg-utils.eclass    | 134 -------------
 eclass/xdg.eclass          | 110 -----------
 3 files changed, 718 deletions(-)

diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
deleted file mode 100644
index 41b3edbcd9..0000000000
--- a/eclass/gnome2-utils.eclass
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: gnome2-utils.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
-# @BLURB: Auxiliary functions commonly used by Gnome packages.
-# @DESCRIPTION:
-# This eclass provides a set of auxiliary functions needed by most Gnome
-# packages. It may be used by non-Gnome packages as needed for handling various
-# Gnome stack related functions such as:
-#  * GSettings schemas management
-#  * GConf schemas management
-#  * scrollkeeper (old Gnome help system) management
-
-[[ ${EAPI:-0} == [012345] ]] && inherit multilib
-inherit eutils xdg-utils
-
-case "${EAPI:-0}" in
-	0|1|2|3|4|5|6) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: GCONFTOOL_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gconftool-2
-: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where scrollkeeper-update should do its work
-: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to scrollkeeper-update
-: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
-
-# @ECLASS-VARIABLE: GLIB_COMPILE_SCHEMAS
-# @INTERNAL
-# @DESCRIPTION:
-# Path to glib-compile-schemas
-: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of GConf schemas provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_ICONS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of icons provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_SCROLLS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of scrolls (documentation files) provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_GLIB_SCHEMAS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of GSettings schemas provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_GDK_PIXBUF_LOADERS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of gdk-pixbuf loaders provided by the package
-
-DEPEND=">=sys-apps/sed-4"
-
-
-# @FUNCTION: gnome2_environment_reset
-# @DESCRIPTION:
-# Reset various variables inherited from root's evironment to a reasonable
-# default for ebuilds to help avoid access violations and test failures.
-gnome2_environment_reset() {
-	xdg_environment_reset
-
-	# Respected by >=glib-2.30.1-r1
-	export G_HOME="${T}"
-
-	# GST_REGISTRY is to work around gst utilities trying to read/write /root
-	export GST_REGISTRY="${T}/registry.xml"
-
-	# Ensure we don't rely on dconf/gconf while building, bug #511946
-	export GSETTINGS_BACKEND="memory"
-
-	if has ${EAPI:-0} 6; then
-		# Try to cover the packages honoring this variable, bug #508124
-		export GST_INSPECT="$(type -P true)"
-
-		# Stop relying on random DISPLAY variable values, bug #534312
-		unset DISPLAY
-	fi
-}
-
-# @FUNCTION: gnome2_gconf_savelist
-# @DESCRIPTION:
-# Find the GConf schemas that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCHEMAS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_gconf_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" > /dev/null || die
-	export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
-	popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_gconf_install
-# @DESCRIPTION:
-# Applies any schema files installed by the current ebuild to Gconf's database
-# using gconftool-2.
-# This function should be called from pkg_postinst.
-gnome2_gconf_install() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GCONFTOOL_BIN}"
-
-	if [[ ! -x "${updater}" ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-		debug-print "No GNOME 2 GConf schemas found"
-		return
-	fi
-
-	# We are ready to install the GCONF Scheme now
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-	einfo "Installing GNOME 2 GConf schemas"
-
-	local F
-	for F in ${GNOME2_ECLASS_SCHEMAS}; do
-		if [[ -e "${EROOT}${F}" ]]; then
-			debug-print "Installing schema: ${F}"
-			"${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null
-		fi
-	done
-
-	# have gconf reload the new schemas
-	pids=$(pgrep -x gconfd-2)
-	if [[ $? == 0 ]] ; then
-		ebegin "Reloading GConf schemas"
-		kill -HUP ${pids}
-		eend $?
-	fi
-}
-
-# @FUNCTION: gnome2_gconf_uninstall
-# @DESCRIPTION:
-# Removes schema files previously installed by the current ebuild from Gconf's
-# database.
-gnome2_gconf_uninstall() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GCONFTOOL_BIN}"
-
-	if [[ ! -x "${updater}" ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-		debug-print "No GNOME 2 GConf schemas found"
-		return
-	fi
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-	einfo "Uninstalling GNOME 2 GConf schemas"
-
-	local F
-	for F in ${GNOME2_ECLASS_SCHEMAS}; do
-		if [[ -e "${EROOT}${F}" ]]; then
-			debug-print "Uninstalling gconf schema: ${F}"
-			"${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null
-		fi
-	done
-
-	# have gconf reload the new schemas
-	pids=$(pgrep -x gconfd-2)
-	if [[ $? == 0 ]] ; then
-		ebegin "Reloading GConf schemas"
-		kill -HUP ${pids}
-		eend $?
-	fi
-}
-
-# @FUNCTION: gnome2_icon_savelist
-# @DESCRIPTION:
-# Find the icons that are about to be installed and save their location
-# in the GNOME2_ECLASS_ICONS environment variable. This is only
-# necessary for eclass implementations that call
-# gnome2_icon_cache_update conditionally.
-# This function should be called from pkg_preinst.
-gnome2_icon_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" > /dev/null || die
-	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_icon_cache_update
-# @DESCRIPTION:
-# Updates Gtk+ icon cache files under /usr/share/icons.
-# Deprecated. Please use xdg_icon_cache_update from xdg-utils.eclass
-gnome2_icon_cache_update() {
-	xdg_icon_cache_update
-}
-
-# @FUNCTION: gnome2_omf_fix
-# @DESCRIPTION:
-# Workaround applied to Makefile rules in order to remove redundant
-# calls to scrollkeeper-update and sandbox violations.
-# This function should be called from src_prepare.
-gnome2_omf_fix() {
-	local omf_makefiles filename
-
-	omf_makefiles="$@"
-
-	if [[ -f ${S}/omf.make ]] ; then
-		omf_makefiles="${omf_makefiles} ${S}/omf.make"
-	fi
-
-	if [[ -f ${S}/gnome-doc-utils.make ]] ; then
-		omf_makefiles="${omf_makefiles} ${S}/gnome-doc-utils.make"
-	fi
-
-	# testing fixing of all makefiles found
-	# The sort is important to ensure .am is listed before the respective .in for
-	# maintainer mode regeneration not kicking in due to .am being newer than .in
-	for filename in $(find "${S}" -name "Makefile.in" -o -name "Makefile.am" |sort) ; do
-		omf_makefiles="${omf_makefiles} ${filename}"
-	done
-
-	ebegin "Fixing OMF Makefiles"
-
-	local retval=0
-	local fails=( )
-
-	for omf in ${omf_makefiles} ; do
-		sed -i -e 's:scrollkeeper-update:true:' "${omf}"
-		retval=$?
-
-		if [[ $retval -ne 0 ]] ; then
-			debug-print "updating of ${omf} failed"
-
-			# Add to the list of failures
-			fails[$(( ${#fails[@]} + 1 ))]=$omf
-
-			retval=2
-		fi
-	done
-
-	eend $retval
-
-	for f in "${fails[@]}" ; do
-		eerror "Failed to update OMF Makefile $f"
-	done
-}
-
-# @FUNCTION: gnome2_scrollkeeper_savelist
-# @DESCRIPTION:
-# Find the scrolls that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCROLLS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_scrollkeeper_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" > /dev/null || die
-	export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
-	popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_scrollkeeper_update
-# @DESCRIPTION:
-# Updates the global scrollkeeper database.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_scrollkeeper_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${SCROLLKEEPER_UPDATE_BIN}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then
-		debug-print "No scroll cache to update"
-		return
-	fi
-
-	ebegin "Updating scrollkeeper database ..."
-	"${updater}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
-	eend $?
-}
-
-# @FUNCTION: gnome2_schemas_savelist
-# @DESCRIPTION:
-# Find if there is any GSettings schema to install and save the list in
-# GNOME2_ECLASS_GLIB_SCHEMAS variable. This is only necessary for eclass
-# implementations that call gnome2_schemas_update conditionally.
-# This function should be called from pkg_preinst.
-gnome2_schemas_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" > /dev/null || die
-	export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
-	popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_schemas_update
-# @USAGE: gnome2_schemas_update
-# @DESCRIPTION:
-# Updates GSettings schemas.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_schemas_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
-
-	if [[ ! -x ${updater} ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	ebegin "Updating GSettings schemas"
-	${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
-	eend $?
-}
-
-# @FUNCTION: gnome2_gdk_pixbuf_savelist
-# @DESCRIPTION:
-# Find if there is any gdk-pixbuf loader to install and save the list in
-# GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable.
-# This function should be called from pkg_preinst.
-gnome2_gdk_pixbuf_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" > /dev/null || die
-	export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
-	popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_gdk_pixbuf_update
-# @USAGE: gnome2_gdk_pixbuf_update
-# @DESCRIPTION:
-# Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_gdk_pixbuf_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
-
-	if [[ ! -x ${updater} ]]; then
-		updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders"
-	fi
-
-	if [[ ! -x ${updater} ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
-		debug-print "gdk-pixbuf loader cache does not need an update"
-		return
-	fi
-
-	ebegin "Updating gdk-pixbuf loader cache"
-	local tmp_file=$(emktemp)
-	${updater} 1> "${tmp_file}" &&
-	chmod 0644 "${tmp_file}" &&
-	cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
-	rm "${tmp_file}" # don't replace this with mv, required for SELinux support
-	eend $?
-}
-
-# @FUNCTION: gnome2_query_immodules_gtk2
-# @USAGE: gnome2_query_immodules_gtk2
-# @DESCRIPTION:
-# Updates gtk2 immodules/gdk-pixbuf loaders listing.
-gnome2_query_immodules_gtk2() {
-	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
-	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
-
-	ebegin "Updating gtk2 input method module cache"
-	GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \
-		"${updater}" --update-cache
-	eend $?
-}
-
-# @FUNCTION: gnome2_query_immodules_gtk3
-# @USAGE: gnome2_query_immodules_gtk3
-# @DESCRIPTION:
-# Updates gtk3 immodules/gdk-pixbuf loaders listing.
-gnome2_query_immodules_gtk3() {
-	local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
-	[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
-
-	ebegin "Updating gtk3 input method module cache"
-	GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \
-		"${updater}" --update-cache
-	eend $?
-}
-
-# @FUNCTION: gnome2_giomodule_cache_update
-# @USAGE: gnome2_giomodule_cache_update
-# @DESCRIPTION:
-# Updates glib's gio modules cache.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_giomodule_cache_update() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}/usr/bin/${CHOST}-gio-querymodules"
-
-	if [[ ! -x ${updater} ]]; then
-		updater="${EROOT}/usr/bin/gio-querymodules"
-	fi
-
-	if [[ ! -x ${updater} ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	ebegin "Updating GIO modules cache"
-	${updater} "${EROOT%/}"/usr/$(get_libdir)/gio/modules
-	eend $?
-}
-
-# @FUNCTION: gnome2_disable_deprecation_warning
-# @DESCRIPTION:
-# Disable deprecation warnings commonly found in glib based packages.
-# Should be called from src_prepare.
-gnome2_disable_deprecation_warning() {
-	local retval=0
-	local fails=( )
-	local makefile
-
-	ebegin "Disabling deprecation warnings"
-	# The sort is important to ensure .am is listed before the respective .in for
-	# maintainer mode regeneration not kicking in due to .am being newer than .in
-	while read makefile ; do
-		if ! grep -qE "(DISABLE_DEPRECATED|GSEAL_ENABLE)" "${makefile}"; then
-			continue
-		fi
-
-		LC_ALL=C sed -r -i \
-			-e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(/bin/true):g' \
-			-e 's:-DGSEAL_ENABLE(=[A-Za-z0-9_]*)?:$(/bin/true):g' \
-			-i "${makefile}"
-
-		if [[ $? -ne 0 ]]; then
-			# Add to the list of failures
-			fails+=( "${makefile}" )
-			retval=2
-		fi
-	done < <(find "${S}" -name "Makefile.in" \
-		-o -name "Makefile.am" -o -name "Makefile.decl" \
-		| sort; [[ -f "${S}"/configure ]] && echo configure)
-# TODO: sedding configure.ac can trigger maintainer mode; bug #439602
-#		-o -name "configure.ac" -o -name "configure.in" \
-#		| sort; echo configure)
-	eend ${retval}
-
-	for makefile in "${fails[@]}" ; do
-		ewarn "Failed to disable deprecation warnings in ${makefile}"
-	done
-}

diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
deleted file mode 100644
index c65c91c0cd..0000000000
--- a/eclass/xdg-utils.eclass
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: xdg-utils.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @AUTHOR:
-# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
-# @BLURB: Auxiliary functions commonly used by XDG compliant packages.
-# @DESCRIPTION:
-# This eclass provides a set of auxiliary functions needed by most XDG
-# compliant packages.
-# It provides XDG stack related functions such as:
-#  * Gtk+ icon cache management
-#  * XDG .desktop files cache management
-#  * XDG mime information database management
-
-case "${EAPI:-0}" in
-	0|1|2|3|4|5|6|7) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: DESKTOP_DATABASE_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where .desktop files database is stored
-: ${DESKTOP_DATABASE_DIR="/usr/share/applications"}
-
-# @ECLASS-VARIABLE: MIMEINFO_DATABASE_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where .desktop files database is stored
-: ${MIMEINFO_DATABASE_DIR:="/usr/share/mime"}
-
-# @FUNCTION: xdg_environment_reset
-# @DESCRIPTION:
-# Clean up environment for clean builds.
-xdg_environment_reset() {
-	# Prepare XDG base directories
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_CACHE_HOME="${HOME}/.cache"
-	export XDG_RUNTIME_DIR="${T}/run"
-	mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
-		"${XDG_RUNTIME_DIR}" || die
-	# This directory needs to be owned by the user, and chmod 0700
-	# https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-}
-
-# @FUNCTION: xdg_desktop_database_update
-# @DESCRIPTION:
-# Updates the .desktop files database.
-# Generates a list of mimetypes linked to applications that can handle them
-xdg_desktop_database_update() {
-	if [[ ${EBUILD_PHASE} != post* ]] ; then
-		die "xdg_desktop_database_update must be used in pkg_post* phases."
-	fi
-
-	if ! type update-desktop-database &>/dev/null; then
-		debug-print "update-desktop-database is not found"
-		return
-	fi
-
-	ebegin "Updating .desktop files database"
-	update-desktop-database -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
-	eend $?
-}
-
-# @FUNCTION: xdg_icon_cache_update
-# @DESCRIPTION:
-# Updates Gtk+ icon cache files under /usr/share/icons.
-# This function should be called from pkg_postinst and pkg_postrm.
-xdg_icon_cache_update() {
-	if [[ ${EBUILD_PHASE} != post* ]] ; then
-		die "xdg_icon_cache_update must be used in pkg_post* phases."
-	fi
-
-	if ! type gtk-update-icon-cache &>/dev/null; then
-		debug-print "gtk-update-icon-cache is not found"
-		return
-	fi
-
-	ebegin "Updating icons cache"
-	local retval=0
-	local fails=( )
-	for dir in "${EROOT%/}"/usr/share/icons/*
-	do
-		if [[ -f "${dir}/index.theme" ]] ; then
-			local rv=0
-			gtk-update-icon-cache -qf "${dir}"
-			rv=$?
-			if [[ ! $rv -eq 0 ]] ; then
-				debug-print "Updating cache failed on ${dir}"
-				# Add to the list of failures
-				fails+=( "${dir}" )
-				retval=2
-			fi
-		elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
-			# Clear stale cache files after theme uninstallation
-			rm "${dir}/icon-theme.cache"
-		fi
-		if [[ -z $(ls "${dir}") ]]; then
-			# Clear empty theme directories after theme uninstallation
-			rmdir "${dir}"
-		fi
-	done
-	eend ${retval}
-	for f in "${fails[@]}" ; do
-		eerror "Failed to update cache with icon $f"
-	done
-}
-
-# @FUNCTION: xdg_mimeinfo_database_update
-# @DESCRIPTION:
-# Update the mime database.
-# Creates a general list of mime types from several sources
-xdg_mimeinfo_database_update() {
-	if [[ ${EBUILD_PHASE} != post* ]] ; then
-		die "xdg_mimeinfo_database_update must be used in pkg_post* phases."
-	fi
-
-	if ! type update-mime-database &>/dev/null; then
-		debug-print "update-mime-database is not found"
-		return
-	fi
-
-	ebegin "Updating shared mime info database"
-	update-mime-database "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
-	eend $?
-}

diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
deleted file mode 100644
index 219be712e8..0000000000
--- a/eclass/xdg.eclass
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: xdg.eclass
-# @MAINTAINER:
-# freedesktop-bugs@gentoo.org
-# @AUTHOR:
-# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
-# @BLURB: Provides phases for XDG compliant packages.
-# @DESCRIPTION:
-# Utility eclass to update the desktop, icon and shared mime info as laid
-# out in the freedesktop specs & implementations
-
-inherit xdg-utils
-
-case "${EAPI:-0}" in
-	4|5|6|7)
-		EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
-		;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# Avoid dependency loop as both depend on glib-2
-if [[ ${CATEGORY}/${P} != dev-libs/glib-2.* ]] ; then
-DEPEND="
-	dev-util/desktop-file-utils
-	x11-misc/shared-mime-info
-"
-fi
-
-# @FUNCTION: xdg_src_prepare
-# @DESCRIPTION:
-# Prepare sources to work with XDG standards.
-xdg_src_prepare() {
-	xdg_environment_reset
-
-	[[ ${EAPI:-0} != [45] ]] && default
-}
-
-# @FUNCTION: xdg_pkg_preinst
-# @DESCRIPTION:
-# Finds .desktop, icon and mime info files for later handling in pkg_postinst.
-# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_ICONFILES
-# and XDG_ECLASS_MIMEINFOFILES respectively.
-xdg_pkg_preinst() {
-	local f
-
-	XDG_ECLASS_DESKTOPFILES=()
-	while IFS= read -r -d '' f; do
-		XDG_ECLASS_DESKTOPFILES+=( ${f} )
-	done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
-
-	XDG_ECLASS_ICONFILES=()
-	while IFS= read -r -d '' f; do
-		XDG_ECLASS_ICONFILES+=( ${f} )
-	done < <(cd "${ED}" && find 'usr/share/icons' -type f -print0 2>/dev/null)
-
-	XDG_ECLASS_MIMEINFOFILES=()
-	while IFS= read -r -d '' f; do
-		XDG_ECLASS_MIMEINFOFILES+=( ${f} )
-	done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
-}
-
-# @FUNCTION: xdg_pkg_postinst
-# @DESCRIPTION:
-# Handle desktop, icon and mime info database updates.
-xdg_pkg_postinst() {
-	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
-		xdg_desktop_database_update
-	else
-		debug-print "No .desktop files to add to database"
-	fi
-
-	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
-		xdg_icon_cache_update
-	else
-		debug-print "No icon files to add to cache"
-	fi
-
-	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
-		xdg_mimeinfo_database_update
-	else
-		debug-print "No mime info files to add to database"
-	fi
-}
-
-# @FUNCTION: xdg_pkg_postrm
-# @DESCRIPTION:
-# Handle desktop, icon and mime info database updates.
-xdg_pkg_postrm() {
-	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
-		xdg_desktop_database_update
-	else
-		debug-print "No .desktop files to add to database"
-	fi
-
-	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
-		xdg_icon_cache_update
-	else
-		debug-print "No icon files to add to cache"
-	fi
-
-	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
-		xdg_mimeinfo_database_update
-	else
-		debug-print "No mime info files to add to database"
-	fi
-}
-

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     16e6b9bcbc9d448e20da6a03ea120f4ef7d3eaa2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 18:33:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 19:47:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=16e6b9bc

kde5.eclass: Fork needed xdg.eclass functions pending EAPI-7 porting

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 123 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a1083c267b..ed83170a6a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -31,10 +31,11 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
+inherit cmake-utils flag-o-matic kde5-functions virtualx
 
 case ${EAPI} in
-	6) inherit eapi7-ver eutils gnome2-utils ;;
+	6) inherit eapi7-ver eutils gnome2-utils xdg ;;
+	7) inherit xdg-utils ;;
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -717,6 +718,120 @@ kde5_src_install() {
 	fi
 }
 
+# @FUNCTION: _xdg_icon_cache_update
+# @DESCRIPTION: Forked from future xdg-utils.eclass. REMOVEME!
+# Updates Gtk+ icon cache files under /usr/share/icons.
+# This function should be called from pkg_postinst and pkg_postrm.
+_xdg_icon_cache_update() {
+	if [[ ${EBUILD_PHASE} != post* ]] ; then
+		die "xdg_icon_cache_update must be used in pkg_post* phases."
+	fi
+
+	if ! type gtk-update-icon-cache &>/dev/null; then
+		debug-print "gtk-update-icon-cache is not found"
+		return
+	fi
+
+	ebegin "Updating icons cache"
+	local retval=0
+	local fails=( )
+	for dir in "${EROOT%/}"/usr/share/icons/*
+	do
+		if [[ -f "${dir}/index.theme" ]] ; then
+			local rv=0
+			gtk-update-icon-cache -qf "${dir}"
+			rv=$?
+			if [[ ! $rv -eq 0 ]] ; then
+				debug-print "Updating cache failed on ${dir}"
+				# Add to the list of failures
+				fails+=( "${dir}" )
+				retval=2
+			fi
+		elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
+			# Clear stale cache files after theme uninstallation
+			rm "${dir}/icon-theme.cache"
+		fi
+		if [[ -z $(ls "${dir}") ]]; then
+			# Clear empty theme directories after theme uninstallation
+			rmdir "${dir}"
+		fi
+	done
+	eend ${retval}
+	for f in "${fails[@]}" ; do
+		eerror "Failed to update cache with icon $f"
+	done
+}
+
+# @FUNCTION: _xdg_pkg_preinst
+# @DESCRIPTION: Forked from future xdg.eclass. REMOVEME!
+# Finds .desktop, icon and mime info files for later handling in pkg_postinst.
+# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_ICONFILES
+# and XDG_ECLASS_MIMEINFOFILES respectively.
+_xdg_pkg_preinst() {
+	local f
+
+	XDG_ECLASS_DESKTOPFILES=()
+	while IFS= read -r -d '' f; do
+		XDG_ECLASS_DESKTOPFILES+=( ${f} )
+	done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
+
+	XDG_ECLASS_ICONFILES=()
+	while IFS= read -r -d '' f; do
+		XDG_ECLASS_ICONFILES+=( ${f} )
+	done < <(cd "${ED}" && find 'usr/share/icons' -type f -print0 2>/dev/null)
+
+	XDG_ECLASS_MIMEINFOFILES=()
+	while IFS= read -r -d '' f; do
+		XDG_ECLASS_MIMEINFOFILES+=( ${f} )
+	done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
+}
+
+# @FUNCTION: _xdg_pkg_postinst
+# @DESCRIPTION: Forked from future xdg.eclass. REMOVEME!
+# Handle desktop, icon and mime info database updates.
+_xdg_pkg_postinst() {
+	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
+		xdg_desktop_database_update
+	else
+		debug-print "No .desktop files to add to database"
+	fi
+
+	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
+		_xdg_icon_cache_update
+	else
+		debug-print "No icon files to add to cache"
+	fi
+
+	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
+		xdg_mimeinfo_database_update
+	else
+		debug-print "No mime info files to add to database"
+	fi
+}
+
+# @FUNCTION: _xdg_pkg_postrm
+# @DESCRIPTION: Forked from future xdg.eclass. REMOVEME!
+# Handle desktop, icon and mime info database updates.
+_xdg_pkg_postrm() {
+	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
+		xdg_desktop_database_update
+	else
+		debug-print "No .desktop files to add to database"
+	fi
+
+	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
+		_xdg_icon_cache_update
+	else
+		debug-print "No icon files to add to cache"
+	fi
+
+	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
+		xdg_mimeinfo_database_update
+	else
+		debug-print "No mime info files to add to database"
+	fi
+}
+
 # @FUNCTION: kde5_pkg_preinst
 # @DESCRIPTION:
 # Sets up environment variables required in kde5_pkg_postinst.
@@ -724,7 +839,8 @@ kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ ${EAPI} == 6 ]] && gnome2_icon_savelist
-	xdg_pkg_preinst
+	[[ ${EAPI} == 6 ]] && xdg_pkg_preinst
+	[[ ${EAPI} == 7 ]] && _xdg_pkg_preinst
 }
 
 # @FUNCTION: kde5_pkg_postinst
@@ -736,7 +852,8 @@ kde5_pkg_postinst() {
 	if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	xdg_pkg_postinst
+	[[ ${EAPI} == 6 ]] && xdg_pkg_postinst
+	[[ ${EAPI} == 7 ]] && _xdg_pkg_postinst
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -757,7 +874,8 @@ kde5_pkg_postrm() {
 	if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	xdg_pkg_postrm
+	[[ ${EAPI} == 6 ]] && xdg_pkg_postrm
+	[[ ${EAPI} == 7 ]] && _xdg_pkg_postrm
 }
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b40e8d4d8fbad08d9e7f2dfe0545f89f1e4afac3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 19:10:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 19:10:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b40e8d4d

kde5-functions: Raise FRAMEWORKS_MINIMAL to 5.54.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 6ad74bd966..2abcfbbbef 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -36,21 +36,15 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		[[ ${PV} = 5.52.0* ]] && : ${QT_MINIMAL:=5.9.4}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.14.90 || ${PV} = 5.15.49* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.54.0}
-		fi
+		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;
 	kde-apps)
 		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
-		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != ??.??.49* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.54.0}
-		fi
 		;;
 esac
 
@@ -62,7 +56,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.52.0}
+: ${FRAMEWORKS_MINIMAL:=5.54.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     23bc3bb180fa9543ae7c5ea90a71896e543f64a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 23:46:06 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 23:46:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=23bc3bb1

kde5-functions.eclass: Drop obsolete kde-apps min deps

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2abcfbbbef..4a62e5210a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -43,9 +43,6 @@ case ${CATEGORY} in
 			: ${FRAMEWORKS_MINIMAL:=9999}
 		fi
 		;;
-	kde-apps)
-		[[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4}
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c2eb12455e2df5c2080beaa03d7ba1937d738b9a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 10:27:54 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 10:27:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2eb1245

kde5.eclass: Mark KDE Plasma 5.15.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ed83170a6a..95533d2e4f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -158,7 +158,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-18.12.2 kde-frameworks-5.55.0 )
+KDE_UNRELEASED=( kde-apps-18.12.2 kde-frameworks-5.55.0 kde-plasma-5.15.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0c10b13557e7631bb47061c7b5c7d98b02727efe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 12:51:06 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 12:51:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c10b135

kde5.eclass: Mark KDE Applications 18.12.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 95533d2e4f..86146f1a95 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -158,7 +158,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-18.12.2 kde-frameworks-5.55.0 kde-plasma-5.15.0 )
+KDE_UNRELEASED=( kde-frameworks-5.55.0 kde-plasma-5.15.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     db66713c646b7ad86c7938eae2029fb34f6f3275
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 13:32:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 13:32:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db66713c

kde5.eclass: Mark KDE Frameworks 5.55.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 86146f1a95..26637fc2fd 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -158,7 +158,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.55.0 kde-plasma-5.15.0 )
+KDE_UNRELEASED=( kde-plasma-5.15.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6256167912b5a570c5ac0f89b9935d1c2ee4481f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 11:32:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 11:32:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=62561679

kde5.eclass: Mark KDE Plasma 5.15.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 26637fc2fd..c7f13aa623 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -158,7 +158,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.15.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e3ccedd5f7da8862eeb612a7777f731b48f10715
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 22:09:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 18:26:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e3ccedd5

kde5.eclass: Drop gnome2_icon_cache_update (now duplicate in EAPI-6)

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b25679a76c..1167e2c532 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -723,7 +723,6 @@ kde5_src_install() {
 kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ ${EAPI} == 6 ]] && gnome2_icon_savelist
 	xdg_pkg_preinst
 }
 
@@ -733,9 +732,6 @@ kde5_pkg_preinst() {
 kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
 	xdg_pkg_postinst
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
@@ -754,9 +750,6 @@ kde5_pkg_postinst() {
 kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
-		gnome2_icon_cache_update
-	fi
 	xdg_pkg_postrm
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     729fb4bab1f0cdc5e81e7a4d9af4db7717764b94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 21:51:07 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 18:26:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=729fb4ba

kde5.eclass: Cleanup functions rented from xdg.eclass

This reverts 16e6b9bc.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 128 +++--------------------------------------------------
 1 file changed, 5 insertions(+), 123 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c7f13aa623..b25679a76c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -31,11 +31,10 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic kde5-functions virtualx
+inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
 
 case ${EAPI} in
-	6) inherit eapi7-ver eutils gnome2-utils xdg ;;
-	7) inherit xdg-utils ;;
+	6) inherit eapi7-ver eutils gnome2-utils ;;
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -718,120 +717,6 @@ kde5_src_install() {
 	fi
 }
 
-# @FUNCTION: _xdg_icon_cache_update
-# @DESCRIPTION: Forked from future xdg-utils.eclass. REMOVEME!
-# Updates Gtk+ icon cache files under /usr/share/icons.
-# This function should be called from pkg_postinst and pkg_postrm.
-_xdg_icon_cache_update() {
-	if [[ ${EBUILD_PHASE} != post* ]] ; then
-		die "xdg_icon_cache_update must be used in pkg_post* phases."
-	fi
-
-	if ! type gtk-update-icon-cache &>/dev/null; then
-		debug-print "gtk-update-icon-cache is not found"
-		return
-	fi
-
-	ebegin "Updating icons cache"
-	local retval=0
-	local fails=( )
-	for dir in "${EROOT%/}"/usr/share/icons/*
-	do
-		if [[ -f "${dir}/index.theme" ]] ; then
-			local rv=0
-			gtk-update-icon-cache -qf "${dir}"
-			rv=$?
-			if [[ ! $rv -eq 0 ]] ; then
-				debug-print "Updating cache failed on ${dir}"
-				# Add to the list of failures
-				fails+=( "${dir}" )
-				retval=2
-			fi
-		elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
-			# Clear stale cache files after theme uninstallation
-			rm "${dir}/icon-theme.cache"
-		fi
-		if [[ -z $(ls "${dir}") ]]; then
-			# Clear empty theme directories after theme uninstallation
-			rmdir "${dir}"
-		fi
-	done
-	eend ${retval}
-	for f in "${fails[@]}" ; do
-		eerror "Failed to update cache with icon $f"
-	done
-}
-
-# @FUNCTION: _xdg_pkg_preinst
-# @DESCRIPTION: Forked from future xdg.eclass. REMOVEME!
-# Finds .desktop, icon and mime info files for later handling in pkg_postinst.
-# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_ICONFILES
-# and XDG_ECLASS_MIMEINFOFILES respectively.
-_xdg_pkg_preinst() {
-	local f
-
-	XDG_ECLASS_DESKTOPFILES=()
-	while IFS= read -r -d '' f; do
-		XDG_ECLASS_DESKTOPFILES+=( ${f} )
-	done < <(cd "${ED}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
-
-	XDG_ECLASS_ICONFILES=()
-	while IFS= read -r -d '' f; do
-		XDG_ECLASS_ICONFILES+=( ${f} )
-	done < <(cd "${ED}" && find 'usr/share/icons' -type f -print0 2>/dev/null)
-
-	XDG_ECLASS_MIMEINFOFILES=()
-	while IFS= read -r -d '' f; do
-		XDG_ECLASS_MIMEINFOFILES+=( ${f} )
-	done < <(cd "${ED}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
-}
-
-# @FUNCTION: _xdg_pkg_postinst
-# @DESCRIPTION: Forked from future xdg.eclass. REMOVEME!
-# Handle desktop, icon and mime info database updates.
-_xdg_pkg_postinst() {
-	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
-		xdg_desktop_database_update
-	else
-		debug-print "No .desktop files to add to database"
-	fi
-
-	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
-		_xdg_icon_cache_update
-	else
-		debug-print "No icon files to add to cache"
-	fi
-
-	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
-		xdg_mimeinfo_database_update
-	else
-		debug-print "No mime info files to add to database"
-	fi
-}
-
-# @FUNCTION: _xdg_pkg_postrm
-# @DESCRIPTION: Forked from future xdg.eclass. REMOVEME!
-# Handle desktop, icon and mime info database updates.
-_xdg_pkg_postrm() {
-	if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then
-		xdg_desktop_database_update
-	else
-		debug-print "No .desktop files to add to database"
-	fi
-
-	if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then
-		_xdg_icon_cache_update
-	else
-		debug-print "No icon files to add to cache"
-	fi
-
-	if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then
-		xdg_mimeinfo_database_update
-	else
-		debug-print "No mime info files to add to database"
-	fi
-}
-
 # @FUNCTION: kde5_pkg_preinst
 # @DESCRIPTION:
 # Sets up environment variables required in kde5_pkg_postinst.
@@ -839,8 +724,7 @@ kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ ${EAPI} == 6 ]] && gnome2_icon_savelist
-	[[ ${EAPI} == 6 ]] && xdg_pkg_preinst
-	[[ ${EAPI} == 7 ]] && _xdg_pkg_preinst
+	xdg_pkg_preinst
 }
 
 # @FUNCTION: kde5_pkg_postinst
@@ -852,8 +736,7 @@ kde5_pkg_postinst() {
 	if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	[[ ${EAPI} == 6 ]] && xdg_pkg_postinst
-	[[ ${EAPI} == 7 ]] && _xdg_pkg_postinst
+	xdg_pkg_postinst
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -874,8 +757,7 @@ kde5_pkg_postrm() {
 	if [[ ${EAPI} == 6 && -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	[[ ${EAPI} == 6 ]] && xdg_pkg_postrm
-	[[ ${EAPI} == 7 ]] && _xdg_pkg_postrm
+	xdg_pkg_postrm
 }
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     14708bf89e530a1755a84c351963fbeba73fe760
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 22:34:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 15:40:29 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14708bf8

kde5.eclass: Qt 5.12.1 is changing qch doc location

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1167e2c532..ca96a6f7dc 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -702,9 +702,12 @@ kde5_src_install() {
 	# cmake can't find the tags and qthelp viewers can't find the docs
 	local p=$(best_version dev-qt/qtcore:5)
 	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	#todo: clean up trailing slash check when EAPI <7 is removed
-	if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
-		docompress -x /usr/share/doc/qt-${pv}
+	einfo "muha $pv"
+	if [[ ${pv} = 5.11* ]]; then
+		#todo: clean up trailing slash check when EAPI <7 is removed
+		if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
+			docompress -x /usr/share/doc/qt-${pv}
+		fi
 	fi
 
 	if [[ ${EAPI} = 6 ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d65587b84d15d98984a8c942b65ad95737b00237
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 15:47:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 15:51:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d65587b8

kde5.eclass: Drop bogus comment

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ca96a6f7dc..ab24346fa8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -702,7 +702,6 @@ kde5_src_install() {
 	# cmake can't find the tags and qthelp viewers can't find the docs
 	local p=$(best_version dev-qt/qtcore:5)
 	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	einfo "muha $pv"
 	if [[ ${pv} = 5.11* ]]; then
 		#todo: clean up trailing slash check when EAPI <7 is removed
 		if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3603015258476c34dde7d805abc9b5474fd6e4dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 13:32:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 13:29:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=36030152

cmake-utils.eclass: Fix _cmake_modify-cmakelists, add QA output

Bug: https://bugs.gentoo.org/674768
Reported-by: Fabio Rossi <rossi.f <AT> inwind.it>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 77c6d0481c..42a108976f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -419,13 +419,17 @@ _cmake_modify-cmakelists() {
 	grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
 
 	# Comment out all set (<some_should_be_user_defined_variable> value)
-	# TODO Add QA checker - inform when variable being checked for below is set in CMakeLists.txt
-	find "${CMAKE_USE_DIR}" -name CMakeLists.txt \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX.*)/{s/^/#IGNORE /g}' {} + \
-		-exec sed -i -e '/^[[:space:]]*[sS][eE][tT][[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE.*)/{s/^/#IGNORE /g}' {} + \
-		|| die "${LINENO}: failed to disable hardcoded settings"
+	find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#G_cmake_modify_IGNORE /g}' \
+		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
+	local x
+	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do
+		eqawarn "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
+		eqawarn "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
+	done
 
 	# NOTE Append some useful summary here
 	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7c516e7945fb36b6ca1a3678c76e854309c5096e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 14:15:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 14:15:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c516e79

kde5-functions.eclass: For Plasma 5.16, raise QT_MINIMAL to 5.12.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4a62e5210a..b8c52efa9f 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -41,6 +41,7 @@ case ${CATEGORY} in
 		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
+			: ${QT_MINIMAL:=5.12.1}
 		fi
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e589582cd77076585f86a4f15d97cd9fa4063bc2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 15:06:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 15:06:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e589582c

kde5.eclass: Mark KDE Frameworks 5.56 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ab24346fa8..4f2e02aad4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.56.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e8bba0d97c5a3833f80d67ec5cdd4e00816aad9d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 08:36:24 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 08:36:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8bba0d9

kde5.eclass: Mark KDE Applications 18.12.3 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4f2e02aad4..adb58b5c98 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.56.0 )
+KDE_UNRELEASED=( kde-frameworks-5.56.0 kde-apps-18.12.3 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     23572d7c6c068e16103d32fe36f01079f119de14
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 15:00:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 13:20:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=23572d7c

kde5.eclass: Mark KDE Applications 18.12.3 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index adb58b5c98..4f2e02aad4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.56.0 kde-apps-18.12.3 )
+KDE_UNRELEASED=( kde-frameworks-5.56.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a6d701155259d6ccc94ec842a7c3eaa8988fde95
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 15:32:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 15:32:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a6d70115

kde5.eclass: Mark KDE Frameworks 5.56.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4f2e02aad4..ab24346fa8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.56.0 )
+KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1debd19eec34f515be260b716d2c943828fcd00e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 12:13:20 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 12:13:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1debd19e

kde5-functions.eclass: kde-apps-19.04 already depend on >=KF-5.56

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b8c52efa9f..b30b528a91 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -44,6 +44,9 @@ case ${CATEGORY} in
 			: ${QT_MINIMAL:=5.12.1}
 		fi
 		;;
+	kde-apps)
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=5.56.0}
+		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dfe356a63edcc031ba797baf2b755f4afbef476a
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar 15 22:21:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 23:17:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfe356a6

kde5.eclass: HOMEPAGE: Fix www.kde.org to kde.org redirection

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ab24346fa8..c1fd43bec3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -162,9 +162,9 @@ KDE_UNRELEASED=( )
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"
 elif [[ ${KMNAME} = kdepim ]]; then
-	HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+	HOMEPAGE="https://kde.org/applications/office/kontact/"
 else
-	HOMEPAGE="https://www.kde.org/"
+	HOMEPAGE="https://kde.org/"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d1efe7ded0662d94cd56bebfd8c1b048a7d11b9b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 15:31:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 15:31:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1efe7de

kde5.eclass: Drop obsolete KMNAME=kdepim HOMEPAGE switch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 30147d4fc7..bfab5f0297 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -161,8 +161,6 @@ KDE_UNRELEASED=( )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"
-elif [[ ${KMNAME} = kdepim ]]; then
-	HOMEPAGE="https://kde.org/applications/office/kontact/"
 else
 	HOMEPAGE="https://kde.org/"
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b6ac49a3f723a0f9d363f7d3b9c0bac9738ca720
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 15:29:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 15:29:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6ac49a3

kde5.eclass: Drop obsolete kdevelop-pg-qt SRC_URI switch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c1fd43bec3..30147d4fc7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -356,22 +356,14 @@ _calculate_src_uri() {
 	esac
 
 	if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
-		local _kdebase
-		case ${PN} in
-			kdevelop-pg-qt)
-				_kdebase=${PN} ;;
-			*)
-				_kdebase=${KDEBASE} ;;
-		esac
 		case ${PV} in
 			*.*.[6-9]? )
-				SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz"
+				SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz"
 				RESTRICT+=" mirror"
 				;;
 			*)
-				SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
+				SRC_URI="mirror://kde/stable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
 		esac
-		unset _kdebase
 	fi
 
 	if _kde_is_unreleased ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3464a0b588491a6780f62c1008e4bd4b0942ba10
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 16:03:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 16:03:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3464a0b5

kde5.eclass: Drop obsolete KDEBASE=kdevelop HOMEPAGE switch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index bfab5f0297..03d6b15c95 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -159,12 +159,7 @@ fi
 # a proper error message via pkg_nofetch.
 KDE_UNRELEASED=( )
 
-if [[ ${KDEBASE} = kdevelop ]]; then
-	HOMEPAGE="https://www.kdevelop.org/"
-else
-	HOMEPAGE="https://kde.org/"
-fi
-
+HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 
 SLOT=5

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     723c637773383c874d41ce39bed795189d9096ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 16:51:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 16:51:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=723c6377

kde5-functions.eclass: Drop obsolete kdevelop detection/KDEBASE var

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b30b528a91..d4766f01a2 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -75,17 +75,6 @@ esac
 # Minimum version of active GCC to require. This is checked in kde5.eclass in
 # kde5_pkg_pretend and kde5_pkg_setup.
 
-# @ECLASS-VARIABLE: KDEBASE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# This gets set to a non-zero value when a package is considered a
-# kdevelop ebuild.
-if [[ ${KMNAME-${PN}} = kdevelop ]]; then
-	KDEBASE=kdevelop
-fi
-
-debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
-
 # @FUNCTION: _check_gcc_version
 # @INTERNAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f080d65a8c7647ad20377ac1f4e2b10331b66a61
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 16:23:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 16:27:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f080d65a

kde5.eclass: Drop KDEBASE=kdevelop from SRC_URI assembly

Only 3 packages are using it at this point.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 03d6b15c95..3bd78aa79a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -348,14 +348,14 @@ _calculate_src_uri() {
 			;;
 	esac
 
-	if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
+	if [[ ${PN} = kdevelop* ]]; then
 		case ${PV} in
 			*.*.[6-9]? )
-				SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz"
+				SRC_URI="mirror://kde/unstable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz"
 				RESTRICT+=" mirror"
 				;;
 			*)
-				SRC_URI="mirror://kde/stable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
+				SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
 		esac
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fbc998ce9c6c95644b027ea9e8bf11f94e078f98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 18:26:26 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 18:26:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbc998ce

kde5.eclass: Support kdevelop* stable branches

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7dda037017..e2aae0f652 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -391,6 +391,10 @@ _calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
+	if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then
+		EGIT_BRANCH="$(ver_cut 1-2)"
+	fi
+
 	EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2aebbf5e342c0ca0247ba49fce48b42ae83dbf94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 16:34:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 16:34:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2aebbf5e

kde5.eclass: Drop obsolete KDEBASE=kdevelop source dir switch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3bd78aa79a..7dda037017 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -275,14 +275,6 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
-if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then
-	if [[ -n ${KMNAME} ]]; then
-		S=${WORKDIR}/${KMNAME}-${PV}
-	else
-		S=${WORKDIR}/${P}
-	fi
-fi
-
 _kde_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6e3beb49558546ee54f2b9a17d3c16807f431408
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 12:22:08 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 17:24:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e3beb49

kde5.eclass: Drop obsolete kde-apps-18.08.3 specific quirk

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e2aae0f652..14aa80ef27 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -198,11 +198,6 @@ case ${KDE_AUTODEPS} in
 		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
-
-		if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then
-			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+=" !kde-apps/kde-l10n"
-		fi
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     50db63959dff4145a84abf9db6dd4804d37c9cdd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 13:08:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 17:23:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=50db6395

kde5-functions: Raise PLASMA_MINIMAL=5.14.5, KDE_APPS_MINIMAL=18.12.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d4766f01a2..9c77315a34 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -62,12 +62,12 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.12.5}
+: ${PLASMA_MINIMAL:=5.14.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=18.08.3}
+: ${KDE_APPS_MINIMAL:=18.12.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     114eae4ccb5b0a9bf2ef308b664abc9374d10f3e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 21:37:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 21:37:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=114eae4c

kde5-functions.eclass: kde-apps-19* depend on FRAMEWORKS_MINIMAL=5.56.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 9c77315a34..35e81e2afe 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,7 +45,7 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=5.56.0}
+		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 19* ]] && : ${FRAMEWORKS_MINIMAL:=5.56.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7d4d293115f79346e7dd2f304ee9be13f500aaed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 20:01:37 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 20:01:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d4d2931

kde5.eclass: Mark KDE Frameworks 5.57.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 14aa80ef27..37edf5581b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.57.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8e07e1ccff7ba3e5e79959b9d5b0bed3b16e09ed
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 09:45:21 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 09:45:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e07e1cc

kde5.eclass: Mark KDE Applications 19.04.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 37edf5581b..96749f3b27 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.57.0 )
+KDE_UNRELEASED=( kde-apps-19.04.0 kde-frameworks-5.57.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c5bcb7a46709512cf3677658b61b88f36fbb0530
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 20:49:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 20:50:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5bcb7a4

eclass: Mark KDE Frameworks 5.57.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 96749f3b27..2f43a1920e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.04.0 kde-frameworks-5.57.0 )
+KDE_UNRELEASED=( kde-apps-19.04.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e21eb0553c056ca40df2f571db0bda79f56aa95b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 10:57:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 14:32:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e21eb055

kde5.eclass: Mark KDE Applications 19.04.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2f43a1920e..14aa80ef27 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.04.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2fd0c646eeb7962cdcbfcdcb9fbedd0a61abdde0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 15:52:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 15:52:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2fd0c646

kde5-functions.eclass: Set >=kde-apps-19.04 FRAMEWORKS_MINIMAL=5.57.0

Sync with upstream live as well as Gentoo ebuild repo.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 35e81e2afe..711b0121e1 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -45,7 +45,7 @@ case ${CATEGORY} in
 		fi
 		;;
 	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 19* ]] && : ${FRAMEWORKS_MINIMAL:=5.56.0}
+		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 19* ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     0957f99dcbfa6585b93828a9f3373601c3e71ca9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 12:50:13 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 12:53:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0957f99d

kde5.eclass: install linguas-related files unconditionally for kconfigwidgets

See https://api.kde.org/frameworks/kconfigwidgets/html/klanguagename_8cpp_source.html#l00040
for source reference.

Reported-by: Andrius Štikonas <andrius <AT> stikonas.eu>
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 eclass/kde5.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 14aa80ef27..40a146e33c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -497,7 +497,10 @@ kde5_src_prepare() {
 	fi
 
 	# enable only the requested translations when required
-	if [[ -v LINGUAS ]] ; then
+	# 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
+	if [[ -v LINGUAS && ${PN} != kconfigwidgets ]] ; then
 		local po
 		for po in ${KDE_PO_DIRS}; do
 		if [[ -d ${po} ]] ; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d10f88b18009ff9b41ddd60091c3a3af23adfb1a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 08:51:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May  7 21:41:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d10f88b1

kde5.eclass: Mark KDE Applications 19.04.1 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 40a146e33c..9d6ef09bf9 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-19.04.1 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ad28fe1d1e353c6eb5cc73d940a754b0954f2e5c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 10:11:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May  8 06:08:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad28fe1d

kde5-functions.eclass: Raise KDE Plasma 5.16 QT_MINIMAL to 5.12.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 711b0121e1..f963e55506 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,9 +39,10 @@ case ${CATEGORY} in
 		;;
 	kde-plasma)
 		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
-		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
+		[[ ${PV} = 5.15.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.12.1}
+			: ${QT_MINIMAL:=5.12.3}
 		fi
 		;;
 	kde-apps)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e3b112c800bfd9d03b6523f0e027471449bfd33f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 17:45:09 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May  8 06:08:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e3b112c8

kde5.eclass: Mark KDE Frameworks 5.58 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9d6ef09bf9..9f04b4dd9a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.04.1 )
+KDE_UNRELEASED=( kde-apps-19.04.1 kde-frameworks-5.58.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     282f7df15847d594365fd4d70fd949cf88f54384
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 16:38:07 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May  9 16:38:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=282f7df1

kde5.eclass: Mark KDE Applications 19.04.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9f04b4dd9a..31873bf7b0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.04.1 kde-frameworks-5.58.0 )
+KDE_UNRELEASED=( kde-frameworks-5.58.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     39a157156e0764ff5847eafd5a74a222dcca5c7a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 07:47:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 14 07:47:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=39a15715

kde5.eclass: Mark KDE Frameworks 5.58 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 31873bf7b0..843e667902 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,8 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.58.0 )
-
+KDE_UNRELEASED=( )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b661a0cfd3f9238a2bcefb1eb3661a652abe5807
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 16:42:18 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 16:42:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b661a0cf

cmake-utils.eclass: _cmake_modify-cmakelists: eqawarn -> einfo

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 42a108976f..d01a64d014 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -427,8 +427,8 @@ _cmake_modify-cmakelists() {
 		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
 	local x
 	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do
-		eqawarn "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
-		eqawarn "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
+		einfo "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
+		einfo "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
 	done
 
 	# NOTE Append some useful summary here

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     70a6870c9a52bde808430f2ae48bc4531c051d80
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 09:16:35 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 16 09:17:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70a6870c

kde5.eclass: remove app-arch/xz-utils DEPEND

It was only ever added for unpacking, and it appears in @system now.

Bug: https://bugs.gentoo.org/685914

 eclass/kde5.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 843e667902..f39d63e314 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -303,8 +303,6 @@ _calculate_src_uri() {
 			;;
 	esac
 
-	DEPEND+=" app-arch/xz-utils"
-
 	case ${CATEGORY} in
 		kde-apps)
 			case ${PV} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2c88c0df1b3852eb8df40a4ed2f539acc5c2174c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 11:56:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 16 13:59:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2c88c0df

kde5-functions: Set FRAMEWORKS_MINIMAL, QT_MINIMAL for Plasma 5.16

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f963e55506..61d0fa6e48 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -40,6 +40,10 @@ case ${CATEGORY} in
 	kde-plasma)
 		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
 		[[ ${PV} = 5.15.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
+		if [[ ${PV} = 5.15.90 || ${PV} = 5.16* ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.58.0}
+			: ${QT_MINIMAL:=5.12.3}
+		fi
 		if [[ ${KDE_BUILD_TYPE} = live ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
 			: ${QT_MINIMAL:=5.12.3}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     415e306cd99d2d51e9473fe7e3d3974cf9300e61
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 02:21:13 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 18 02:21:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=415e306c

kde5.eclass: remove dev-util/desktop-file-utils dependency

This only ever used indirectly via xdg_pkg_* and xdg.eclass handles the
dependency as well.

Bug: https://bugs.gentoo.org/685914

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f39d63e314..1b1518f52f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -261,7 +261,7 @@ case ${EAPI} in
 	6) DEPEND+=" ${BDEPEND}" ;;
 esac
 
-DEPEND+=" ${COMMONDEPEND} dev-util/desktop-file-utils"
+DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7cfb20cb0a483eeb4bf1bf513fa0c661df4c52f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 19:20:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 18 19:20:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7cfb20cb

kde5-functions.eclass: Set FRAMEWORKS_MINIMAL=5.57.0, cleanup versions

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 61d0fa6e48..d87dbcf904 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,19 +38,10 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
-		[[ ${PV} = 5.15.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
-		if [[ ${PV} = 5.15.90 || ${PV} = 5.16* ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.58.0}
-			: ${QT_MINIMAL:=5.12.3}
-		fi
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.12.3}
-		fi
-		;;
-	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live || ${PV} = 19* ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0}
+		[[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1}
+		[[ ${PV} = 5.15.90 || ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0}
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		: ${QT_MINIMAL:=5.12.3}
 		;;
 esac
 
@@ -62,7 +53,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.54.0}
+: ${FRAMEWORKS_MINIMAL:=5.57.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     974a58ec160962dab8e9f883befdd68054f8a8fa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 15:44:26 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 15:44:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=974a58ec

cmake-utils.eclass: Fix typo

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index d01a64d014..28dac7e0a0 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -423,7 +423,7 @@ _cmake_modify-cmakelists() {
 		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
 		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
 		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#G_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
 		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
 	local x
 	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e805777440326a241ed04343a995ed0cecddd682
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 16:15:29 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 16:48:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8057774

cmake-utils.eclass: _cmake_modify-cmakelists: Fix CMAKE_BUILD_TYPE sed

Commit 6b7998b narrowed matching CMAKE_BUILD_TYPE too successfully and led
to a string like `set(CMAKE_BUILD_TYPE)` being left over.

Bug: https://bugs.gentoo.org/674768
Closes: https://bugs.gentoo.org/686266
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 28dac7e0a0..ea1858e973 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -420,7 +420,7 @@ _cmake_modify-cmakelists() {
 
 	# Comment out all set (<some_should_be_user_defined_variable> value)
 	find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE\([[:space:]].*)\|)\)/I{s/^/#_cmake_modify_IGNORE /g}' \
 		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
 		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
 		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c8642cc9d7bda21097ac8104dccb166f9f7a9c2b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 18:42:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 19:16:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8642cc9

kde5.eclass: Mark KDE Plasma 5.16.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1b1518f52f..dd08d12174 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.16.0 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     690aa9a020cd6f764e8b7cc78eda5a1c2a813f9b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 21:38:08 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 20:36:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=690aa9a0

kde5.eclass: Mark KDE Frameworks 5.59.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index dd08d12174..0909ddc107 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.16.0 )
+KDE_UNRELEASED=( kde-plasma-5.16.0 kde-frameworks-5.59.0 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     56d8ec046f68abbe215785a3b84556c03a475c08
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 08:59:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 08:59:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=56d8ec04

kde5.eclass: Mark KDE Frameworks 5.59.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0909ddc107..dd08d12174 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.16.0 kde-frameworks-5.59.0 )
+KDE_UNRELEASED=( kde-plasma-5.16.0 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b2f9f632cfb4c89d8d4d9e6e5246d6404a6b66bf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 10:18:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 10:18:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b2f9f632

kde5.eclass: Mark KDE Plasma 5.16.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index dd08d12174..1b1518f52f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.16.0 )
+KDE_UNRELEASED=( )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5107104321aa417b4b8064a8bb97ae119d26cd32
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 13:07:09 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 13:07:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=51071043

kde5-functions.eclass: Raise QT_MINIMAL to 5.12.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d87dbcf904..4b3d5532f7 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -36,19 +36,19 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		[[ ${PV} = 5.57* || ${PV} = 5.59* ]] && : ${QT_MINIMAL:=5.11.1}
 		;;
 	kde-plasma)
 		[[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1}
-		[[ ${PV} = 5.15.90 || ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0}
+		[[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		: ${QT_MINIMAL:=5.12.3}
 		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.
-: ${QT_MINIMAL:=5.11.1}
+: ${QT_MINIMAL:=5.12.3}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0d02e25110a5220158b249cbf3fda9c718f6a6fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 11:34:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 11:34:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d02e251

kde5.eclass: kde-frameworks/kdewebkit moved to portingAids

Upstream commit 0ae8718ff3319597a9869ff825d40dd244e1d901

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1b1518f52f..3e43213d7e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -301,6 +301,9 @@ _calculate_src_uri() {
 		kross)
 			_kmname="portingAids/${_kmname}"
 			;;
+		kdewebkit)
+			[[ ${PV} = 5.5?.* ]] || _kmname="portingAids/${_kmname}"
+			;;
 	esac
 
 	case ${CATEGORY} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     60cc57c951cfa2da308907ed3c7b2f8ee8e5660f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 08:20:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 08:20:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=60cc57c9

kde5.eclass: Mark KDE Frameworks 5.60.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3e43213d7e..b1b14a82bb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.60.0 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     77c10704ef00bf5aaa74327bdf039dcbefb210a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  9 08:14:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul  9 08:14:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=77c10704

kde5.eclass: Mark KDE Applications 19.04.3 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b1b14a82bb..a9a7c9db16 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.60.0 )
+KDE_UNRELEASED=( kde-frameworks-5.60.0 kde-apps-19.04.3 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     170e0750347a3e3ba6546170a6153951a16195d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 15:02:19 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 15:02:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=170e0750

kde5.eclass: Mark KDE Frameworks 5.60 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a9a7c9db16..314174a311 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.60.0 kde-apps-19.04.3 )
+KDE_UNRELEASED=( kde-apps-19.04.3 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5a0b95930b0b22f2d04e572c88dd770717189d7d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:33:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 09:33:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a0b9593

kde5-functions.eclass: Raise kde-apps FRAMEWORKS_MINIMAL to 5.60.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4b3d5532f7..3ee2b7590e 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -36,12 +36,17 @@ export KDE_BUILD_TYPE
 case ${CATEGORY} in
 	kde-frameworks)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		[[ ${PV} = 5.57* || ${PV} = 5.59* ]] && : ${QT_MINIMAL:=5.11.1}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1}
-		[[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0}
+		if [[ ${PV} = 5.15.5 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.57.0}
+			: ${QT_MINIMAL:=5.11.1}
+		fi
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
+		: ${FRAMEWORKS_MINIMAL:=5.60.0}
+		;;
+	kde-apps)
+		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3bd502ecef503d7ff4795e06d3e89c9f35462a4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 08:24:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 08:24:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bd502ec

kde5.eclass: Mark KDE Applications 19.04.3 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 314174a311..3e43213d7e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.04.3 )
+KDE_UNRELEASED=( )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8f863f85bc62ecb88622f2b8774ecfc4ba5ef009
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 19:20:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 19:20:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f863f85

kde5.eclass: Raise PLASMA_MINIMAL to 5.14.5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 3ee2b7590e..c341d657c5 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,10 +38,6 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		if [[ ${PV} = 5.15.5 ]]; then
-			: ${FRAMEWORKS_MINIMAL:=5.57.0}
-			: ${QT_MINIMAL:=5.11.1}
-		fi
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		: ${FRAMEWORKS_MINIMAL:=5.60.0}
 		;;
@@ -63,7 +59,7 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.14.5}
+: ${PLASMA_MINIMAL:=5.15.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bf49b10b6c0aa452d3b5b7c46a2c3d3a5ce7c8ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 19:34:54 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 19:34:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf49b10b

kde5-functions.eclass: Keep KDE Plasma 5.16 stable branch at KF 5.60

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index c341d657c5..0774e42d93 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -38,8 +38,8 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
+		[[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		: ${FRAMEWORKS_MINIMAL:=5.60.0}
 		;;
 	kde-apps)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0}

[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     6b5defd5f810ece692fa40a1fdc7693018cba506
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 17:12:33 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 11:07:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b5defd5

eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath

  Prefix/standalone does not need it.

Signed-Off-By: Benda Xu <heroxbd <AT> gentoo.org>

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ea1858e973..109b584afb 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -612,7 +612,7 @@ cmake-utils_src_configure() {
 		fi
 	fi
 
-	if [[ ${EPREFIX} ]]; then
+	if use prefix-guest; then
 		cat >> "${build_rules}" <<- _EOF_ || die
 			# in Prefix we need rpath and must ensure cmake gets our default linker path
 			# right ... except for Darwin hosts

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dd7132ded520c0585e1e11101248a7823a7dda15
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 10:47:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 10:47:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd7132de

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL to 5.60.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 0774e42d93..56aafd7eb6 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -41,9 +41,6 @@ case ${CATEGORY} in
 		[[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
-	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0}
-		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
@@ -54,7 +51,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.57.0}
+: ${FRAMEWORKS_MINIMAL:=5.60.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
@@ -64,7 +61,7 @@ esac
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=18.12.3}
+: ${KDE_APPS_MINIMAL:=19.04.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fde776e7dbb0761575aa5d81297fe19ac4ba23d5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 16:41:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 16:41:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fde776e7

kde5.eclass: Mark KDE Frameworks 5.61.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3e43213d7e..1cb707be92 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -151,13 +151,13 @@ fi
 # For any other value, that value will be used as subslot.
 : ${KDE_SUBSLOT:=false}
 
-# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @ECLASS-VARIABLE: KDE_fUNRELEASED
 # @INTERNAL
 # @DESCRIPTION
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.61.0 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a29793b4443c7877ae6bb78ed406a957027d4422
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 22:19:18 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 22:20:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a29793b4

kde5.eclass: Add KDE_DESIGNERPLUGIN handling for kde-frameworks/

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1cb707be92..de87173824 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -211,7 +211,11 @@ case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
 		IUSE+=" designer"
-		BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
+		if [[ ${CATEGORY} = kde-frameworks ]]; then
+			BDEPEND+=" designer? ( $(add_qt_dep designer) )"
+		else
+			BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
+		fi
 esac
 
 case ${KDE_EXAMPLES} in
@@ -602,8 +606,12 @@ kde5_src_configure() {
 		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON )
 	fi
 
-	if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
+	if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
+		if [[ ${CATEGORY} = kde-frameworks ]]; then
+			cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
+		else
+			cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) )
+		fi
 	fi
 
 	if [[ ${KDE_QTHELP} != false ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     331a1d5526c89a70c9dec7c56b27bbb1c19d5dc2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  8 22:37:51 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 22:37:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=331a1d55

kde5.eclass: Mark KDE Applications 19.08.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index de87173824..1ffc427341 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -157,7 +157,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.61.0 )
+KDE_UNRELEASED=( kde-frameworks-5.61.0 kde-apps-19.08.0 )
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     009c3d434e477c2ba0e6079e465d25582c735133
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 20:03:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 20:03:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=009c3d43

kde5.eclass: Mark KDE Frameworks 5.61.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 1ffc427341..38c0d0f125 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -151,13 +151,14 @@ fi
 # For any other value, that value will be used as subslot.
 : ${KDE_SUBSLOT:=false}
 
-# @ECLASS-VARIABLE: KDE_fUNRELEASED
+# @ECLASS-VARIABLE: KDE_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.61.0 kde-apps-19.08.0 )
+KDE_UNRELEASED=( kde-apps-19.08.0 )
+
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     84ffc64fc920cf397f9b74649d4f364692350c86
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 11:01:53 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 11:01:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=84ffc64f

kde5.eclass: KDE_DESIGNERPLUGIN: Make use of ECM 5.62.0 for KDE PIM

Recent git master KDE PIM repositories are making use of BUILD_DESIGNERPLUGIN
and the ECM facilities available since >=5.62.0 instead of kdesignerplugin.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 38c0d0f125..d6f70a9e9e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -187,6 +187,22 @@ case ${KDE_SUBSLOT} in
 		;;
 esac
 
+case ${KDE_DESIGNERPLUGIN} in
+	false)  ;;
+	*)
+		IUSE+=" designer"
+		if [[ ${CATEGORY} = kde-frameworks ]]; then
+			BDEPEND+=" designer? ( $(add_qt_dep designer) )"
+		else
+			if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]]; then
+				FRAMEWORKS_MINIMAL="5.62.0"
+				BDEPEND+=" designer? ( $(add_qt_dep designer) )"
+			else
+				BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
+			fi
+		fi
+esac
+
 case ${KDE_AUTODEPS} in
 	false)	;;
 	*)
@@ -208,17 +224,6 @@ case ${KDE_DEBUG} in
 		;;
 esac
 
-case ${KDE_DESIGNERPLUGIN} in
-	false)  ;;
-	*)
-		IUSE+=" designer"
-		if [[ ${CATEGORY} = kde-frameworks ]]; then
-			BDEPEND+=" designer? ( $(add_qt_dep designer) )"
-		else
-			BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
-		fi
-esac
-
 case ${KDE_EXAMPLES} in
 	false)  ;;
 	*)
@@ -611,7 +616,11 @@ kde5_src_configure() {
 		if [[ ${CATEGORY} = kde-frameworks ]]; then
 			cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
 		else
-			cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) )
+			if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] ; then
+				cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
+			else
+				cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) )
+			fi
 		fi
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7c94c8131ce82e52d3e7a16e011ef131d7e27869
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 14:33:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 14:33:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c94c813

kde5.eclass: Drop obsolete kde-frameworks/kdewebkit switch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d6f70a9e9e..d98499788e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -304,6 +304,7 @@ _calculate_src_uri() {
 
 	case ${PN} in
 		kdelibs4support | \
+		kdewebkit | \
 		khtml | \
 		kjs | \
 		kjsembed | \
@@ -311,9 +312,6 @@ _calculate_src_uri() {
 		kross)
 			_kmname="portingAids/${_kmname}"
 			;;
-		kdewebkit)
-			[[ ${PV} = 5.5?.* ]] || _kmname="portingAids/${_kmname}"
-			;;
 	esac
 
 	case ${CATEGORY} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     27a2d94179e245fc0e277a9c7d344d2d59e203a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 14:38:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 14:38:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=27a2d941

kde5.eclass: Drop obsolete QCH workaround for <Qt-5.12

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d98499788e..5faf4ebc75 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -693,17 +693,6 @@ kde5_src_install() {
 
 	cmake-utils_src_install
 
-	# We don't want QCH and tags files to be compressed, because then
-	# cmake can't find the tags and qthelp viewers can't find the docs
-	local p=$(best_version dev-qt/qtcore:5)
-	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	if [[ ${pv} = 5.11* ]]; then
-		#todo: clean up trailing slash check when EAPI <7 is removed
-		if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
-			docompress -x /usr/share/doc/qt-${pv}
-		fi
-	fi
-
 	if [[ ${EAPI} = 6 ]]; then
 		# We don't want /usr/share/doc/HTML to be compressed,
 		# because then khelpcenter can't find the docs

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cdfec56ee32e575701879c1f5a5734da1d00a60b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 15:06:54 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 16:27:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cdfec56e

kde5.eclass: Drop obsolete KDE_BLOCK_SLOT4 var

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5faf4ebc75..5abcad3c70 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -62,12 +62,6 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # be set depending on the value of CATEGORY.
 : ${KDE_AUTODEPS:=true}
 
-# @ECLASS-VARIABLE: KDE_BLOCK_SLOT4
-# @DESCRIPTION:
-# This variable only has any effect when when CATEGORY = "kde-apps" and
-# KDE_AUTODEPS is also set. If set to "true", add RDEPEND block on kde-apps/${PN}:4
-: ${KDE_BLOCK_SLOT4:=true}
-
 # @ECLASS-VARIABLE: KDE_DEBUG
 # @DESCRIPTION:
 # If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and -DQT_NO_DEBUG

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     515b794db3ed8c07900fa3fd6ddc30cd7a50a482
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 11:20:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 11:20:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=515b794d

kde5.eclass: Mark KDE Applications 19.08.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 5abcad3c70..a67836b251 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -151,7 +151,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.08.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e0238ccd9b535aab8ab222c8a68b34773a9299fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 14:48:48 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 14:51:47 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0238ccd

kde5-functions.eclass: Drop EAPI-6 support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 48 +-------------------------------------------
 1 file changed, 1 insertion(+), 47 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 56aafd7eb6..e495fb8059 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
 # This eclass contains functions shared by the other KDE eclasses and forms
@@ -19,7 +19,6 @@ inherit toolchain-funcs
 
 case ${EAPI} in
 	7) ;;
-	6) inherit eapi7-ver ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -249,10 +248,6 @@ add_qt_dep() {
 
 	if [[ -z ${version} ]]; then
 		version=${QT_MINIMAL}
-		if [[ ${1} = qtwebkit ]]; then
-			version=5.9.1
-			[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later"
-		fi
 	fi
 	if [[ -z ${slot} ]]; then
 		slot="5"
@@ -261,47 +256,6 @@ add_qt_dep() {
 	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
-# @FUNCTION: get_kde_version [version]
-# @DESCRIPTION:
-# Translates an ebuild version into a major.minor KDE release version, taking
-# into account KDE's prerelease versioning scheme.
-# For example, get_kde_version 17.07.80 will return "17.08".
-# If the version equals 9999, "live" is returned.
-# If no version is specified, ${PV} is used.
-get_kde_version() {
-	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
-	local ver=${1:-${PV}}
-	local major=$(ver_cut 1 ${ver})
-	local minor=$(ver_cut 2 ${ver})
-	local micro=$(ver_cut 3 ${ver})
-	if [[ ${ver} == 9999 ]]; then
-		echo live
-	else
-		(( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1))
-	fi
-}
-
-# @FUNCTION: kde_l10n2lingua
-# @USAGE: <l10n>...
-# @INTERNAL
-# @DESCRIPTION:
-# Output KDE lingua flag name(s) (without prefix(es)) appropriate for
-# given l10n(s).
-kde_l10n2lingua() {
-	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
-	local l
-	for l; do
-		case ${l} in
-			ca-valencia) echo ca@valencia;;
-			sr-ijekavsk) echo sr@ijekavian;;
-			sr-Latn-ijekavsk) echo sr@ijekavianlatin;;
-			sr-Latn) echo sr@latin;;
-			uz-Cyrl) echo uz@cyrillic;;
-			*) echo "${l/-/_}";;
-		esac
-	done
-}
-
 # @FUNCTION: punt_bogus_dep
 # @USAGE: <prefix> <dependency>
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b70549449af165b9f2473c2bee1b2b2d3af7e798
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 14:47:17 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 14:51:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b7054944

kde5.eclass: Drop EAPI-6 support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a67836b251..281399ac6d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -33,10 +33,6 @@ _KDE5_ECLASS=1
 
 inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
 
-case ${EAPI} in
-	6) inherit eapi7-ver eutils gnome2-utils ;;
-esac
-
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	inherit git-r3
 fi
@@ -261,10 +257,6 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
-case ${EAPI} in
-	6) DEPEND+=" ${BDEPEND}" ;;
-esac
-
 DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
@@ -624,9 +616,9 @@ kde5_src_configure() {
 		cmakeargs+=(
 			# install mkspecs in the same directory as qt stuff
 			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+			# move handbook outside of doc dir, bug 667138
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help"
 		)
-		# move handbook outside of doc dir for at least two QA warnings, bug 667138
-		[[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" )
 	fi
 
 	# allow the ebuild to override what we set here
@@ -679,22 +671,11 @@ kde5_src_test() {
 
 # @FUNCTION: kde5_src_install
 # @DESCRIPTION:
-# Wrapper for cmake-utils_src_install with extra logic to avoid compressing
-# certain types of files. For example, khelpcenter is not able to read
-# compressed handbooks.
+# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra.
 kde5_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	cmake-utils_src_install
-
-	if [[ ${EAPI} = 6 ]]; then
-		# We don't want /usr/share/doc/HTML to be compressed,
-		# because then khelpcenter can't find the docs
-		#todo: clean up trailing slash check when EAPI <7 is removed
-		if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
-			docompress -x /usr/share/doc/HTML
-		fi
-	fi
 }
 
 # @FUNCTION: kde5_pkg_preinst

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     74d0d95d272483e766317f048e7762078158865d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 07:32:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 07:32:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=74d0d95d

kde5.eclass: Mark KDE Applications 19.08.1 unreleased

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 281399ac6d..cd57d14347 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -147,7 +147,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-19.08.1 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     418c19f1bd40af948d3dc553e448de80fa8bb4b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 18:13:04 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 18:20:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=418c19f1

kde5.eclass: Mark KDE Applications 19.08.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index cd57d14347..281399ac6d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -147,7 +147,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.08.1 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6513b0d7c1e8c7cb52e35cb3bc3a42d6568f6795
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 08:21:52 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 08:21:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6513b0d7

kde5.eclass: Mark KDE Frameworks 5.62 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 281399ac6d..d0f15d0f6c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -147,7 +147,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.62.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     37e7df794f57b0553acd230e67cf7a7ac3f773ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 12:23:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 12:23:47 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=37e7df79

kde5.eclass: kde-frameworks/kdesignerplugin moved to portingAids

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d0f15d0f6c..e44904ec18 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -298,6 +298,9 @@ _calculate_src_uri() {
 		kross)
 			_kmname="portingAids/${_kmname}"
 			;;
+		kdesignerplugin)
+			[[ ${PV} = 5.6[01].* ]] || _kmname="portingAids/${_kmname}"
+			;;
 	esac
 
 	case ${CATEGORY} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     aee4d8792578f65822cee9e22fc998722ca128c1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 11:49:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 11:49:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aee4d879

kde5.eclass: Mark KDE Frameworks 5.62 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e44904ec18..3ab9220914 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -147,7 +147,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.62.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     99feb75740769715f7b5b9ebec3e30f8e5114dc0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 16:23:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 16:23:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=99feb757

kde5-functions.eclass: Ensure kde-apps live is FRAMEWORKS_MINIMAL=5.62

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 1ce5a04461..ea802e0b25 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,6 +39,9 @@ case ${CATEGORY} in
 	kde-plasma)
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
+	kde-apps)
+		[[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.62.0}
+		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d4c0bdbe4d9c4dfc6170d7ff62dc8e5a81210901
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 16:20:25 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 16:20:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4c0bdbe

kde5-functions.eclass: Drop obsolete KDE Plasma 5.16 min deps switch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index e495fb8059..1ce5a04461 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,7 +37,6 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dde63a0857af89546bbd63a6603c9e7ce206d76a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 16:38:28 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 16:38:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dde63a08

kde5.eclass: KDE_DESIGNERPLUGIN min KF5 is set by kde5-functions.eclass

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3ab9220914..21ed9d2134 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -177,6 +177,20 @@ case ${KDE_SUBSLOT} in
 		;;
 esac
 
+case ${KDE_AUTODEPS} in
+	false)	;;
+	*)
+		BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
+		RDEPEND+=" >=kde-frameworks/kf-env-4"
+		COMMONDEPEND+=" $(add_qt_dep qtcore)"
+
+		# all packages need breeze/oxygen icons for basic iconset, bug #564838
+		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
+			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
+		fi
+		;;
+esac
+
 case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
@@ -185,7 +199,6 @@ case ${KDE_DESIGNERPLUGIN} in
 			BDEPEND+=" designer? ( $(add_qt_dep designer) )"
 		else
 			if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]]; then
-				FRAMEWORKS_MINIMAL="5.62.0"
 				BDEPEND+=" designer? ( $(add_qt_dep designer) )"
 			else
 				BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
@@ -193,20 +206,6 @@ case ${KDE_DESIGNERPLUGIN} in
 		fi
 esac
 
-case ${KDE_AUTODEPS} in
-	false)	;;
-	*)
-		BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
-		RDEPEND+=" >=kde-frameworks/kf-env-4"
-		COMMONDEPEND+=" $(add_qt_dep qtcore)"
-
-		# all packages need breeze/oxygen icons for basic iconset, bug #564838
-		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
-			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
-		fi
-		;;
-esac
-
 case ${KDE_DEBUG} in
 	false)	;;
 	*)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b04a558a6a31c565d3fa758f06ae20e4cd87acc4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 17:04:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 17:04:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b04a558a

kde5.eclass: Simplify KDE_DESIGNERPLUGIN BDEPENDs

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 21ed9d2134..979044a83c 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -195,14 +195,10 @@ case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
 		IUSE+=" designer"
-		if [[ ${CATEGORY} = kde-frameworks ]]; then
-			BDEPEND+=" designer? ( $(add_qt_dep designer) )"
+		if [[ ${CATEGORY} = kde-apps && ${PV} = 19.0[48]* ]]; then
+			BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
 		else
-			if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]]; then
-				BDEPEND+=" designer? ( $(add_qt_dep designer) )"
-			else
-				BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
-			fi
+			BDEPEND+=" designer? ( $(add_qt_dep designer) )"
 		fi
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     166b76af52b3e61be10eeea43cf45864fc71cec3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 17:24:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 23:56:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=166b76af

kde5.eclass: Add @SUPPORTED_EAPIS

The EAPI list is implicitly defined by kde5-functions inherit, so just
copy it over.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/kde5.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 979044a83c..b498d7e7a2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
 # kde@gentoo.org
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Support eclass for packages that follow KDE packaging conventions.
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c44a9b0fffa1393f95161e224eccafae5cdee478
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 09:15:14 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 09:15:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c44a9b0f

kde5-functions.eclass: Set KDE Plasma 5.17 FRAMEWORKS_MINIMAL to 5.62

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ea802e0b25..4cd5ac1eb9 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,6 +37,7 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
+		[[ ${PV} = 5.16.9[05] || ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.62.0}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-apps)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9c56481f0c8b8743af896cfbd214df6024a33d34
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 10:43:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 15:45:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c56481f

kde5.eclass: Mark KDE Plasma 5.16.90 (5.17 beta) unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b498d7e7a2..9bb19a0251 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.16.90 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c7a57aceba38d693ba436f561897ef78cfd6dd7c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 15:49:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 15:49:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7a57ace

kde5.eclass: Mark KDE Plasma 5.16.90 (5.17 beta) as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9bb19a0251..b498d7e7a2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.16.90 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7c3cf945bcf85eb707c18ad53486350479dca2fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 11:40:47 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 11:43:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c3cf945

kde5.eclass: Mark KDE Frameworks 5.63.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b498d7e7a2..d771673f95 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.63.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     da7eb837b55159a552e631d4f8833095f1f08f88
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 19:15:48 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 06:40:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=da7eb837

kde5.eclass: Mark KDE Applications 19.08.2 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d771673f95..7fc5c93bee 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.63.0 )
+KDE_UNRELEASED=( kde-frameworks-5.63.0 kde-apps-19.08.2 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     24b0c6727c7daefc418f0b2892bcc369eac53a92
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 11:20:42 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:51:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=24b0c672

kde5.eclass: Mark KDE Plasma 5.17.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7fc5c93bee..3257cd2878 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.63.0 kde-apps-19.08.2 )
+KDE_UNRELEASED=( kde-frameworks-5.63.0 kde-apps-19.08.2 kde-plasma-5.17.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ee8c1713a478e8647ee2b383e120d77b4afca9b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 18:40:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 18:40:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee8c1713

kde5.eclass: Mark KDE Applications 19.08.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 3257cd2878..239ba32591 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.63.0 kde-apps-19.08.2 kde-plasma-5.17.0 )
+KDE_UNRELEASED=( kde-frameworks-5.63.0 kde-plasma-5.17.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     455c2a367303c10046c6a249790e951a9471fdc5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 19:34:57 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 19:35:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=455c2a36

kde5.eclass: Mark KDE Frameworks 5.63.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 239ba32591..8b06d4b970 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.63.0 kde-plasma-5.17.0 )
+KDE_UNRELEASED=( kde-plasma-5.17.0 )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a28b7ca633dc8747535a6eba6a87b3354bf02afe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 12:51:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 12:51:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a28b7ca6

kde5.eclass: Mark KDE Plasma 5.17 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8b06d4b970..b498d7e7a2 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -148,7 +148,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.17.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c7a68cc9e472fd99cc216e5800fb7f148bd07a8d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 09:25:20 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 09:26:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7a68cc9

kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL (plasma-5.17,apps-19.12)

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 4cd5ac1eb9..516c22bb3e 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,11 +37,11 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.16.9[05] || ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.62.0}
+		[[ ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.62.0}
+		[[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0}
 		;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     eb6b1a655174307f52227f537180f8f07ca3c391
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 13:08:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 10:04:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb6b1a65

kde.org.eclass: New eclass

Support eclass for packages that are hosted on kde.org infrastructure.

This eclass is mainly providing facilities for the upstream release groups
Frameworks, Plasma, Applications to assemble default SRC_URI for tarballs,
set up git-r3.eclass for stable/master branch versions or restrict access to
unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may
be also used by any other package hosted on kde.org.
It also contains default meta variables for settings not specific to any
particular build system.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 241 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 241 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
new file mode 100644
index 0000000000..3f86779c52
--- /dev/null
+++ b/eclass/kde.org.eclass
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: kde.org.eclass
+# @MAINTAINER:
+# kde@gentoo.org
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Support eclass for packages that are hosted on kde.org infrastructure.
+# @DESCRIPTION:
+# This eclass is mainly providing facilities for the upstream release groups
+# Frameworks, Plasma, Applications to assemble default SRC_URI for tarballs,
+# set up git-r3.eclass for stable/master branch versions or restrict access to
+# unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may
+# be also used by any other package hosted on kde.org.
+# It also contains default meta variables for settings not specific to any
+# particular build system.
+
+if [[ -z ${_KDE_ORG_ECLASS} ]]; then
+_KDE_ORG_ECLASS=1
+
+# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @DESCRIPTION:
+# If PV matches "*9999*", this is automatically set to "live".
+# Otherwise, this is automatically set to "release".
+KDE_BUILD_TYPE="release"
+if [[ ${PV} = *9999* ]]; then
+	KDE_BUILD_TYPE="live"
+fi
+export KDE_BUILD_TYPE
+
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
+	inherit git-r3
+fi
+
+EXPORT_FUNCTIONS pkg_nofetch src_unpack
+
+# @ECLASS-VARIABLE: KDE_ORG_NAME
+# @DESCRIPTION:
+# If unset, default value is set to ${PN}.
+# Name of the package as hosted on kde.org mirrors.
+: ${KDE_ORG_NAME:=$PN}
+
+# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
+# @DESCRIPTION:
+# 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}
+
+case ${KDE_SELINUX_MODULE} in
+	none)   ;;
+	*)
+		IUSE+=" selinux"
+		RDEPEND+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} )"
+		;;
+esac
+
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+	SLOT=5/${PV}
+	[[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+fi
+
+# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @INTERNAL
+# @DESCRIPTION
+# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
+# Any package matching this will have fetch restriction enabled, and receive
+# a proper error message via pkg_nofetch.
+KDE_UNRELEASED=( )
+
+HOMEPAGE="https://kde.org/"
+
+_kde_is_unreleased() {
+	local pair
+	for pair in "${KDE_UNRELEASED[@]}" ; do
+		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+# Determine fetch location for released tarballs
+_calculate_src_uri() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local _src_uri="mirror://kde/"
+
+	case ${CATEGORY} in
+		kde-apps)
+			case ${PV} in
+				??.??.[6-9]? )
+					_src_uri+="unstable/applications/${PV}/src/"
+					RESTRICT+=" mirror"
+					;;
+				*) _src_uri+="stable/applications/${PV}/src/" ;;
+			esac
+			;;
+		kde-frameworks)
+			_src_uri+="stable/frameworks/$(ver_cut 1-2)/"
+			case ${PN} in
+				kdelibs4support | \
+				kdewebkit | \
+				khtml | \
+				kjs | \
+				kjsembed | \
+				kmediaplayer | \
+				kross)
+					_src_uri+="portingAids/"
+					;;
+				kdesignerplugin)
+					[[ ${PV} = 5.60.* ]] || _src_uri+="portingAids/"
+					;;
+			esac
+			;;
+		kde-plasma)
+			case ${PV} in
+				5.??.[6-9]? )
+					_src_uri+="unstable/plasma/$(ver_cut 1-3)/"
+					RESTRICT+=" mirror"
+					;;
+				*) _src_uri+="stable/plasma/$(ver_cut 1-3)/" ;;
+			esac
+			;;
+	esac
+
+	if [[ ${PN} = kdevelop* ]]; then
+		case ${PV} in
+			*.*.[6-9]? )
+				_src_uri+="unstable/kdevelop/${PV}/src/"
+				RESTRICT+=" mirror"
+				;;
+			*) _src_uri+="stable/kdevelop/${PV}/src/" ;;
+		esac
+	fi
+
+	SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz"
+
+	if _kde_is_unreleased ; then
+		RESTRICT+=" fetch"
+	fi
+}
+
+# Determine fetch location for live sources
+_calculate_live_repo() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	SRC_URI=""
+
+	# @ECLASS-VARIABLE: EGIT_MIRROR
+	# @DESCRIPTION:
+	# This variable allows easy overriding of default kde mirror service
+	# (anongit) with anything else you might want to use.
+	EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
+
+	if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+		EGIT_BRANCH="Applications/$(ver_cut 1-2)"
+	fi
+
+	if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
+	fi
+
+	if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then
+		EGIT_BRANCH="$(ver_cut 1-2)"
+	fi
+
+	# @ECLASS-VARIABLE: EGIT_REPONAME
+	# @DESCRIPTION:
+	# This variable allows overriding of default repository
+	# name. Specify only if this differs from PN and KDE_ORG_NAME.
+	EGIT_REPO_URI="${EGIT_MIRROR}/${EGIT_REPONAME:=$KDE_ORG_NAME}"
+}
+
+case ${KDE_BUILD_TYPE} in
+	live) _calculate_live_repo ;;
+	*)
+		_calculate_src_uri
+		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
+		;;
+esac
+
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	S=${WORKDIR}/${KDE_ORG_NAME}-${PV}
+fi
+
+# @FUNCTION: kde.org_pkg_nofetch
+# @DESCRIPTION:
+# Intended for use in the KDE overlay. If this package matches something in
+# KDE_UNRELEASED, display a giant warning that the package has not yet been
+# released upstream and should not be used.
+kde.org_pkg_nofetch() {
+	if ! _kde_is_unreleased ; then
+		return
+	fi
+
+	local sched_uri="https://community.kde.org/Schedules"
+	case ${CATEGORY} in
+		kde-frameworks) sched_uri+="/Frameworks" ;;
+		kde-plasma) sched_uri+="/Plasma_5" ;;
+		kde-apps) sched_uri+="/Applications/$(ver_cut 1-2)_Release_Schedule" ;;
+	esac
+
+	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
+	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
+	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"
+	eerror "| |_| | |\  |  _ <| |___| |___| |___ / ___ \ ___) | |___| |_| |"
+	eerror " \___/|_| \_|_| \_\_____|_____|_____/_/   \_\____/|_____|____/ "
+	eerror "                                                               "
+	eerror " ____   _    ____ _  __    _    ____ _____ "
+	eerror "|  _ \ / \  / ___| |/ /   / \  / ___| ____|"
+	eerror "| |_) / _ \| |   | ' /   / _ \| |  _|  _|  "
+	eerror "|  __/ ___ \ |___| . \  / ___ \ |_| | |___ "
+	eerror "|_| /_/   \_\____|_|\_\/_/   \_\____|_____|"
+	eerror
+	eerror "${CATEGORY}/${P} has not been released to the public yet"
+	eerror "and is only available to packagers right now."
+	eerror ""
+	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
+	eerror ""
+	eerror "Please consult the upstream release schedule to see when this "
+	eerror "package is scheduled to be released:"
+	eerror "${sched_uri}"
+}
+
+# @FUNCTION: kde.org_src_unpack
+# @DESCRIPTION:
+# Unpack the sources, automatically handling both release and live ebuilds.
+kde.org_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${KDE_BUILD_TYPE} = live ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     859e67bf5ecf754847584980bdef61572515751e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 13:39:53 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 11:52:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=859e67bf

kde5.eclass: Inherit kde.org.eclass and drop moved functions/vars

Functions moved to kde.org:
- _kde_is_unreleased
- _calculate_src_uri
- _calculate_live_repo
- kde5_pkg_nofetch
- kde5_src_unpack

Variables moved to kde.org:
- KDE_BUILD_TYPE
- KDE_SELINUX_MODULE
- KDE_UNRELEASED
- HOMEPAGE

Variables deprecated:
- KDE_SUBSLOT (define SLOT in ebuild)
- KMNAME (use KDE_ORG_NAME in kde.org.eclass instead)

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 223 ++++-------------------------------------------------
 1 file changed, 13 insertions(+), 210 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 8497e511e8..fe1da45da3 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -25,6 +25,12 @@
 if [[ -z ${_KDE5_ECLASS} ]]; then
 _KDE5_ECLASS=1
 
+# Propagate KMNAME to kde.org.eclass
+# PORTING: Use KDE_ORG_NAME from kde.org.eclass instead
+if [[ -z ${KDE_ORG_NAME} ]]; then
+	KDE_ORG_NAME=${KMNAME:=$PN}
+fi
+
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass manpage.
@@ -32,17 +38,13 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
-
-if [[ ${KDE_BUILD_TYPE} = live ]]; then
-	inherit git-r3
-fi
+inherit cmake-utils flag-o-matic kde.org kde5-functions virtualx xdg
 
 if [[ -v KDE_GCC_MINIMAL ]]; then
 	EXPORT_FUNCTIONS pkg_pretend
 fi
 
-EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
 # @DESCRIPTION:
@@ -127,37 +129,19 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${KDE_TEST:=false}
 
-# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
-# @DESCRIPTION:
-# 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}
-
 # @ECLASS-VARIABLE: KDE_SUBSLOT
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # If set to "true", add a subslot to the package, where subslot is either
 # defined as major.minor version for kde-*/ categories or ${PV} if other.
 # For any other value, that value will be used as subslot.
+# PORTING: no replacement, define in ebuild
 : ${KDE_SUBSLOT:=false}
 
-# @ECLASS-VARIABLE: KDE_UNRELEASED
-# @INTERNAL
-# @DESCRIPTION
-# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
-# Any package matching this will have fetch restriction enabled, and receive
-# a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
-
-HOMEPAGE="https://kde.org/"
+# PORTING: LICENSE no longer set by eclass, define in ebuild
 LICENSE="GPL-2"
-
-SLOT=5
-
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-	KDE_SUBSLOT=true
-fi
+# PORTING: SLOT no longer set by eclass except for kde-frameworks
+[[ ${CATEGORY} = kde-frameworks ]] || SLOT=5
 
 case ${KDE_SUBSLOT} in
 	false)  ;;
@@ -245,154 +229,10 @@ case ${KDE_TEST} in
 		;;
 esac
 
-case ${KDE_SELINUX_MODULE} in
-	none)   ;;
-	*)
-		IUSE+=" selinux"
-		RDEPEND+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} )"
-		;;
-esac
-
 DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
-if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
-	S=${WORKDIR}/${KMNAME}-${PV}
-fi
-
-_kde_is_unreleased() {
-	local pair
-	for pair in "${KDE_UNRELEASED[@]}" ; do
-		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Determine fetch location for released tarballs
-_calculate_src_uri() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local _kmname
-
-	if [[ -n ${KMNAME} ]]; then
-		_kmname=${KMNAME}
-	else
-		_kmname=${PN}
-	fi
-
-	case ${PN} in
-		kdelibs4support | \
-		kdewebkit | \
-		khtml | \
-		kjs | \
-		kjsembed | \
-		kmediaplayer | \
-		kross)
-			_kmname="portingAids/${_kmname}"
-			;;
-		kdesignerplugin)
-			[[ ${PV} = 5.6[01].* ]] || _kmname="portingAids/${_kmname}"
-			;;
-	esac
-
-	case ${CATEGORY} in
-		kde-apps)
-			case ${PV} in
-				??.?.[6-9]? | ??.??.[6-9]? )
-					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
-					RESTRICT+=" mirror"
-					;;
-				*)
-					SRC_URI="mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
-			esac
-			;;
-		kde-frameworks)
-			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
-		kde-plasma)
-			local plasmapv=$(ver_cut 1-3)
-
-			case ${PV} in
-				5.?.[6-9]? | 5.??.[6-9]? )
-					# Plasma 5 beta releases
-					SRC_URI="mirror://kde/unstable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz"
-					RESTRICT+=" mirror"
-					;;
-				*)
-					# Plasma 5 stable releases
-					SRC_URI="mirror://kde/stable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz" ;;
-			esac
-			;;
-	esac
-
-	if [[ ${PN} = kdevelop* ]]; then
-		case ${PV} in
-			*.*.[6-9]? )
-				SRC_URI="mirror://kde/unstable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz"
-				RESTRICT+=" mirror"
-				;;
-			*)
-				SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
-		esac
-	fi
-
-	if _kde_is_unreleased ; then
-		RESTRICT+=" fetch"
-	fi
-}
-
-# Determine fetch location for live sources
-_calculate_live_repo() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	SRC_URI=""
-
-	# @ECLASS-VARIABLE: EGIT_MIRROR
-	# @DESCRIPTION:
-	# This variable allows easy overriding of default kde mirror service
-	# (anongit) with anything else you might want to use.
-	EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
-
-	local _kmname
-
-	# @ECLASS-VARIABLE: EGIT_REPONAME
-	# @DESCRIPTION:
-	# This variable allows overriding of default repository
-	# name. Specify only if this differ from PN and KMNAME.
-	if [[ -n ${EGIT_REPONAME} ]]; then
-		# the repository and kmname different
-		_kmname=${EGIT_REPONAME}
-	elif [[ -n ${KMNAME} ]]; then
-		_kmname=${KMNAME}
-	else
-		_kmname=${PN}
-	fi
-
-	if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-		EGIT_BRANCH="Applications/$(ver_cut 1-2)"
-	fi
-
-	if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
-	fi
-
-	if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then
-		EGIT_BRANCH="$(ver_cut 1-2)"
-	fi
-
-	EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
-}
-
-case ${KDE_BUILD_TYPE} in
-	live) _calculate_live_repo ;;
-	*) _calculate_src_uri ;;
-esac
-
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
-
 # @FUNCTION: kde5_pkg_pretend
 # @DESCRIPTION:
 # Checks if the active compiler meets the minimum version requirements.
@@ -410,49 +250,12 @@ kde5_pkg_setup() {
 	_check_gcc_version
 }
 
-# @FUNCTION: kde5_pkg_nofetch
-# @DESCRIPTION:
-# Intended for use in the KDE overlay. If this package matches something in
-# KDE_UNRELEASED, display a giant warning that the package has not yet been
-# released upstream and should not be used.
-kde5_pkg_nofetch() {
-	if ! _kde_is_unreleased ; then
-		return
-	fi
-
-	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "
-	eerror "| | | | \ | |  _ \| ____| |   | ____|  / \  / ___|| ____|  _ \ "
-	eerror "| | | |  \| | |_) |  _| | |   |  _|   / _ \ \___ \|  _| | | | |"
-	eerror "| |_| | |\  |  _ <| |___| |___| |___ / ___ \ ___) | |___| |_| |"
-	eerror " \___/|_| \_|_| \_\_____|_____|_____/_/   \_\____/|_____|____/ "
-	eerror "                                                               "
-	eerror " ____   _    ____ _  __    _    ____ _____ "
-	eerror "|  _ \ / \  / ___| |/ /   / \  / ___| ____|"
-	eerror "| |_) / _ \| |   | ' /   / _ \| |  _|  _|  "
-	eerror "|  __/ ___ \ |___| . \  / ___ \ |_| | |___ "
-	eerror "|_| /_/   \_\____|_|\_\/_/   \_\____|_____|"
-	eerror
-	eerror "${CATEGORY}/${P} has not been released to the public yet"
-	eerror "and is only available to packagers right now."
-	eerror ""
-	eerror "This is not a bug. Please do not file bugs or contact upstream about this."
-	eerror ""
-	eerror "Please consult the upstream release schedule to see when this "
-	eerror "package is scheduled to be released:"
-	eerror "https://community.kde.org/Schedules"
-}
-
 # @FUNCTION: kde5_src_unpack
 # @DESCRIPTION:
 # Unpack the sources, automatically handling both release and live ebuilds.
 kde5_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
+	kde.org_src_unpack
 }
 
 # @FUNCTION: kde5_src_prepare

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0377dbfb05010316fb1c05c4a2465c7468655d07
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 09:30:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 09:31:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0377dbfb

kde5.eclass: Restore order

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b498d7e7a2..8497e511e8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -192,6 +192,13 @@ case ${KDE_AUTODEPS} in
 		;;
 esac
 
+case ${KDE_DEBUG} in
+	false)	;;
+	*)
+		IUSE+=" debug"
+		;;
+esac
+
 case ${KDE_DESIGNERPLUGIN} in
 	false)  ;;
 	*)
@@ -203,13 +210,6 @@ case ${KDE_DESIGNERPLUGIN} in
 		fi
 esac
 
-case ${KDE_DEBUG} in
-	false)	;;
-	*)
-		IUSE+=" debug"
-		;;
-esac
-
 case ${KDE_EXAMPLES} in
 	false)  ;;
 	*)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f9a263cf011a006a92308f130535f8fe08349acb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 14:10:24 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 18:51:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f9a263cf

kde5-functions.eclass: Must not be used directly by ebuild

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 516c22bb3e..0e891dc6e3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -10,7 +10,7 @@
 # This eclass contains functions shared by the other KDE eclasses and forms
 # part of their public API.
 #
-# This eclass should (almost) never be inherited directly by an ebuild.
+# This eclass must not be inherited directly by an ebuild.
 
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6e09aa737c31b0ad1c97015713e6b24315d58501
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Nov  2 11:52:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 11:52:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e09aa73

cmake-utils.eclass: Fix BUILD_SHARED_LIBS variable type

This fixes the following warning:

  CMake Warning (dev) at gentoo_common_config.cmake:8 (SET):
    implicitly converting 'BOOLEAN' to 'STRING' type.

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 109b584afb..e7a48116da 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -649,7 +649,7 @@ cmake-utils_src_configure() {
 	if [[ ${EAPI} != [56] ]]; then
 		cat >> "${common_config}" <<- _EOF_ || die
 			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
-			SET (BUILD_SHARED_LIBS ON CACHE BOOLEAN "")
+			SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
 		_EOF_
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5878300380907933db6177ed258d0a2ccc33a485
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 17:42:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 18:33:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58783003

kde.org.eclass: Mark KDE Applications 19.08.3 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 713fe7cd52..1f888b6307 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -66,7 +66,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.64.0 )
+KDE_UNRELEASED=( kde-frameworks-5.64.0 kde-apps-19.08.3 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9522191274bf1805ff06f2aa805167d675983aac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 12:43:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 12:43:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=95221912

kde.org.eclass: Mark KDE Frameworks 5.64.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 3f86779c52..713fe7cd52 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -66,7 +66,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.64.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     603da39012505210957a3d926c96ab429b238eaf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 11:07:57 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:06:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=603da390

kde.org.eclass: Branching for kde-apps/ switched to "release/YY.MM"

KDE Applications is dead, long live the KDE release service.

See also: https://mail.kde.org/pipermail/release-team/2019-October/011582.html
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 1f888b6307..27cec7cc3b 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -155,7 +155,7 @@ _calculate_live_repo() {
 	EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
 
 	if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-		EGIT_BRANCH="Applications/$(ver_cut 1-2)"
+		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi
 
 	if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f322bb6aa817f6a6b62b4768aa2800995a0e1291
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 17:02:06 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:06:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f322bb6a

kde.org.eclass: Standard HOMEPAGE for kde-plasma and kde-frameworks

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 27cec7cc3b..44b03b795e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -55,11 +55,6 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-	SLOT=5/${PV}
-	[[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
-fi
-
 # @ECLASS-VARIABLE: KDE_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION
@@ -70,6 +65,18 @@ KDE_UNRELEASED=( kde-frameworks-5.64.0 kde-apps-19.08.3 )
 
 HOMEPAGE="https://kde.org/"
 
+case ${CATEGORY} in
+	kde-plasma)
+		HOMEPAGE="https://kde.org/plasma-desktop"
+		;;
+	kde-frameworks)
+		HOMEPAGE="https://kde.org/products/frameworks/"
+		SLOT=5/${PV}
+		[[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+		;;
+	*) ;;
+esac
+
 _kde_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     34072f956fb3db9d72e2f54499daa21cc3e843cd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 13:25:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:06:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=34072f95

kde.org.eclass: Mark KDE Applications 19.08.3 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 44b03b795e..947b48a1c6 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -61,7 +61,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.64.0 kde-apps-19.08.3 )
+KDE_UNRELEASED=( kde-frameworks-5.64.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     401b7faf2947c26a258152c56d7992463e8d1b89
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 08:49:15 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:10:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=401b7faf

kde.org.eclass: Mark KDE Frameworks 5.64.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 947b48a1c6..8e13232bb9 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -61,7 +61,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.64.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4ad13f48d1a2980757ebec51402c14e511ec1be6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 22:18:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 22:21:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ad13f48

ecm.eclass: Fix typo

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 86ed9fb8e6..e24ac68cae 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -9,7 +9,7 @@
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages
 # that use cmake and KDE Frameworks' extra-cmake-modules, thereby following
-# some of their packaging conventions. It is primarily intended for the tree
+# some of their packaging conventions. It is primarily intended for the three
 # upstream release groups (Frameworks, Plasma, Applications) but also for any
 # other package that follows similar conventions.
 #

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bc8cd7c6b7f2b1f4001d3fa403261ddcf5ca9729
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 22:41:15 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 22:44:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc8cd7c6

ecm.eclass: Fix inverted usex handbook logic

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index e24ac68cae..b6fe0616b2 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -511,7 +511,7 @@ ecm_src_configure() {
 	fi
 
 	if [[ ${ECM_HANDBOOK} = optional ]] ; then
-		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=$(usex handbook) )
+		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=$(usex !handbook) )
 	fi
 
 	if in_iuse designer && [[ ${ECM_DESIGNERPLUGIN} = true ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f3f44f2008d039581651cb8a01ee4794f46abe98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 23:13:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 23:13:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3f44f20

ecm.eclass: Fix punt_bogus_dep -> ecm_punt_bogus_dep

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index b6fe0616b2..816feed721 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -426,7 +426,7 @@ ecm_src_prepare() {
 		cmake_comment_add_subdirectory ${ECM_HANDBOOK_DIR}
 
 		if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then
-			punt_bogus_dep KF5 DocTools
+			ecm_punt_bogus_dep KF5 DocTools
 			sed -i -e "/kdoctools_install/ s/^/#DONT/" CMakeLists.txt || die
 		fi
 	fi
@@ -454,18 +454,18 @@ ecm_src_prepare() {
 	# only build unit tests when required
 	if ! { in_iuse test && use test; } ; then
 		if [[ ${ECM_TEST} = forceoptional ]] ; then
-			punt_bogus_dep Qt5 Test
+			ecm_punt_bogus_dep Qt5 Test
 			# if forceoptional, also cover non-kde categories
 			cmake_comment_add_subdirectory autotests test tests
 		elif [[ ${ECM_TEST} = forceoptional-recursive ]] ; then
-			punt_bogus_dep Qt5 Test
+			ecm_punt_bogus_dep Qt5 Test
 			local f pf="${T}/${P}"-tests-optional.patch
 			touch ${pf} || die "Failed to touch patch file"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
 				grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
 				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
 				pushd ${f%/*} > /dev/null || die
-					punt_bogus_dep Qt5 Test
+					ecm_punt_bogus_dep Qt5 Test
 					sed -i CMakeLists.txt -e \
 						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
 						|| die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e087e4096479c828dd37a49da1e78cd21b1bce8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 00:16:15 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 00:16:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e087e409

ecm.eclass: Inherit xdg only if ECM_NONGUI=false

xdg phase functions were already only called based on this var.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 816feed721..06c2e9f83e 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -37,7 +37,23 @@ _ECM_UTILS_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic toolchain-funcs virtualx xdg
+# @ECLASS-VARIABLE: ECM_NONGUI
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# By default, for all CATEGORIES except kde-frameworks, assume we are building
+# a GUI application. Add dependency on kde-frameworks/breeze-icons or
+# 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}
+fi
+: ${ECM_NONGUI:=false}
+
+inherit cmake-utils flag-o-matic toolchain-funcs virtualx
+
+if [[ ${ECM_NONGUI} = false ]] ; then
+	inherit xdg
+fi
 
 case ${EAPI} in
 	7) ;;
@@ -56,18 +72,6 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_po
 # KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing.
 : ${ECM_KDEINSTALLDIRS:=true}
 
-# @ECLASS-VARIABLE: ECM_NONGUI
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# By default, for all CATEGORIES except kde-frameworks, assume we are building
-# a GUI application. Add dependency on kde-frameworks/breeze-icons or
-# 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}
-fi
-: ${ECM_NONGUI:=false}
-
 # @ECLASS-VARIABLE: ECM_DEBUG
 # @DESCRIPTION:
 # Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake-utils_src_configure)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     776e0ffb37169c214c403ece236c5f40cfa8798d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 02:46:16 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 02:46:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=776e0ffb

kde5-functions.eclass: Drop obsolete minimum version overrides

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7e29d41ce4..bbb8d6d90f 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -20,19 +20,6 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-case ${CATEGORY} in
-	kde-frameworks)
-		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		;;
-	kde-plasma)
-		[[ ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0}
-		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
-		;;
-	kde-apps)
-		[[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0}
-		;;
-esac
-
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     47b1cff3b25aa7f4b408361006bae4404d96f387
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 22:27:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 22:27:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=47b1cff3

kde.org.eclass: Prefix internal functions as well

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 8e13232bb9..d1cdb1b15d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -77,7 +77,7 @@ case ${CATEGORY} in
 	*) ;;
 esac
 
-_kde_is_unreleased() {
+_kde.org_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do
 		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
@@ -89,7 +89,7 @@ _kde_is_unreleased() {
 }
 
 # Determine fetch location for released tarballs
-_calculate_src_uri() {
+_kde.org_calculate_src_uri() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local _src_uri="mirror://kde/"
@@ -144,13 +144,13 @@ _calculate_src_uri() {
 
 	SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz"
 
-	if _kde_is_unreleased ; then
+	if _kde.org_is_unreleased ; then
 		RESTRICT+=" fetch"
 	fi
 }
 
 # Determine fetch location for live sources
-_calculate_live_repo() {
+_kde.org_calculate_live_repo() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	SRC_URI=""
@@ -181,9 +181,9 @@ _calculate_live_repo() {
 }
 
 case ${KDE_BUILD_TYPE} in
-	live) _calculate_live_repo ;;
+	live) _kde.org_calculate_live_repo ;;
 	*)
-		_calculate_src_uri
+		_kde.org_calculate_src_uri
 		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 		;;
 esac
@@ -199,7 +199,7 @@ fi
 # KDE_UNRELEASED, display a giant warning that the package has not yet been
 # released upstream and should not be used.
 kde.org_pkg_nofetch() {
-	if ! _kde_is_unreleased ; then
+	if ! _kde.org_is_unreleased ; then
 		return
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ac6358feb34c2ef7adf855a2d931f681f267c167
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 22:16:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 22:17:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac6358fe

cmake-utiles.eclass: Add cmake_use_find_package

Alias for cmake-utils_use_find_package

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index e7a48116da..b022599232 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -338,6 +338,18 @@ cmake-utils_use_find_package() {
 	_cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
 }
 
+# @FUNCTION: cmake_use_find_package
+# @USAGE: <USE flag> <package name>
+# @DESCRIPTION:
+# Alias for cmake-utils_use_find_package.
+cmake_use_find_package() {
+	if [[ "$#" != 2 ]] ; then
+		die "Usage: cmake_use_find_package <USE flag> <package name>"
+	fi
+
+	cmake-utils_use_find_package "$@" ;
+}
+
 # @FUNCTION: cmake-utils_use_disable
 # @USAGE: <USE flag> [flag name]
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ae0343bc7db4b858ccb3152f1b29eabdce38eef0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 22:23:33 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 22:23:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae0343bc

ecm.eclass: _ECM_UTILS_ECLASS -> _ECM_ECLASS

Was forgotten to rename w/ eclass.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 06c2e9f83e..af4646e959 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -27,8 +27,8 @@
 # - Rename vars and function names as needed, see kde5.eclass PORTING comments
 # - Instead of FRAMEWORKS_MINIMAL, define KFMIN in ebuilds and use it for deps
 
-if [[ -z ${_ECM_UTILS_ECLASS} ]]; then
-_ECM_UTILS_ECLASS=1
+if [[ -z ${_ECM_ECLASS} ]]; then
+_ECM_ECLASS=1
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     554e3de6d0e1b9da2ac582ed6147d92b90bf2980
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 22:40:17 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 22:40:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=554e3de6

ecm.eclass: cmake-utils_use_find_package -> cmake_use_find_package

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index af4646e959..5d9cccff02 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -524,7 +524,7 @@ ecm_src_configure() {
 
 	# TODO: drop after KDE Applications 19.08.3 removal
 	if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) )
+		cmakeargs+=( $(cmake_use_find_package designer KF5DesignerPlugin) )
 	fi
 
 	if [[ ${ECM_QTHELP} = true ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     70dc14aad713cb2c5dda88eed866112dc5d2b2ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 11:39:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 11:42:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70dc14aa

kde.org.eclass: Introduce KDE_RELEASE_SERVICE

Experiment with non-kde-apps category handling.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 5735de7ee7..87d1573f41 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -40,6 +40,12 @@ EXPORT_FUNCTIONS pkg_nofetch src_unpack
 # Name of the package as hosted on kde.org mirrors.
 : ${KDE_ORG_NAME:=$PN}
 
+# @ECLASS-VARIABLE: KDE_RELEASE_SERVICE
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# If set to "true", set SRC_URI accordingly and apply KDE_UNRELEASED.
+: ${KDE_RELEASE_SERVICE:=false}
+
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:
 # If set to "none", do nothing.
@@ -66,6 +72,9 @@ KDE_UNRELEASED=( )
 HOMEPAGE="https://kde.org/"
 
 case ${CATEGORY} in
+	kde-apps)
+		KDE_RELEASE_SERVICE=true
+		;;
 	kde-plasma)
 		HOMEPAGE="https://kde.org/plasma-desktop"
 		;;
@@ -82,6 +91,10 @@ _kde.org_is_unreleased() {
 	for pair in "${KDE_UNRELEASED[@]}" ; do
 		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
 			return 0
+		elif [[ ${KDE_RELEASE_SERVICE} = true ]]; then
+			if [[ "${pair/kde-apps/${CATEGORY}}" = "${CATEGORY}-${PV}" ]]; then
+				return 0
+			fi
 		fi
 	done
 
@@ -94,17 +107,18 @@ _kde.org_calculate_src_uri() {
 
 	local _src_uri="mirror://kde/"
 
+	if [[ ${KDE_RELEASE_SERVICE} = true ]]; then
+		case ${PV} in
+			??.??.[6-9]? )
+				_src_uri+="unstable/applications/${PV}/src/"
+				RESTRICT+=" mirror"
+				;;
+			19.08.3? ) _src_uri+="stable/applications/${PV}/src/" ;;
+			*) _src_uri+="stable/release-service/${PV}/src/" ;;
+		esac
+	fi
+
 	case ${CATEGORY} in
-		kde-apps)
-			case ${PV} in
-				??.??.[6-9]? )
-					_src_uri+="unstable/applications/${PV}/src/"
-					RESTRICT+=" mirror"
-					;;
-				19.08.3? ) _src_uri+="stable/applications/${PV}/src/" ;;
-				*) _src_uri+="stable/release-service/${PV}/src/" ;;
-			esac
-			;;
 		kde-frameworks)
 			_src_uri+="stable/frameworks/$(ver_cut 1-2)/"
 			case ${PN} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c46e4ea199235edd1eba8671bf620e969da6b5d3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 03:36:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 03:36:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c46e4ea1

kde.org.eclass: Add release-service SRC_URI

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 7482a48afc..5735de7ee7 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -101,7 +101,8 @@ _kde.org_calculate_src_uri() {
 					_src_uri+="unstable/applications/${PV}/src/"
 					RESTRICT+=" mirror"
 					;;
-				*) _src_uri+="stable/applications/${PV}/src/" ;;
+				19.08.3? ) _src_uri+="stable/applications/${PV}/src/" ;;
+				*) _src_uri+="stable/release-service/${PV}/src/" ;;
 			esac
 			;;
 		kde-frameworks)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0dbd8eaa4c6c3cfe4ee8f272e70ce22e68ec27ab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 03:25:54 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 03:25:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dbd8eaa

kde.org.eclass: Drop KDE Frameworks 5.60 conditional

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index d1cdb1b15d..7482a48afc 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -108,6 +108,7 @@ _kde.org_calculate_src_uri() {
 			_src_uri+="stable/frameworks/$(ver_cut 1-2)/"
 			case ${PN} in
 				kdelibs4support | \
+				kdesignerplugin | \
 				kdewebkit | \
 				khtml | \
 				kjs | \
@@ -116,9 +117,6 @@ _kde.org_calculate_src_uri() {
 				kross)
 					_src_uri+="portingAids/"
 					;;
-				kdesignerplugin)
-					[[ ${PV} = 5.60.* ]] || _src_uri+="portingAids/"
-					;;
 			esac
 			;;
 		kde-plasma)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5e40176ac15a0acac7d6549f6b6225c305a0930e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 03:56:57 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 11:42:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e40176a

kde.org.eclass: Mark KDE Release Service 19.12.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 87d1573f41..0c58586fb0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-19.12.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a3b6251b670cd64f2b4d82e8e3643481d5128f8c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 01:26:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 01:26:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3b6251b

kde.org.eclass: Mark KDE Frameworks 5.65.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 0c58586fb0..8e391f6dcf 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.12.0 )
+KDE_UNRELEASED=( kde-apps-19.12.0 kde-frameworks-5.65.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6b4e14d6a718b2c1dd2175d8631ae1b844051f8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 17:25:39 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 17:25:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b4e14d6

kde.org.eclass: Extend KDE_RELEASE_SERVICE support to stable branches

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 8e391f6dcf..46acd5a277 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -174,7 +174,7 @@ _kde.org_calculate_live_repo() {
 	# (anongit) with anything else you might want to use.
 	EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
 
-	if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+	if [[ ${PV} == ??.??.49.9999 && ${KDE_RELEASE_SERVICE} = true ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     63e4c38e55cc321f3e75adc06684a6d6a04c6de2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 15:52:42 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 15:55:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=63e4c38e

kde.org.eclass: Mark KDE Release Service 19.12 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 46acd5a277..09d5ea445d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.12.0 kde-frameworks-5.65.0 )
+KDE_UNRELEASED=( kde-frameworks-5.65.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e80b19cececa476fbe38b423c044d40b310d849c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 10:37:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 10:37:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e80b19ce

kde.org.eclass: Mark KDE Frameworks 5.65 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 09d5ea445d..b943ebabb3 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.65.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f877d6dc6ef10996b5418446bf083c9dc30e6ca5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 16:25:25 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 16:28:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f877d6dc

ecm.eclass: Set correct KFMIN default for kde-frameworks/*

Closes: https://bugs.gentoo.org/703006
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5d9cccff02..ddfe92c1d0 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -152,10 +152,15 @@ fi
 : ${ECM_TEST:=false}
 
 # @ECLASS-VARIABLE: KFMIN
+# @DEFAULT_UNSET
 # @DESCRIPTION:
-# Minimum version of Frameworks to require. The default value is not going to
-# be changed unless we also bump EAPI, which usually implies (rev-)bumping.
+# 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
+# changed unless we also bump EAPI, which usually implies (rev-)bumping.
 # Version will later be used to differentiate between KF5/Qt5 and KF6/Qt6.
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+	: ${KFMIN:=${PV}}
+fi
 : ${KFMIN:=5.64.0}
 
 # @ECLASS-VARIABLE: KFSLOT

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     97efb16a1a5dfb9466d5a3eec11b1f1f3ae78a1a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 17:03:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 17:05:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=97efb16a

ecm.eclass: Fix kde-frameworks/ minimum to major.minor of PV

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index ddfe92c1d0..1616df9aab 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -159,7 +159,7 @@ fi
 # changed unless we also bump EAPI, which usually implies (rev-)bumping.
 # Version will later be used to differentiate between KF5/Qt5 and KF6/Qt6.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
-	: ${KFMIN:=${PV}}
+	: ${KFMIN:=$(ver_cut 1-2)}
 fi
 : ${KFMIN:=5.64.0}
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7b5cc77ec9120cb264e4f707dc9e0f650b1179cc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 22:54:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b5cc77e

cmake.eclass: Drop CMAKE_MIN_VERSION

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 210b3a30d9..730a1929fa 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -55,11 +55,6 @@ _CMAKE_ECLASS=1
 # The default is set to "ninja".
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
-# @ECLASS-VARIABLE: CMAKE_MIN_VERSION
-# @DESCRIPTION:
-# Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.9.6}
-
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:
 # Do we want to remove anything? yes or whatever else for no
@@ -131,7 +126,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
+	BDEPEND+=" dev-util/cmake"
 fi
 
 # @FUNCTION: _cmake_banned_func

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cc187ea39eec29df4b8fc39d3fba16f67c2eda2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 16:59:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:33:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc187ea3

cmake.eclass: Drop all pre-EAPI-7 compatibility

Keep old variables and functions but die if any are used.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 334 ++++++++++++++--------------------------------------
 1 file changed, 87 insertions(+), 247 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index e7a48116da..715e6ef2fc 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -9,7 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.
@@ -26,9 +26,7 @@ _CMAKE_UTILS_ECLASS=1
 # For in-source build it's fixed to ${CMAKE_USE_DIR}.
 # For out-of-source build it can be overridden, by default it uses
 # ${WORKDIR}/${P}_build.
-#
-# This variable has been called CMAKE_BUILD_DIR formerly.
-# It is set under that name for compatibility.
+: ${BUILD_DIR:=${WORKDIR}/${P}_build}
 
 # @ECLASS-VARIABLE: CMAKE_BINARY
 # @DESCRIPTION:
@@ -54,8 +52,8 @@ _CMAKE_UTILS_ECLASS=1
 # @DESCRIPTION:
 # Specify a makefile generator to be used by cmake.
 # At this point only "emake" and "ninja" are supported.
-# In EAPI 7 and above, the default is set to "ninja",
-# whereas in EAPIs below 7, it is set to "emake".
+# The default is set to "ninja".
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
@@ -90,6 +88,7 @@ _CMAKE_UTILS_ECLASS=1
 # 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}
 
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
 # @DEFAULT_UNSET
@@ -106,33 +105,17 @@ _CMAKE_UTILS_ECLASS=1
 # Helps in improving QA of build systems that write to source tree.
 
 case ${EAPI} in
-	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-	6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
+	7) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
-case ${EAPI} in
-	[56])
-		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-		inherit eutils multilib
-		;;
-	*)
-		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-		;;
-esac
-
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
-if [[ ${WANT_CMAKE} ]]; then
-	if [[ ${EAPI} != [56] ]]; then
-		die "\${WANT_CMAKE} has been removed and is a no-op now"
-	else
-		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
-	fi
-fi
-[[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
+[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
+[[ ${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)
@@ -151,57 +134,12 @@ if [[ ${PN} != cmake ]]; then
 	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
 fi
 
-case ${EAPI} in
-	7) ;;
-	*) DEPEND=" ${BDEPEND}" ;;
-esac
-
-# Internal functions used by cmake-utils_use_*
-_cmake_use_me_now() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local arg=$2
-	[[ ! -z $3 ]] && arg=$3
-
-	[[ ${EAPI} == 5 ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo ON || echo OFF)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo ON || echo OFF) "
-		done
-	fi
-}
-_cmake_use_me_now_inverted() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local arg=$2
-	[[ ! -z $3 ]] && arg=$3
-
-	if [[ ${EAPI} != 5 && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
-		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-	fi
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo OFF || echo ON)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
-		done
-	fi
+# @FUNCTION: _cmake_banned_func
+# @INTERNAL
+# @DESCRIPTION:
+# Banned functions are banned.
+_cmake_banned_func() {
+	die "${FUNCNAME[1]} is banned. use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 }
 
 # Determine using IN or OUT source build
@@ -210,35 +148,10 @@ _cmake_check_build_dir() {
 	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
 		# we build in source dir
 		BUILD_DIR="${CMAKE_USE_DIR}"
-	else
-		# Respect both the old variable and the new one, depending
-		# on which one was set by the ebuild.
-		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
-			if [[ ${EAPI} != [56] ]]; then
-				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-				die "The ebuild must be migrated to BUILD_DIR."
-			else
-				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-				eqawarn "Please migrate the ebuild to use the new one."
-			fi
-
-			# In the next call, both variables will be set already
-			# and we'd have to know which one takes precedence.
-			_RESPECT_CMAKE_BUILD_DIR=1
-		fi
-
-		if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then
-			BUILD_DIR=${CMAKE_BUILD_DIR:-${WORKDIR}/${P}_build}
-		else
-			: ${BUILD_DIR:=${WORKDIR}/${P}_build}
-		fi
 	fi
 
-	# Backwards compatibility for getting the value.
-	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
-
 	mkdir -p "${BUILD_DIR}" || die
-	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
+	einfo "Working in BUILD_DIR: \"$BUILD_DIR\""
 }
 
 # Determine which generator to use
@@ -249,18 +162,9 @@ _cmake_generator_to_use() {
 		ninja)
 			# 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
-			case ${EAPI} in
-				5|6)
-					if ! ROOT=/ has_version dev-util/ninja; then
-						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-					fi
-				;;
-				*)
-					if ! has_version -b dev-util/ninja; then
-						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-					fi
-				;;
-			esac
+			if ! has_version -b dev-util/ninja; then
+				die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+			fi
 			generator_name="Ninja"
 			;;
 		emake)
@@ -294,33 +198,24 @@ cmake_comment_add_subdirectory() {
 }
 
 # @FUNCTION: comment_add_subdirectory
-# @USAGE: <subdirectory>
+# @INTERNAL
 # @DESCRIPTION:
-# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
-# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
+# Banned. Use cmake_comment_add_subdirectory instead.
 comment_add_subdirectory() {
-	[[ ${EAPI} == 5 ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
-
-	cmake_comment_add_subdirectory "$@"
+	die "comment_add_subdirectory is banned. Use cmake_comment_add_subdirectory instead"
 }
 
 # @FUNCTION: cmake-utils_use_with
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_with. See ebuild(5).
-#
-# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
-# and -DWITH_FOO=OFF if it is disabled.
-cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; }
+# Banned. Use -DWITH_FOO=$(usex foo) instead.
+cmake-utils_use_with() { _cmake_banned_func WITH_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_enable
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
-# and -DENABLE_FOO=OFF if it is disabled.
-cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
+# Banned. Use -DENABLE_FOO=$(usex foo) instead.
+cmake-utils_use_enable() { _cmake_banned_func ENABLE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_find_package
 # @USAGE: <USE flag> <package name>
@@ -331,84 +226,62 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
 # This can be used to make find_package optional.
 cmake-utils_use_find_package() {
-	if [[ ${EAPI} != 5 && "$#" != 2 ]] ; then
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ "$#" != 2 || -z $1 ]] ; then
 		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
 	fi
 
-	_cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
+	echo "-DCMAKE_DISABLE_FIND_PACKAGE_$2=$(use $1 && echo OFF || echo ON)"
 }
 
 # @FUNCTION: cmake-utils_use_disable
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on inversion of use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
-# and -DDISABLE_FOO=ON if it is disabled.
-cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; }
+# Banned. Use -DDISABLE_FOO=$(usex !foo) instead.
+cmake-utils_use_disable() { _cmake_banned_func DISABLE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_no
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_disable. See ebuild(5).
-#
-# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
-# and -DNO_FOO=ON if it is disabled.
-cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; }
+# Banned. Use -DNO_FOO=$(usex !foo) instead.
+cmake-utils_use_no() { _cmake_banned_func NO_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_want
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
-# and -DWANT_FOO=OFF if it is disabled.
-cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; }
+# Banned. Use -DWANT_FOO=$(usex foo) instead.
+cmake-utils_use_want() { _cmake_banned_func WANT_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_build
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
-# and -DBUILD_FOO=OFF if it is disabled.
-cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; }
+# Banned. Use -DBUILD_FOO=$(usex foo) instead.
+cmake-utils_use_build() { _cmake_banned_func BUILD_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_has
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
-# and -DHAVE_FOO=OFF if it is disabled.
-cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; }
+# Banned. Use -DHAVE_FOO=$(usex foo) instead.
+cmake-utils_use_has() { _cmake_banned_func HAVE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use_use
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
-# and -DUSE_FOO=OFF if it is disabled.
-cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; }
+# Banned. Use -DUSE_FOO=$(usex foo) instead.
+cmake-utils_use_use() { _cmake_banned_func USE_ "$@" ; }
 
 # @FUNCTION: cmake-utils_use
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
-# and -DFOO=OFF if it is disabled.
-cmake-utils_use() { _cmake_use_me_now "" "$@" ; }
+# Banned. Use -DFOO=$(usex foo) instead.
+cmake-utils_use() { _cmake_banned_func "" "$@" ; }
 
 # @FUNCTION: cmake-utils_useno
-# @USAGE: <USE flag> [flag name]
+# @INTERNAL
 # @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
-# and -DNOFOO=ON if it is disabled.
-cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; }
+# Banned. Use -DNOFOO=$(usex !foo) instead.
+cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
 
 # Internal function for modifying hardcoded definitions.
 # Removes dangerous definitions that override Gentoo settings.
@@ -447,17 +320,16 @@ _cmake_modify-cmakelists() {
 	_EOF_
 }
 
-# temporary function for moving cmake cleanups from from src_configure -> src_prepare.
-# bug #378850
-_cmake_cleanup_cmake() {
-	: ${CMAKE_USE_DIR:=${S}}
+# @FUNCTION: cmake-utils_src_prepare
+# @DESCRIPTION:
+# Apply ebuild and user patches.
+cmake-utils_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
-		local name
-		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
-		done
-	fi
+	pushd "${S}" > /dev/null || die
+
+	default_src_prepare
+	_cmake_check_build_dir
 
 	# check if CMakeLists.txt exist and if no then die
 	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
@@ -467,28 +339,15 @@ _cmake_cleanup_cmake() {
 		die "FATAL: Unable to find CMakeLists.txt"
 	fi
 
+	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
+		local name
+		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
+			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
+		done
+	fi
+
 	# Remove dangerous things.
 	_cmake_modify-cmakelists
-}
-
-# @FUNCTION: cmake-utils_src_prepare
-# @DESCRIPTION:
-# Apply ebuild and user patches.
-cmake-utils_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	pushd "${S}" > /dev/null || die
-
-	if [[ ${EAPI} != 5 ]]; then
-		default_src_prepare
-		_cmake_cleanup_cmake
-	else
-		debug-print "$FUNCNAME: PATCHES=$PATCHES"
-		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-		debug-print "$FUNCNAME: applying user patches"
-		epatch_user
-	fi
 
 	popd > /dev/null || die
 
@@ -522,15 +381,8 @@ cmake-utils_src_prepare() {
 cmake-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
-		if [[ ${EAPI} != [56] ]]; then
-			die "FATAL: cmake-utils_src_prepare has not been run"
-		else
-			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
-		fi
-	fi
-
-	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
+	[[ ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]] || \
+		die "FATAL: cmake-utils_src_prepare has not been run"
 
 	_cmake_check_build_dir
 
@@ -540,7 +392,7 @@ cmake-utils_src_configure() {
 	# @SEE CMAKE_BUILD_TYPE
 	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
 		# Handle release builds
-		if ! has debug ${IUSE//+} || ! use debug; then
+		if ! in_iuse debug || ! use debug; then
 			local CPPFLAGS=${CPPFLAGS}
 			append-cppflags -DNDEBUG
 		fi
@@ -643,18 +495,15 @@ cmake-utils_src_configure() {
 		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
 		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
 		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 "")
 	_EOF_
-	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
-
-	if [[ ${EAPI} != [56] ]]; then
-		cat >> "${common_config}" <<- _EOF_ || die
-			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
-			SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
-		_EOF_
+	if [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]]; then
+		echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die
 	fi
 
 	# Wipe the default optimization flags out of CMake
-	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
+	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
 			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
@@ -668,27 +517,18 @@ cmake-utils_src_configure() {
 		_EOF_
 	fi
 
-	# Convert mycmakeargs to an array, for backwards compatibility
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).
 	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
 	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
-		if [[ -n "${mycmakeargstype}" ]] ; then
-			if [[ ${EAPI} == 5 ]]; then
-				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
-			else
-				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
-			fi
-		fi
-		local mycmakeargs_local=(${mycmakeargs})
-	else
-		local mycmakeargs_local=("${mycmakeargs[@]}")
+		die "mycmakeargs must be declared as array"
 	fi
 
+	local mycmakeargs_local=( "${mycmakeargs[@]}" )
+
+	local warn_unused_cli=""
 	if [[ ${CMAKE_WARN_UNUSED_CLI} == no ]] ; then
-		local warn_unused_cli="--no-warn-unused-cli"
-	else
-		local warn_unused_cli=""
+		warn_unused_cli="--no-warn-unused-cli"
 	fi
 
 	# Common configure parameters (overridable)
@@ -701,7 +541,6 @@ cmake-utils_src_configure() {
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
 		"${MYCMAKEARGS}"
 	)
@@ -815,7 +654,8 @@ cmake-utils_src_install() {
 
 	_cmake_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
-	DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
+	DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" ||
+		die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
 	popd > /dev/null || die
 
 	pushd "${S}" > /dev/null || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     91081905d24cd44c8b94ee1a128302e03b3b31d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 17:15:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:33:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=91081905

cmake.eclass: Rename all functions/vars from cmake-utils* to cmake*

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 80 ++++++++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 715e6ef2fc..210b3a30d9 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# @ECLASS: cmake-utils.eclass
+# @ECLASS: cmake.eclass
 # @MAINTAINER:
 # kde@gentoo.org
 # @AUTHOR:
@@ -12,13 +12,13 @@
 # @SUPPORTED_EAPIS: 7
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
-# The cmake-utils 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
-# and use_with functions for CMake.
+# 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.
 
-if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
-_CMAKE_UTILS_ECLASS=1
+if [[ -z ${_CMAKE_ECLASS} ]]; then
+_CMAKE_ECLASS=1
 
 # @ECLASS-VARIABLE: BUILD_DIR
 # @DESCRIPTION:
@@ -37,9 +37,9 @@ _CMAKE_UTILS_ECLASS=1
 # @DESCRIPTION:
 # Set to override default CMAKE_BUILD_TYPE. Only useful for packages
 # known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
-# If about to be set - needs to be set before invoking cmake-utils_src_configure.
-# You usualy do *NOT* want nor need to set it as it pulls CMake default build-type
-# specific compiler flags overriding make.conf.
+# If about to be set - needs to be set before invoking cmake_src_configure.
+# You usually do *NOT* want nor need to set it as it pulls CMake default
+# build-type specific compiler flags overriding make.conf.
 : ${CMAKE_BUILD_TYPE:=Gentoo}
 
 # @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
@@ -67,15 +67,14 @@ _CMAKE_UTILS_ECLASS=1
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
 # @DESCRIPTION:
-# Space-separated list of CMake modules that will be removed in $S during src_prepare,
-# in order to force packages to use the system version.
+# Space-separated list of CMake modules that will be removed in $S during
+# src_prepare, in order to force packages to use the system version.
 : ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
 
 # @ECLASS-VARIABLE: CMAKE_USE_DIR
 # @DESCRIPTION:
-# Sets the directory where we are working with cmake.
-# For example when application uses autotools and only one
-# plugin needs to be done by cmake.
+# Sets the directory where we are working with cmake, for example when
+# application uses autotools and only one plugin needs to be done by cmake.
 # By default it uses ${S}.
 
 # @ECLASS-VARIABLE: CMAKE_VERBOSE
@@ -97,10 +96,10 @@ _CMAKE_UTILS_ECLASS=1
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
-# @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @ECLASS-VARIABLE: CMAKE_QA_SRC_DIR_READONLY
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
+# After running cmake_src_prepare, sets ${S} to read-only. This is
 # a user flag and should under _no circumstances_ be set in the ebuild.
 # Helps in improving QA of build systems that write to source tree.
 
@@ -114,6 +113,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 [[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
+[[ ${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"
 
@@ -217,19 +217,19 @@ cmake-utils_use_with() { _cmake_banned_func WITH_ "$@" ; }
 # Banned. Use -DENABLE_FOO=$(usex foo) instead.
 cmake-utils_use_enable() { _cmake_banned_func ENABLE_ "$@" ; }
 
-# @FUNCTION: cmake-utils_use_find_package
+# @FUNCTION: cmake_use_find_package
 # @USAGE: <USE flag> <package name>
 # @DESCRIPTION:
 # Based on use_enable. See ebuild(5).
 #
-# `cmake-utils_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF
+# `cmake_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
 # This can be used to make find_package optional.
-cmake-utils_use_find_package() {
+cmake_use_find_package() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ "$#" != 2 || -z $1 ]] ; then
-		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
+		die "Usage: cmake_use_find_package <USE flag> <package name>"
 	fi
 
 	echo "-DCMAKE_DISABLE_FIND_PACKAGE_$2=$(use $1 && echo OFF || echo ON)"
@@ -320,10 +320,10 @@ _cmake_modify-cmakelists() {
 	_EOF_
 }
 
-# @FUNCTION: cmake-utils_src_prepare
+# @FUNCTION: cmake_src_prepare
 # @DESCRIPTION:
 # Apply ebuild and user patches.
-cmake-utils_src_prepare() {
+cmake_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	pushd "${S}" > /dev/null || die
@@ -352,11 +352,11 @@ cmake-utils_src_prepare() {
 	popd > /dev/null || die
 
 	# make ${S} read-only in order to detect broken build-systems
-	if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
+	if [[ ${CMAKE_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
 		chmod -R a-w "${S}"
 	fi
 
-	_CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
+	_CMAKE_SRC_PREPARE_HAS_RUN=1
 }
 
 # @VARIABLE: mycmakeargs
@@ -367,22 +367,22 @@ cmake-utils_src_prepare() {
 # @CODE
 # src_configure() {
 # 	local mycmakeargs=(
-# 		$(cmake-utils_use_with openconnect)
+# 		$(cmake_use_with openconnect)
 # 	)
 #
-# 	cmake-utils_src_configure
+# 	cmake_src_configure
 # }
 # @CODE
 
-# @FUNCTION: cmake-utils_src_configure
+# @FUNCTION: cmake_src_configure
 # @DESCRIPTION:
 # General function for configuring with cmake. Default behaviour is to start an
 # out-of-source build.
-cmake-utils_src_configure() {
+cmake_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]] || \
-		die "FATAL: cmake-utils_src_prepare has not been run"
+	[[ ${_CMAKE_SRC_PREPARE_HAS_RUN} ]] || \
+		die "FATAL: cmake_src_prepare has not been run"
 
 	_cmake_check_build_dir
 
@@ -556,14 +556,14 @@ cmake-utils_src_configure() {
 	popd > /dev/null || die
 }
 
-# @FUNCTION: cmake-utils_src_compile
+# @FUNCTION: cmake_src_compile
 # @DESCRIPTION:
 # General function for compiling with cmake.
 # Automatically detects the build type. All arguments are passed to emake.
-cmake-utils_src_compile() {
+cmake_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cmake-utils_src_make "$@"
+	cmake_src_make "$@"
 }
 
 # @FUNCTION: _cmake_ninja_src_make
@@ -595,11 +595,11 @@ _cmake_emake_src_make() {
 
 }
 
-# @FUNCTION: cmake-utils_src_make
+# @FUNCTION: cmake_src_make
 # @DESCRIPTION:
 # Function for building the package. Automatically detects the build type.
 # All arguments are passed to emake.
-cmake-utils_src_make() {
+cmake_src_make() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_cmake_check_build_dir
@@ -610,10 +610,10 @@ cmake-utils_src_make() {
 	popd > /dev/null || die
 }
 
-# @FUNCTION: cmake-utils_src_test
+# @FUNCTION: cmake_src_test
 # @DESCRIPTION:
 # Function for testing the package. Automatically detects the build type.
-cmake-utils_src_test() {
+cmake_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_cmake_check_build_dir
@@ -646,10 +646,10 @@ cmake-utils_src_test() {
 	fi
 }
 
-# @FUNCTION: cmake-utils_src_install
+# @FUNCTION: cmake_src_install
 # @DESCRIPTION:
 # Function for installing the package. Automatically detects the build type.
-cmake-utils_src_install() {
+cmake_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_cmake_check_build_dir

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0fa5f23622bf934ed40bd2f0876084f6e566513a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 15:37:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:33:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fa5f236

cmake.eclass: Initial copy from cmake-utils.eclass

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 826 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 826 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
new file mode 100644
index 0000000000..e7a48116da
--- /dev/null
+++ b/eclass/cmake.eclass
@@ -0,0 +1,826 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: cmake-utils.eclass
+# @MAINTAINER:
+# kde@gentoo.org
+# @AUTHOR:
+# Tomáš Chvátal <scarabeus@gentoo.org>
+# Maciej Mrozowski <reavertm@gentoo.org>
+# (undisclosed contributors)
+# Original author: Zephyrus (zephyrus@mirach.it)
+# @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: common ebuild functions for cmake-based packages
+# @DESCRIPTION:
+# The cmake-utils 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
+# and use_with functions for CMake.
+
+if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
+_CMAKE_UTILS_ECLASS=1
+
+# @ECLASS-VARIABLE: BUILD_DIR
+# @DESCRIPTION:
+# Build directory where all cmake processed files should be generated.
+# For in-source build it's fixed to ${CMAKE_USE_DIR}.
+# For out-of-source build it can be overridden, by default it uses
+# ${WORKDIR}/${P}_build.
+#
+# This variable has been called CMAKE_BUILD_DIR formerly.
+# It is set under that name for compatibility.
+
+# @ECLASS-VARIABLE: CMAKE_BINARY
+# @DESCRIPTION:
+# Eclass can use different cmake binary than the one provided in by system.
+: ${CMAKE_BINARY:=cmake}
+
+# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
+# @DESCRIPTION:
+# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
+# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
+# If about to be set - needs to be set before invoking cmake-utils_src_configure.
+# You usualy do *NOT* want nor need to set it as it pulls CMake default build-type
+# specific compiler flags overriding make.conf.
+: ${CMAKE_BUILD_TYPE:=Gentoo}
+
+# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Set to enable in-source build.
+
+# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Specify a makefile generator to be used by cmake.
+# At this point only "emake" and "ninja" are supported.
+# In EAPI 7 and above, the default is set to "ninja",
+# whereas in EAPIs below 7, it is set to "emake".
+
+# @ECLASS-VARIABLE: CMAKE_MIN_VERSION
+# @DESCRIPTION:
+# Specify the minimum required CMake version.
+: ${CMAKE_MIN_VERSION:=3.9.6}
+
+# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
+# @DESCRIPTION:
+# Do we want to remove anything? yes or whatever else for no
+: ${CMAKE_REMOVE_MODULES:=yes}
+
+# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
+# @DESCRIPTION:
+# Space-separated list of CMake modules that will be removed in $S during src_prepare,
+# in order to force packages to use the system version.
+: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
+
+# @ECLASS-VARIABLE: CMAKE_USE_DIR
+# @DESCRIPTION:
+# Sets the directory where we are working with cmake.
+# For example when application uses autotools and only one
+# plugin needs to be done by cmake.
+# By default it uses ${S}.
+
+# @ECLASS-VARIABLE: CMAKE_VERBOSE
+# @DESCRIPTION:
+# Set to OFF to disable verbose messages during compilation
+: ${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.
+
+# @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
+# for econf and is needed to pass TRY_RUN results when cross-compiling.
+# Should be set by user in a per-package basis in /etc/portage/package.env.
+
+# @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
+# a user flag and should under _no circumstances_ be set in the ebuild.
+# Helps in improving QA of build systems that write to source tree.
+
+case ${EAPI} in
+	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
+	6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
+
+case ${EAPI} in
+	[56])
+		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+		inherit eutils multilib
+		;;
+	*)
+		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+		;;
+esac
+
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+
+if [[ ${WANT_CMAKE} ]]; then
+	if [[ ${EAPI} != [56] ]]; then
+		die "\${WANT_CMAKE} has been removed and is a no-op now"
+	else
+		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
+	fi
+fi
+[[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
+
+case ${CMAKE_MAKEFILE_GENERATOR} in
+	emake)
+		BDEPEND="sys-devel/make"
+		;;
+	ninja)
+		BDEPEND="dev-util/ninja"
+		;;
+	*)
+		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
+		die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
+		;;
+esac
+
+if [[ ${PN} != cmake ]]; then
+	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
+fi
+
+case ${EAPI} in
+	7) ;;
+	*) DEPEND=" ${BDEPEND}" ;;
+esac
+
+# Internal functions used by cmake-utils_use_*
+_cmake_use_me_now() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local arg=$2
+	[[ ! -z $3 ]] && arg=$3
+
+	[[ ${EAPI} == 5 ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
+
+	local uper capitalised x
+	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
+	if [[ ! -z $3 ]]; then
+		# user specified the use name so use it
+		echo "-D$1$3=$(use $2 && echo ON || echo OFF)"
+	else
+		# use all various most used combinations
+		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
+		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
+		for x in $2 $uper $capitalised; do
+			echo "-D$1$x=$(use $2 && echo ON || echo OFF) "
+		done
+	fi
+}
+_cmake_use_me_now_inverted() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local arg=$2
+	[[ ! -z $3 ]] && arg=$3
+
+	if [[ ${EAPI} != 5 && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
+		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
+	fi
+
+	local uper capitalised x
+	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
+	if [[ ! -z $3 ]]; then
+		# user specified the use name so use it
+		echo "-D$1$3=$(use $2 && echo OFF || echo ON)"
+	else
+		# use all various most used combinations
+		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
+		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
+		for x in $2 $uper $capitalised; do
+			echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
+		done
+	fi
+}
+
+# Determine using IN or OUT source build
+_cmake_check_build_dir() {
+	: ${CMAKE_USE_DIR:=${S}}
+	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
+		# we build in source dir
+		BUILD_DIR="${CMAKE_USE_DIR}"
+	else
+		# Respect both the old variable and the new one, depending
+		# on which one was set by the ebuild.
+		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
+			if [[ ${EAPI} != [56] ]]; then
+				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				die "The ebuild must be migrated to BUILD_DIR."
+			else
+				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
+				eqawarn "Please migrate the ebuild to use the new one."
+			fi
+
+			# In the next call, both variables will be set already
+			# and we'd have to know which one takes precedence.
+			_RESPECT_CMAKE_BUILD_DIR=1
+		fi
+
+		if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then
+			BUILD_DIR=${CMAKE_BUILD_DIR:-${WORKDIR}/${P}_build}
+		else
+			: ${BUILD_DIR:=${WORKDIR}/${P}_build}
+		fi
+	fi
+
+	# Backwards compatibility for getting the value.
+	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
+
+	mkdir -p "${BUILD_DIR}" || die
+	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
+}
+
+# Determine which generator to use
+_cmake_generator_to_use() {
+	local generator_name
+
+	case ${CMAKE_MAKEFILE_GENERATOR} in
+		ninja)
+			# 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
+			case ${EAPI} in
+				5|6)
+					if ! ROOT=/ has_version dev-util/ninja; then
+						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+					fi
+				;;
+				*)
+					if ! has_version -b dev-util/ninja; then
+						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
+					fi
+				;;
+			esac
+			generator_name="Ninja"
+			;;
+		emake)
+			generator_name="Unix Makefiles"
+			;;
+		*)
+			eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
+			die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
+			;;
+	esac
+
+	echo ${generator_name}
+}
+
+# @FUNCTION: cmake_comment_add_subdirectory
+# @USAGE: <subdirectory>
+# @DESCRIPTION:
+# Comment out one or more add_subdirectory calls in CMakeLists.txt in the current directory
+cmake_comment_add_subdirectory() {
+	if [[ -z ${1} ]]; then
+		die "comment_add_subdirectory must be passed at least one directory name to comment"
+	fi
+
+	if [[ -e "CMakeLists.txt" ]]; then
+		local d
+		for d in $@; do
+			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
+				-i CMakeLists.txt || die "failed to comment add_subdirectory(${d})"
+		done
+	fi
+}
+
+# @FUNCTION: comment_add_subdirectory
+# @USAGE: <subdirectory>
+# @DESCRIPTION:
+# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
+# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
+comment_add_subdirectory() {
+	[[ ${EAPI} == 5 ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
+
+	cmake_comment_add_subdirectory "$@"
+}
+
+# @FUNCTION: cmake-utils_use_with
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_with. See ebuild(5).
+#
+# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
+# and -DWITH_FOO=OFF if it is disabled.
+cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_enable
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
+# and -DENABLE_FOO=OFF if it is disabled.
+cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_find_package
+# @USAGE: <USE flag> <package name>
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF
+# if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
+# This can be used to make find_package optional.
+cmake-utils_use_find_package() {
+	if [[ ${EAPI} != 5 && "$#" != 2 ]] ; then
+		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
+	fi
+
+	_cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
+}
+
+# @FUNCTION: cmake-utils_use_disable
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on inversion of use_enable. See ebuild(5).
+#
+# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
+# and -DDISABLE_FOO=ON if it is disabled.
+cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_no
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_disable. See ebuild(5).
+#
+# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
+# and -DNO_FOO=ON if it is disabled.
+cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_want
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
+# and -DWANT_FOO=OFF if it is disabled.
+cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_build
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
+# and -DBUILD_FOO=OFF if it is disabled.
+cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_has
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
+# and -DHAVE_FOO=OFF if it is disabled.
+cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use_use
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
+# and -DUSE_FOO=OFF if it is disabled.
+cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; }
+
+# @FUNCTION: cmake-utils_use
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
+# and -DFOO=OFF if it is disabled.
+cmake-utils_use() { _cmake_use_me_now "" "$@" ; }
+
+# @FUNCTION: cmake-utils_useno
+# @USAGE: <USE flag> [flag name]
+# @DESCRIPTION:
+# Based on use_enable. See ebuild(5).
+#
+# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
+# and -DNOFOO=ON if it is disabled.
+cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; }
+
+# Internal function for modifying hardcoded definitions.
+# Removes dangerous definitions that override Gentoo settings.
+_cmake_modify-cmakelists() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Only edit the files once
+	grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
+
+	# Comment out all set (<some_should_be_user_defined_variable> value)
+	find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE\([[:space:]].*)\|)\)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
+		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
+	local x
+	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do
+		einfo "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
+		einfo "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
+	done
+
+	# NOTE Append some useful summary here
+	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
+
+		MESSAGE(STATUS "<<< Gentoo configuration >>>
+		Build type      \${CMAKE_BUILD_TYPE}
+		Install path    \${CMAKE_INSTALL_PREFIX}
+		Compiler flags:
+		C               \${CMAKE_C_FLAGS}
+		C++             \${CMAKE_CXX_FLAGS}
+		Linker flags:
+		Executable      \${CMAKE_EXE_LINKER_FLAGS}
+		Module          \${CMAKE_MODULE_LINKER_FLAGS}
+		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
+	_EOF_
+}
+
+# temporary function for moving cmake cleanups from from src_configure -> src_prepare.
+# bug #378850
+_cmake_cleanup_cmake() {
+	: ${CMAKE_USE_DIR:=${S}}
+
+	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
+		local name
+		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
+			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
+		done
+	fi
+
+	# check if CMakeLists.txt exist and if no then die
+	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
+		eerror "Unable to locate CMakeLists.txt under:"
+		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
+		eerror "Consider not inheriting the cmake eclass."
+		die "FATAL: Unable to find CMakeLists.txt"
+	fi
+
+	# Remove dangerous things.
+	_cmake_modify-cmakelists
+}
+
+# @FUNCTION: cmake-utils_src_prepare
+# @DESCRIPTION:
+# Apply ebuild and user patches.
+cmake-utils_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	pushd "${S}" > /dev/null || die
+
+	if [[ ${EAPI} != 5 ]]; then
+		default_src_prepare
+		_cmake_cleanup_cmake
+	else
+		debug-print "$FUNCNAME: PATCHES=$PATCHES"
+		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+		debug-print "$FUNCNAME: applying user patches"
+		epatch_user
+	fi
+
+	popd > /dev/null || die
+
+	# make ${S} read-only in order to detect broken build-systems
+	if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
+		chmod -R a-w "${S}"
+	fi
+
+	_CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
+}
+
+# @VARIABLE: mycmakeargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Optional cmake defines as a bash array. Should be defined before calling
+# src_configure.
+# @CODE
+# src_configure() {
+# 	local mycmakeargs=(
+# 		$(cmake-utils_use_with openconnect)
+# 	)
+#
+# 	cmake-utils_src_configure
+# }
+# @CODE
+
+# @FUNCTION: cmake-utils_src_configure
+# @DESCRIPTION:
+# General function for configuring with cmake. Default behaviour is to start an
+# out-of-source build.
+cmake-utils_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
+		if [[ ${EAPI} != [56] ]]; then
+			die "FATAL: cmake-utils_src_prepare has not been run"
+		else
+			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+		fi
+	fi
+
+	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
+
+	_cmake_check_build_dir
+
+	# Fix xdg collision with sandbox
+	xdg_environment_reset
+
+	# @SEE CMAKE_BUILD_TYPE
+	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
+		# Handle release builds
+		if ! has debug ${IUSE//+} || ! use debug; then
+			local CPPFLAGS=${CPPFLAGS}
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
+	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
+
+	cat > "${build_rules}" <<- _EOF_ || die
+		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
+		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
+		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
+		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
+		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
+	_EOF_
+
+	local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC)
+
+	# !!! IMPORTANT NOTE !!!
+	# Single slash below is intentional. CMake is weird and wants the
+	# CMAKE_*_VARIABLES split into two elements: the first one with
+	# compiler path, and the second one with all command-line options,
+	# space separated.
+	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
+	cat > ${toolchain_file} <<- _EOF_ || die
+		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
+		SET (CMAKE_C_COMPILER "${myCC/ /;}")
+		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
+		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
+		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
+		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
+		SET (CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}")
+	_EOF_
+
+	# We are using the C compiler for assembly by default.
+	local -x ASMFLAGS=${CFLAGS}
+	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	if tc-is-cross-compiler; then
+		local sysname
+		case "${KERNEL:-linux}" in
+			Cygwin) sysname="CYGWIN_NT-5.1" ;;
+			HPUX) sysname="HP-UX" ;;
+			linux) sysname="Linux" ;;
+			Winnt)
+				sysname="Windows"
+				cat >> "${toolchain_file}" <<- _EOF_ || die
+					SET (CMAKE_RC_COMPILER $(tc-getRC))
+				_EOF_
+				;;
+			*) sysname="${KERNEL}" ;;
+		esac
+
+		cat >> "${toolchain_file}" <<- _EOF_ || die
+			SET (CMAKE_SYSTEM_NAME "${sysname}")
+		_EOF_
+
+		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_FIND_ROOT_PATH "${SYSROOT}")
+				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
+	fi
+
+	if use prefix-guest; then
+		cat >> "${build_rules}" <<- _EOF_ || die
+			# in Prefix we need rpath and must ensure cmake gets our default linker path
+			# right ... except for Darwin hosts
+			IF (NOT APPLE)
+			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
+			CACHE STRING "" FORCE)
+
+			ELSE ()
+
+			SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
+			SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
+			SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+			SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
+
+			ENDIF (NOT APPLE)
+		_EOF_
+	fi
+
+	# Common configure parameters (invariants)
+	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
+	local libdir=$(get_libdir)
+	cat > "${common_config}" <<- _EOF_ || die
+		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
+		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
+		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
+		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
+		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
+	_EOF_
+	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
+
+	if [[ ${EAPI} != [56] ]]; then
+		cat >> "${common_config}" <<- _EOF_ || die
+			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
+			SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
+		_EOF_
+	fi
+
+	# Wipe the default optimization flags out of CMake
+	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
+		cat >> ${common_config} <<- _EOF_ || die
+			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+		_EOF_
+	fi
+
+	# Convert mycmakeargs to an array, for backwards compatibility
+	# Make the array a local variable since <=portage-2.1.6.x does not
+	# support global arrays (see bug #297255).
+	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
+	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
+		if [[ -n "${mycmakeargstype}" ]] ; then
+			if [[ ${EAPI} == 5 ]]; then
+				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+			else
+				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
+			fi
+		fi
+		local mycmakeargs_local=(${mycmakeargs})
+	else
+		local mycmakeargs_local=("${mycmakeargs[@]}")
+	fi
+
+	if [[ ${CMAKE_WARN_UNUSED_CLI} == no ]] ; then
+		local warn_unused_cli="--no-warn-unused-cli"
+	else
+		local warn_unused_cli=""
+	fi
+
+	# Common configure parameters (overridable)
+	# NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable
+	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
+	local cmakeargs=(
+		${warn_unused_cli}
+		-C "${common_config}"
+		-G "$(_cmake_generator_to_use)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		"${mycmakeargs_local[@]}"
+		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
+		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
+		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
+		"${MYCMAKEARGS}"
+	)
+
+	if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
+		cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
+	fi
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
+	echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
+	"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
+	popd > /dev/null || die
+}
+
+# @FUNCTION: cmake-utils_src_compile
+# @DESCRIPTION:
+# General function for compiling with cmake.
+# Automatically detects the build type. All arguments are passed to emake.
+cmake-utils_src_compile() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	cmake-utils_src_make "$@"
+}
+
+# @FUNCTION: _cmake_ninja_src_make
+# @INTERNAL
+# @DESCRIPTION:
+# Build the package using ninja generator
+_cmake_ninja_src_make() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
+
+	eninja "$@"
+}
+
+# @FUNCTION: _cmake_emake_src_make
+# @INTERNAL
+# @DESCRIPTION:
+# Build the package using make generator
+_cmake_emake_src_make() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
+
+	if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
+		emake VERBOSE=1 "$@" || die
+	else
+		emake "$@" || die
+	fi
+
+}
+
+# @FUNCTION: cmake-utils_src_make
+# @DESCRIPTION:
+# Function for building the package. Automatically detects the build type.
+# All arguments are passed to emake.
+cmake-utils_src_make() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_cmake_check_build_dir
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	_cmake_${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
+
+	popd > /dev/null || die
+}
+
+# @FUNCTION: cmake-utils_src_test
+# @DESCRIPTION:
+# Function for testing the package. Automatically detects the build type.
+cmake-utils_src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_cmake_check_build_dir
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
+
+	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+
+	set -- ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"
+	echo "$@" >&2
+	if "$@" ; then
+		einfo "Tests succeeded."
+		popd > /dev/null || die
+		return 0
+	else
+		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
+			# on request from Diego
+			eerror "Tests failed. Test log ${BUILD_DIR}/Testing/Temporary/LastTest.log follows:"
+			eerror "--START TEST LOG--------------------------------------------------------------"
+			cat "${BUILD_DIR}/Testing/Temporary/LastTest.log"
+			eerror "--END TEST LOG----------------------------------------------------------------"
+			die "Tests failed."
+		else
+			die "Tests failed. When you file a bug, please attach the following file: \n\t${BUILD_DIR}/Testing/Temporary/LastTest.log"
+		fi
+
+		# die might not die due to nonfatal
+		popd > /dev/null || die
+		return 1
+	fi
+}
+
+# @FUNCTION: cmake-utils_src_install
+# @DESCRIPTION:
+# Function for installing the package. Automatically detects the build type.
+cmake-utils_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
+
+	pushd "${S}" > /dev/null || die
+	einstalldocs
+	popd > /dev/null || die
+}
+
+fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8e2b8c86f2a4161848ff16567f20eb905d741292
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 11:11:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e2b8c86

cmake.eclass: Array support for CMAKE_REMOVE_MODULES_LIST

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 0cf10c14a8..587ba1d9b5 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -331,8 +331,15 @@ cmake_src_prepare() {
 		die "FATAL: Unable to find CMakeLists.txt"
 	fi
 
+	local modules_list
+	if [[ $(declare -p CMAKE_REMOVE_MODULES_LIST) == "declare -a"* ]]; then
+		modules_list=( "${CMAKE_REMOVE_MODULES_LIST[@]}" )
+	else
+		modules_list=( ${CMAKE_REMOVE_MODULES_LIST} )
+	fi
+
 	local name
-	for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
+	for name in "${modules_list[@]}" ; do
 		find "${S}" -name ${name}.cmake -exec rm -v {} + || die
 	done
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7552df1dfeda6d1a0422f3cca37fe8cf953d8719
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 10:34:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7552df1d

cmake.eclass: Drop pushd/popd from src_prepare

Added in c3d7073e1cd222d07060a0edc07079d7aa6598e6 but probably irrelevant now.
See also: https://bugs.gentoo.org/459678

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 587ba1d9b5..af8ca6faa5 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -318,8 +318,6 @@ _cmake_modify-cmakelists() {
 cmake_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null || die
-
 	default_src_prepare
 	_cmake_check_build_dir
 
@@ -346,8 +344,6 @@ cmake_src_prepare() {
 	# Remove dangerous things.
 	_cmake_modify-cmakelists
 
-	popd > /dev/null || die
-
 	# make ${S} read-only in order to detect broken build-systems
 	if [[ ${CMAKE_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
 		chmod -R a-w "${S}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4254dcbfdbd03a65488951dcafbff5b721aaf9c4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 13:08:39 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4254dcbf

cmake.eclass: Drop _cmake_generator_to_use()

CMAKE_MAKEFILE_GENERATOR validity is already checked in global scope.
Move the check for dev-util/ninja into src_prepare.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index af8ca6faa5..ca23bf452c 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -146,31 +146,6 @@ _cmake_check_build_dir() {
 	einfo "Working in BUILD_DIR: \"$BUILD_DIR\""
 }
 
-# Determine which generator to use
-_cmake_generator_to_use() {
-	local generator_name
-
-	case ${CMAKE_MAKEFILE_GENERATOR} in
-		ninja)
-			# 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 ! has_version -b dev-util/ninja; then
-				die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-			fi
-			generator_name="Ninja"
-			;;
-		emake)
-			generator_name="Unix Makefiles"
-			;;
-		*)
-			eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
-			die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
-			;;
-	esac
-
-	echo ${generator_name}
-}
-
 # @FUNCTION: cmake_comment_add_subdirectory
 # @USAGE: <subdirectory>
 # @DESCRIPTION:
@@ -329,6 +304,13 @@ 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 [[ $(declare -p CMAKE_REMOVE_MODULES_LIST) == "declare -a"* ]]; then
 		modules_list=( "${CMAKE_REMOVE_MODULES_LIST[@]}" )
@@ -524,13 +506,19 @@ cmake_src_configure() {
 		warn_unused_cli="--no-warn-unused-cli"
 	fi
 
+	local generator_name
+	case ${CMAKE_MAKEFILE_GENERATOR} in
+		ninja) generator_name="Ninja" ;;
+		emake) generator_name="Unix Makefiles" ;;
+	esac
+
 	# Common configure parameters (overridable)
 	# NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable
 	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
 	local cmakeargs=(
 		${warn_unused_cli}
 		-C "${common_config}"
-		-G "$(_cmake_generator_to_use)"
+		-G "${generator_name}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fb49f2e0ff1a3ee41804a32d30246eae1ac7ab26
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 11:01:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb49f2e0

cmake.eclass: Rename cmake_src_make() -> cmake_build()

_cmake_ninja_src_make -> _cmake_ninja_build
_cmake_emake_src_make -> _cmake_emake_build

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index ca23bf452c..ef6a5c3d7f 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -544,14 +544,14 @@ cmake_src_configure() {
 cmake_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cmake_src_make "$@"
+	cmake_build "$@"
 }
 
-# @FUNCTION: _cmake_ninja_src_make
+# @FUNCTION: _cmake_ninja_build
 # @INTERNAL
 # @DESCRIPTION:
 # Build the package using ninja generator
-_cmake_ninja_src_make() {
+_cmake_ninja_build() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
@@ -559,38 +559,46 @@ _cmake_ninja_src_make() {
 	eninja "$@"
 }
 
-# @FUNCTION: _cmake_emake_src_make
+# @FUNCTION: _cmake_emake_build
 # @INTERNAL
 # @DESCRIPTION:
 # Build the package using make generator
-_cmake_emake_src_make() {
+_cmake_emake_build() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
 
 	if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-		emake VERBOSE=1 "$@" || die
+		emake VERBOSE=1 "$@"
 	else
-		emake "$@" || die
+		emake "$@"
 	fi
 
 }
 
-# @FUNCTION: cmake_src_make
+# @FUNCTION: cmake_build
 # @DESCRIPTION:
 # Function for building the package. Automatically detects the build type.
 # All arguments are passed to emake.
-cmake_src_make() {
+cmake_build() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	_cmake_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 
-	_cmake_${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
+	_cmake_${CMAKE_MAKEFILE_GENERATOR}_build "$@"
 
 	popd > /dev/null || die
 }
 
+# @FUNCTION: cmake-utils_src_make
+# @INTERNAL
+# @DESCRIPTION:
+# Banned. Use cmake_build instead.
+cmake-utils_src_make() {
+	die "cmake_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/

[Andreas Sturmlechner]

commit:     fbfa792a373c42579734e4de4da9b4139edefd80
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 23:12:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbfa792a

cmake.eclass: Drop CMAKE_REMOVE_MODULES

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 730a1929fa..0cf10c14a8 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -55,15 +55,11 @@ _CMAKE_ECLASS=1
 # The default is set to "ninja".
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
-# @DESCRIPTION:
-# Do we want to remove anything? yes or whatever else for no
-: ${CMAKE_REMOVE_MODULES:=yes}
-
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
 # @DESCRIPTION:
 # Space-separated list of CMake modules that will be removed in $S during
 # src_prepare, in order to force packages to use the system version.
+# Set to empty to disable removing modules entirely.
 : ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
 
 # @ECLASS-VARIABLE: CMAKE_USE_DIR
@@ -108,6 +104,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 [[ ${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=\"\" 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"
@@ -334,12 +331,10 @@ cmake_src_prepare() {
 		die "FATAL: Unable to find CMakeLists.txt"
 	fi
 
-	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
-		local name
-		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
-		done
-	fi
+	local name
+	for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
+		find "${S}" -name ${name}.cmake -exec rm -v {} + || die
+	done
 
 	# Remove dangerous things.
 	_cmake_modify-cmakelists

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1bd953502f96253a87c36085d356944621ba00c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 15:40:11 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bd95350

cmake.eclass: Drop _cmake_ninja_build() and _cmake_emake_build()

Do it all in cmake_build()

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index ef6a5c3d7f..20ba229377 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -547,35 +547,6 @@ cmake_src_compile() {
 	cmake_build "$@"
 }
 
-# @FUNCTION: _cmake_ninja_build
-# @INTERNAL
-# @DESCRIPTION:
-# Build the package using ninja generator
-_cmake_ninja_build() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
-
-	eninja "$@"
-}
-
-# @FUNCTION: _cmake_emake_build
-# @INTERNAL
-# @DESCRIPTION:
-# Build the package using make generator
-_cmake_emake_build() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
-
-	if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-		emake VERBOSE=1 "$@"
-	else
-		emake "$@"
-	fi
-
-}
-
 # @FUNCTION: cmake_build
 # @DESCRIPTION:
 # Function for building the package. Automatically detects the build type.
@@ -586,7 +557,17 @@ cmake_build() {
 	_cmake_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 
-	_cmake_${CMAKE_MAKEFILE_GENERATOR}_build "$@"
+	case ${CMAKE_MAKEFILE_GENERATOR} in
+		emake)
+			[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
+			[[ "${CMAKE_VERBOSE}" != "OFF" ]] && local verbosity="VERBOSE=1"
+			emake "${verbosity} ""$@"
+			;;
+		ninja)
+			[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
+			eninja "$@"
+			;;
+	esac
 
 	popd > /dev/null || die
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0c27391c09d5e65edd7200353c3dbfe3eb629ee8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 00:06:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:40:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c27391c

cmake-utils.eclass: Drop it

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake-utils.eclass | 838 ----------------------------------------------
 1 file changed, 838 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
deleted file mode 100644
index b022599232..0000000000
--- a/eclass/cmake-utils.eclass
+++ /dev/null
@@ -1,838 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: cmake-utils.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @AUTHOR:
-# Tomáš Chvátal <scarabeus@gentoo.org>
-# Maciej Mrozowski <reavertm@gentoo.org>
-# (undisclosed contributors)
-# Original author: Zephyrus (zephyrus@mirach.it)
-# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: common ebuild functions for cmake-based packages
-# @DESCRIPTION:
-# The cmake-utils 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
-# and use_with functions for CMake.
-
-if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
-_CMAKE_UTILS_ECLASS=1
-
-# @ECLASS-VARIABLE: BUILD_DIR
-# @DESCRIPTION:
-# Build directory where all cmake processed files should be generated.
-# For in-source build it's fixed to ${CMAKE_USE_DIR}.
-# For out-of-source build it can be overridden, by default it uses
-# ${WORKDIR}/${P}_build.
-#
-# This variable has been called CMAKE_BUILD_DIR formerly.
-# It is set under that name for compatibility.
-
-# @ECLASS-VARIABLE: CMAKE_BINARY
-# @DESCRIPTION:
-# Eclass can use different cmake binary than the one provided in by system.
-: ${CMAKE_BINARY:=cmake}
-
-# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
-# @DESCRIPTION:
-# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
-# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
-# If about to be set - needs to be set before invoking cmake-utils_src_configure.
-# You usualy do *NOT* want nor need to set it as it pulls CMake default build-type
-# specific compiler flags overriding make.conf.
-: ${CMAKE_BUILD_TYPE:=Gentoo}
-
-# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set to enable in-source build.
-
-# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specify a makefile generator to be used by cmake.
-# At this point only "emake" and "ninja" are supported.
-# In EAPI 7 and above, the default is set to "ninja",
-# whereas in EAPIs below 7, it is set to "emake".
-
-# @ECLASS-VARIABLE: CMAKE_MIN_VERSION
-# @DESCRIPTION:
-# Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.9.6}
-
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
-# @DESCRIPTION:
-# Do we want to remove anything? yes or whatever else for no
-: ${CMAKE_REMOVE_MODULES:=yes}
-
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
-# @DESCRIPTION:
-# Space-separated list of CMake modules that will be removed in $S during src_prepare,
-# in order to force packages to use the system version.
-: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
-
-# @ECLASS-VARIABLE: CMAKE_USE_DIR
-# @DESCRIPTION:
-# Sets the directory where we are working with cmake.
-# For example when application uses autotools and only one
-# plugin needs to be done by cmake.
-# By default it uses ${S}.
-
-# @ECLASS-VARIABLE: CMAKE_VERBOSE
-# @DESCRIPTION:
-# Set to OFF to disable verbose messages during compilation
-: ${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.
-
-# @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
-# for econf and is needed to pass TRY_RUN results when cross-compiling.
-# Should be set by user in a per-package basis in /etc/portage/package.env.
-
-# @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
-# a user flag and should under _no circumstances_ be set in the ebuild.
-# Helps in improving QA of build systems that write to source tree.
-
-case ${EAPI} in
-	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-	6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
-
-case ${EAPI} in
-	[56])
-		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-		inherit eutils multilib
-		;;
-	*)
-		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-		;;
-esac
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-
-if [[ ${WANT_CMAKE} ]]; then
-	if [[ ${EAPI} != [56] ]]; then
-		die "\${WANT_CMAKE} has been removed and is a no-op now"
-	else
-		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
-	fi
-fi
-[[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
-
-case ${CMAKE_MAKEFILE_GENERATOR} in
-	emake)
-		BDEPEND="sys-devel/make"
-		;;
-	ninja)
-		BDEPEND="dev-util/ninja"
-		;;
-	*)
-		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
-		die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
-		;;
-esac
-
-if [[ ${PN} != cmake ]]; then
-	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
-fi
-
-case ${EAPI} in
-	7) ;;
-	*) DEPEND=" ${BDEPEND}" ;;
-esac
-
-# Internal functions used by cmake-utils_use_*
-_cmake_use_me_now() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local arg=$2
-	[[ ! -z $3 ]] && arg=$3
-
-	[[ ${EAPI} == 5 ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo ON || echo OFF)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo ON || echo OFF) "
-		done
-	fi
-}
-_cmake_use_me_now_inverted() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local arg=$2
-	[[ ! -z $3 ]] && arg=$3
-
-	if [[ ${EAPI} != 5 && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
-		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-	fi
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo OFF || echo ON)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
-		done
-	fi
-}
-
-# Determine using IN or OUT source build
-_cmake_check_build_dir() {
-	: ${CMAKE_USE_DIR:=${S}}
-	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		# we build in source dir
-		BUILD_DIR="${CMAKE_USE_DIR}"
-	else
-		# Respect both the old variable and the new one, depending
-		# on which one was set by the ebuild.
-		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
-			if [[ ${EAPI} != [56] ]]; then
-				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-				die "The ebuild must be migrated to BUILD_DIR."
-			else
-				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-				eqawarn "Please migrate the ebuild to use the new one."
-			fi
-
-			# In the next call, both variables will be set already
-			# and we'd have to know which one takes precedence.
-			_RESPECT_CMAKE_BUILD_DIR=1
-		fi
-
-		if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then
-			BUILD_DIR=${CMAKE_BUILD_DIR:-${WORKDIR}/${P}_build}
-		else
-			: ${BUILD_DIR:=${WORKDIR}/${P}_build}
-		fi
-	fi
-
-	# Backwards compatibility for getting the value.
-	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
-
-	mkdir -p "${BUILD_DIR}" || die
-	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
-}
-
-# Determine which generator to use
-_cmake_generator_to_use() {
-	local generator_name
-
-	case ${CMAKE_MAKEFILE_GENERATOR} in
-		ninja)
-			# 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
-			case ${EAPI} in
-				5|6)
-					if ! ROOT=/ has_version dev-util/ninja; then
-						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-					fi
-				;;
-				*)
-					if ! has_version -b dev-util/ninja; then
-						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-					fi
-				;;
-			esac
-			generator_name="Ninja"
-			;;
-		emake)
-			generator_name="Unix Makefiles"
-			;;
-		*)
-			eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
-			die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
-			;;
-	esac
-
-	echo ${generator_name}
-}
-
-# @FUNCTION: cmake_comment_add_subdirectory
-# @USAGE: <subdirectory>
-# @DESCRIPTION:
-# Comment out one or more add_subdirectory calls in CMakeLists.txt in the current directory
-cmake_comment_add_subdirectory() {
-	if [[ -z ${1} ]]; then
-		die "comment_add_subdirectory must be passed at least one directory name to comment"
-	fi
-
-	if [[ -e "CMakeLists.txt" ]]; then
-		local d
-		for d in $@; do
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
-				-i CMakeLists.txt || die "failed to comment add_subdirectory(${d})"
-		done
-	fi
-}
-
-# @FUNCTION: comment_add_subdirectory
-# @USAGE: <subdirectory>
-# @DESCRIPTION:
-# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
-# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
-comment_add_subdirectory() {
-	[[ ${EAPI} == 5 ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
-
-	cmake_comment_add_subdirectory "$@"
-}
-
-# @FUNCTION: cmake-utils_use_with
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_with. See ebuild(5).
-#
-# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
-# and -DWITH_FOO=OFF if it is disabled.
-cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_enable
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
-# and -DENABLE_FOO=OFF if it is disabled.
-cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_find_package
-# @USAGE: <USE flag> <package name>
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF
-# if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
-# This can be used to make find_package optional.
-cmake-utils_use_find_package() {
-	if [[ ${EAPI} != 5 && "$#" != 2 ]] ; then
-		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
-	fi
-
-	_cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
-}
-
-# @FUNCTION: cmake_use_find_package
-# @USAGE: <USE flag> <package name>
-# @DESCRIPTION:
-# Alias for cmake-utils_use_find_package.
-cmake_use_find_package() {
-	if [[ "$#" != 2 ]] ; then
-		die "Usage: cmake_use_find_package <USE flag> <package name>"
-	fi
-
-	cmake-utils_use_find_package "$@" ;
-}
-
-# @FUNCTION: cmake-utils_use_disable
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on inversion of use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
-# and -DDISABLE_FOO=ON if it is disabled.
-cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_no
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_disable. See ebuild(5).
-#
-# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
-# and -DNO_FOO=ON if it is disabled.
-cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_want
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
-# and -DWANT_FOO=OFF if it is disabled.
-cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_build
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
-# and -DBUILD_FOO=OFF if it is disabled.
-cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_has
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
-# and -DHAVE_FOO=OFF if it is disabled.
-cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_use
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
-# and -DUSE_FOO=OFF if it is disabled.
-cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
-# and -DFOO=OFF if it is disabled.
-cmake-utils_use() { _cmake_use_me_now "" "$@" ; }
-
-# @FUNCTION: cmake-utils_useno
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
-# and -DNOFOO=ON if it is disabled.
-cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; }
-
-# Internal function for modifying hardcoded definitions.
-# Removes dangerous definitions that override Gentoo settings.
-_cmake_modify-cmakelists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Only edit the files once
-	grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
-
-	# Comment out all set (<some_should_be_user_defined_variable> value)
-	find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE\([[:space:]].*)\|)\)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
-	local x
-	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do
-		einfo "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
-		einfo "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
-	done
-
-	# NOTE Append some useful summary here
-	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
-
-		MESSAGE(STATUS "<<< Gentoo configuration >>>
-		Build type      \${CMAKE_BUILD_TYPE}
-		Install path    \${CMAKE_INSTALL_PREFIX}
-		Compiler flags:
-		C               \${CMAKE_C_FLAGS}
-		C++             \${CMAKE_CXX_FLAGS}
-		Linker flags:
-		Executable      \${CMAKE_EXE_LINKER_FLAGS}
-		Module          \${CMAKE_MODULE_LINKER_FLAGS}
-		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
-	_EOF_
-}
-
-# temporary function for moving cmake cleanups from from src_configure -> src_prepare.
-# bug #378850
-_cmake_cleanup_cmake() {
-	: ${CMAKE_USE_DIR:=${S}}
-
-	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
-		local name
-		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
-		done
-	fi
-
-	# check if CMakeLists.txt exist and if no then die
-	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
-		eerror "Unable to locate CMakeLists.txt under:"
-		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
-		eerror "Consider not inheriting the cmake eclass."
-		die "FATAL: Unable to find CMakeLists.txt"
-	fi
-
-	# Remove dangerous things.
-	_cmake_modify-cmakelists
-}
-
-# @FUNCTION: cmake-utils_src_prepare
-# @DESCRIPTION:
-# Apply ebuild and user patches.
-cmake-utils_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	pushd "${S}" > /dev/null || die
-
-	if [[ ${EAPI} != 5 ]]; then
-		default_src_prepare
-		_cmake_cleanup_cmake
-	else
-		debug-print "$FUNCNAME: PATCHES=$PATCHES"
-		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-		debug-print "$FUNCNAME: applying user patches"
-		epatch_user
-	fi
-
-	popd > /dev/null || die
-
-	# make ${S} read-only in order to detect broken build-systems
-	if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		chmod -R a-w "${S}"
-	fi
-
-	_CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
-}
-
-# @VARIABLE: mycmakeargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional cmake defines as a bash array. Should be defined before calling
-# src_configure.
-# @CODE
-# src_configure() {
-# 	local mycmakeargs=(
-# 		$(cmake-utils_use_with openconnect)
-# 	)
-#
-# 	cmake-utils_src_configure
-# }
-# @CODE
-
-# @FUNCTION: cmake-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with cmake. Default behaviour is to start an
-# out-of-source build.
-cmake-utils_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
-		if [[ ${EAPI} != [56] ]]; then
-			die "FATAL: cmake-utils_src_prepare has not been run"
-		else
-			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
-		fi
-	fi
-
-	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
-
-	_cmake_check_build_dir
-
-	# Fix xdg collision with sandbox
-	xdg_environment_reset
-
-	# @SEE CMAKE_BUILD_TYPE
-	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
-		# Handle release builds
-		if ! has debug ${IUSE//+} || ! use debug; then
-			local CPPFLAGS=${CPPFLAGS}
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
-	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
-
-	cat > "${build_rules}" <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
-		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
-	_EOF_
-
-	local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC)
-
-	# !!! IMPORTANT NOTE !!!
-	# Single slash below is intentional. CMake is weird and wants the
-	# CMAKE_*_VARIABLES split into two elements: the first one with
-	# compiler path, and the second one with all command-line options,
-	# space separated.
-	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
-	cat > ${toolchain_file} <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
-		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
-		SET (CMAKE_C_COMPILER "${myCC/ /;}")
-		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
-		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
-		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
-		SET (CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}")
-	_EOF_
-
-	# We are using the C compiler for assembly by default.
-	local -x ASMFLAGS=${CFLAGS}
-	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	if tc-is-cross-compiler; then
-		local sysname
-		case "${KERNEL:-linux}" in
-			Cygwin) sysname="CYGWIN_NT-5.1" ;;
-			HPUX) sysname="HP-UX" ;;
-			linux) sysname="Linux" ;;
-			Winnt)
-				sysname="Windows"
-				cat >> "${toolchain_file}" <<- _EOF_ || die
-					SET (CMAKE_RC_COMPILER $(tc-getRC))
-				_EOF_
-				;;
-			*) sysname="${KERNEL}" ;;
-		esac
-
-		cat >> "${toolchain_file}" <<- _EOF_ || die
-			SET (CMAKE_SYSTEM_NAME "${sysname}")
-		_EOF_
-
-		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_FIND_ROOT_PATH "${SYSROOT}")
-				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
-	fi
-
-	if use prefix-guest; then
-		cat >> "${build_rules}" <<- _EOF_ || die
-			# in Prefix we need rpath and must ensure cmake gets our default linker path
-			# right ... except for Darwin hosts
-			IF (NOT APPLE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
-			CACHE STRING "" FORCE)
-
-			ELSE ()
-
-			SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
-			SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
-			SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-
-			ENDIF (NOT APPLE)
-		_EOF_
-	fi
-
-	# Common configure parameters (invariants)
-	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
-	local libdir=$(get_libdir)
-	cat > "${common_config}" <<- _EOF_ || die
-		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
-		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
-		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
-		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
-		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
-		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
-	_EOF_
-	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
-
-	if [[ ${EAPI} != [56] ]]; then
-		cat >> "${common_config}" <<- _EOF_ || die
-			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
-			SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
-		_EOF_
-	fi
-
-	# Wipe the default optimization flags out of CMake
-	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
-		cat >> ${common_config} <<- _EOF_ || die
-			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-		_EOF_
-	fi
-
-	# Convert mycmakeargs to an array, for backwards compatibility
-	# Make the array a local variable since <=portage-2.1.6.x does not
-	# support global arrays (see bug #297255).
-	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
-	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
-		if [[ -n "${mycmakeargstype}" ]] ; then
-			if [[ ${EAPI} == 5 ]]; then
-				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
-			else
-				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
-			fi
-		fi
-		local mycmakeargs_local=(${mycmakeargs})
-	else
-		local mycmakeargs_local=("${mycmakeargs[@]}")
-	fi
-
-	if [[ ${CMAKE_WARN_UNUSED_CLI} == no ]] ; then
-		local warn_unused_cli="--no-warn-unused-cli"
-	else
-		local warn_unused_cli=""
-	fi
-
-	# Common configure parameters (overridable)
-	# NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable
-	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
-	local cmakeargs=(
-		${warn_unused_cli}
-		-C "${common_config}"
-		-G "$(_cmake_generator_to_use)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		"${mycmakeargs_local[@]}"
-		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
-		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
-		"${MYCMAKEARGS}"
-	)
-
-	if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
-		cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
-	fi
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
-	echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
-	"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
-	popd > /dev/null || die
-}
-
-# @FUNCTION: cmake-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with cmake.
-# Automatically detects the build type. All arguments are passed to emake.
-cmake-utils_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	cmake-utils_src_make "$@"
-}
-
-# @FUNCTION: _cmake_ninja_src_make
-# @INTERNAL
-# @DESCRIPTION:
-# Build the package using ninja generator
-_cmake_ninja_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
-
-	eninja "$@"
-}
-
-# @FUNCTION: _cmake_emake_src_make
-# @INTERNAL
-# @DESCRIPTION:
-# Build the package using make generator
-_cmake_emake_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
-
-	if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-		emake VERBOSE=1 "$@" || die
-	else
-		emake "$@" || die
-	fi
-
-}
-
-# @FUNCTION: cmake-utils_src_make
-# @DESCRIPTION:
-# Function for building the package. Automatically detects the build type.
-# All arguments are passed to emake.
-cmake-utils_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_cmake_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	_cmake_${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: cmake-utils_src_test
-# @DESCRIPTION:
-# Function for testing the package. Automatically detects the build type.
-cmake-utils_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_cmake_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	set -- ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"
-	echo "$@" >&2
-	if "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
-			# on request from Diego
-			eerror "Tests failed. Test log ${BUILD_DIR}/Testing/Temporary/LastTest.log follows:"
-			eerror "--START TEST LOG--------------------------------------------------------------"
-			cat "${BUILD_DIR}/Testing/Temporary/LastTest.log"
-			eerror "--END TEST LOG----------------------------------------------------------------"
-			die "Tests failed."
-		else
-			die "Tests failed. When you file a bug, please attach the following file: \n\t${BUILD_DIR}/Testing/Temporary/LastTest.log"
-		fi
-
-		# die might not die due to nonfatal
-		popd > /dev/null || die
-		return 1
-	fi
-}
-
-# @FUNCTION: cmake-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package. Automatically detects the build type.
-cmake-utils_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
-
-	pushd "${S}" > /dev/null || die
-	einstalldocs
-	popd > /dev/null || die
-}
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     54eb94ee5601d07c374e0f66990955cf267eab28
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 11:26:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 11:36:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=54eb94ee

ecm.eclass: Ban variables from kde5*eclass for stricter porting

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 79dccdb54f..e5be59add7 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -310,6 +310,24 @@ DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
+# @FUNCTION: _ecm_banned_var
+# @INTERNAL
+# @DESCRIPTION:
+# Banned kde5*.eclass variables are banned.
+_ecm_banned_var() {
+	die "$1 is banned. use $2 instead."
+}
+
+if [[ -z ${_KDE5_ECLASS} ]] ; then
+	[[ -n ${KDE_DEBUG} ]] || _ecm_banned_var KDE_DEBUG ECM_DEBUG
+	[[ -n ${KDE_EXAMPLES} ]] || _ecm_banned_var KDE_EXAMPLES ECM_EXAMPLES
+	[[ -n ${KDE_HANDBOOK} ]] || _ecm_banned_var KDE_HANDBOOK ECM_HANDBOOK
+	[[ -n ${KDE_DOC_DIR} ]] || _ecm_banned_var KDE_DOC_DIR ECM_HANDBOOK_DIR
+	[[ -n ${KDE_PO_DIRS} ]] || _ecm_banned_var KDE_PO_DIRS ECM_PO_DIRS
+	[[ -n ${KDE_QTHELP} ]] || _ecm_banned_var KDE_QTHELP ECM_QTHELP
+	[[ -n ${KDE_TEST} ]] || _ecm_banned_var KDE_TEST ECM_TEST
+fi
+
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d067c65904720e58a677a49dd810da2e3a446a93
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 11:41:53 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 11:41:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d067c659

ecm.eclass: Fix condition for _ecm_banned_var

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index e5be59add7..2892b0e0e9 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -319,13 +319,13 @@ _ecm_banned_var() {
 }
 
 if [[ -z ${_KDE5_ECLASS} ]] ; then
-	[[ -n ${KDE_DEBUG} ]] || _ecm_banned_var KDE_DEBUG ECM_DEBUG
-	[[ -n ${KDE_EXAMPLES} ]] || _ecm_banned_var KDE_EXAMPLES ECM_EXAMPLES
-	[[ -n ${KDE_HANDBOOK} ]] || _ecm_banned_var KDE_HANDBOOK ECM_HANDBOOK
-	[[ -n ${KDE_DOC_DIR} ]] || _ecm_banned_var KDE_DOC_DIR ECM_HANDBOOK_DIR
-	[[ -n ${KDE_PO_DIRS} ]] || _ecm_banned_var KDE_PO_DIRS ECM_PO_DIRS
-	[[ -n ${KDE_QTHELP} ]] || _ecm_banned_var KDE_QTHELP ECM_QTHELP
-	[[ -n ${KDE_TEST} ]] || _ecm_banned_var KDE_TEST ECM_TEST
+	[[ -n ${KDE_DEBUG} ]] && _ecm_banned_var KDE_DEBUG ECM_DEBUG
+	[[ -n ${KDE_EXAMPLES} ]] && _ecm_banned_var KDE_EXAMPLES ECM_EXAMPLES
+	[[ -n ${KDE_HANDBOOK} ]] && _ecm_banned_var KDE_HANDBOOK ECM_HANDBOOK
+	[[ -n ${KDE_DOC_DIR} ]] && _ecm_banned_var KDE_DOC_DIR ECM_HANDBOOK_DIR
+	[[ -n ${KDE_PO_DIRS} ]] && _ecm_banned_var KDE_PO_DIRS ECM_PO_DIRS
+	[[ -n ${KDE_QTHELP} ]] && _ecm_banned_var KDE_QTHELP ECM_QTHELP
+	[[ -n ${KDE_TEST} ]] && _ecm_banned_var KDE_TEST ECM_TEST
 fi
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cf493d5dcedbf1df2e73c495ed9c067480325323
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 14:23:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 14:23:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf493d5d

cmake.eclass: src_configure: Make sure mycmakeargs is initialised at all

Closes: https://bugs.gentoo.org/703638
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 20ba229377..834df7f4c3 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -492,8 +492,9 @@ cmake_src_configure() {
 		_EOF_
 	fi
 
-	# Make the array a local variable since <=portage-2.1.6.x does not
-	# support global arrays (see bug #297255).
+	# Make the array a local variable since <=portage-2.1.6.x does not support
+	# global arrays (see bug #297255). But first make sure it is initialised.
+	[[ -z ${mycmakeargs} ]] && declare -a mycmakeargs=()
 	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
 	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
 		die "mycmakeargs must be declared as array"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     57a68c464a7d9effa0b2f16d6291a25a0b563e52
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 21:27:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 21:30:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=57a68c46

kde5-functions.eclass: Drop obsolete eclass

No more development, remaining ebuilds in Gentoo repo only.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 238 -------------------------------------------
 1 file changed, 238 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
deleted file mode 100644
index bbb8d6d90f..0000000000
--- a/eclass/kde5-functions.eclass
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde5-functions.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @SUPPORTED_EAPIS: 7
-# @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
-# @DESCRIPTION:
-# This eclass contains functions shared by the other KDE eclasses and forms
-# part of their public API.
-#
-# This eclass must not be inherited directly by an ebuild.
-
-if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
-_KDE5_FUNCTIONS_ECLASS=1
-
-case ${EAPI} in
-	7) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: QT_MINIMAL
-# @DESCRIPTION:
-# Minimum version of Qt to require. This affects add_qt_dep.
-: ${QT_MINIMAL:=5.12.3}
-
-# @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
-# @DESCRIPTION:
-# Minimum version of Frameworks to require. This affects add_frameworks_dep.
-: ${FRAMEWORKS_MINIMAL:=5.60.0}
-
-# @ECLASS-VARIABLE: PLASMA_MINIMAL
-# @DESCRIPTION:
-# Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.15.5}
-
-# @ECLASS-VARIABLE: KDE_APPS_MINIMAL
-# @DESCRIPTION:
-# Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=19.04.3}
-
-# @FUNCTION: _add_category_dep
-# @INTERNAL
-# @DESCRIPTION:
-# Implementation of add_plasma_dep, add_frameworks_dep, add_kdeapps_dep,
-# and finally, add_qt_dep.
-_add_category_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local category=${1}
-	local package=${2}
-	local use=${3}
-	local version=${4}
-	local slot=${5}
-
-	if [[ -n ${use} ]] ; then
-		local use="[${use}]"
-	fi
-
-	if [[ -n ${version} ]] ; then
-		local operator=">="
-		local version="-${version}"
-	fi
-
-	if [[ -n ${slot} ]] ; then
-		slot=":${slot}"
-	elif [[ ${SLOT%\/*} = 5 ]] ; then
-		slot=":${SLOT%\/*}"
-	fi
-
-	echo " ${operator}${category}/${package}${version}${slot}${use}"
-}
-
-# @FUNCTION: add_frameworks_dep
-# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
-# @DESCRIPTION:
-# Create proper dependency for kde-frameworks/ dependencies.
-# This takes 1 to 4 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly). In addition,
-# the optional fourth argument defines slot+operator instead of automatic slot
-# (use even more sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-# PORTING: no replacement
-add_frameworks_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ $# -gt 4 ]]; then
-		die "${FUNCNAME} was called with too many arguments"
-	fi
-
-	local version
-
-	if [[ -n ${3} ]]; then
-		version=${3}
-	elif [[ ${CATEGORY} = kde-frameworks ]]; then
-		version=$(ver_cut 1-2)
-	elif [[ -z ${3} ]] ; then
-		version=${FRAMEWORKS_MINIMAL}
-	fi
-
-	_add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}"
-}
-
-# @FUNCTION: add_plasma_dep
-# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
-# @DESCRIPTION:
-# Create proper dependency for kde-plasma/ dependencies.
-# This takes 1 to 4 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly). In addition,
-# the optional fourth argument defines slot+operator instead of automatic slot
-# (use even more sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-# PORTING: no replacement
-add_plasma_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ $# -gt 4 ]]; then
-		die "${FUNCNAME} was called with too many arguments"
-	fi
-
-	local version
-
-	if [[ -n ${3} ]]; then
-		version=${3}
-	elif [[ ${CATEGORY} = kde-plasma ]]; then
-		version=$(ver_cut 1-3)
-	elif [[ -z ${3} ]] ; then
-		version=${PLASMA_MINIMAL}
-	fi
-
-	_add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}"
-}
-
-# @FUNCTION: add_kdeapps_dep
-# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
-# @DESCRIPTION:
-# Create proper dependency for kde-apps/ dependencies.
-# This takes 1 to 4 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly). In addition,
-# the optional fourth argument defines slot+operator instead of automatic slot
-# (use even more sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-# PORTING: no replacement
-add_kdeapps_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ $# -gt 4 ]]; then
-		die "${FUNCNAME} was called with too many arguments"
-	fi
-
-	local version
-
-	if [[ -n ${3} ]]; then
-		version=${3}
-	elif [[ ${CATEGORY} = kde-apps ]]; then
-		version=$(ver_cut 1-3)
-	elif [[ -z ${3} ]] ; then
-		version=${KDE_APPS_MINIMAL}
-	fi
-
-	_add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}"
-}
-
-# @FUNCTION: add_qt_dep
-# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
-# @DESCRIPTION:
-# Create proper dependency for dev-qt/ dependencies.
-# This takes 1 to 4 arguments. The first being the package name, the optional
-# second is additional USE flags to append, and the optional third is the
-# version to use instead of the automatic version (use sparingly). In addition,
-# the optional fourth argument defines slot+operator instead of automatic slot
-# (use even more sparingly).
-# The output of this should be added directly to DEPEND/RDEPEND, and may be
-# wrapped in a USE conditional (but not an || conditional without an extra set
-# of parentheses).
-# PORTING: no replacement
-add_qt_dep() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ $# -gt 4 ]]; then
-		die "${FUNCNAME} was called with too many arguments"
-	fi
-
-	local version=${3}
-	local slot=${4}
-
-	if [[ -z ${version} ]]; then
-		version=${QT_MINIMAL}
-	fi
-	if [[ -z ${slot} ]]; then
-		slot="5"
-	fi
-
-	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
-}
-
-# @FUNCTION: punt_bogus_dep
-# @USAGE: <prefix> <dependency>
-# @DESCRIPTION:
-# Removes a specified dependency from a find_package call with multiple components.
-# PORTING: Use ecm_punt_bogus_dep from ecm.eclass instead.
-punt_bogus_dep() {
-	local prefix=${1}
-	local dep=${2}
-
-	if [[ ! -e "CMakeLists.txt" ]]; then
-		return
-	fi
-
-	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
-
-	# pcregrep returns non-zero on no matches/error
-	if [[ $? != 0 ]] ; then
-		return
-	fi
-
-	local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1)
-	local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1)
-	local last=$(( ${length} + ${first} - 1))
-
-	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
-
-	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
-	fi
-}
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     122b7843e32b058b9958d7f77d14b80032abe85d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 21:27:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 21:30:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=122b7843

kde5.eclass: Drop obsolete eclass

No more development, remaining ebuilds in Gentoo repo only.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5.eclass | 422 -----------------------------------------------------
 1 file changed, 422 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
deleted file mode 100644
index 0227900e26..0000000000
--- a/eclass/kde5.eclass
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde5.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @SUPPORTED_EAPIS: 7
-# @BLURB: Support eclass for packages that follow KDE packaging conventions.
-# @DESCRIPTION:
-# This eclass is *deprecated*. Please read the PORTING notes for switching to
-# ecm.eclass in case the package is using extra-cmake-modules, otherwise just
-# use cmake-utils.eclass instead. For projects hosted on kde.org infrastructure,
-# inherit kde.org.eclass to fetch and unpack sources independent of the build
-# system being used.
-#
-# This eclass unconditionally inherits kde5-functions.eclass and all its public
-# functions and variables may be considered as part of this eclass's API.
-#
-# This eclass inherits either ecm.eclass if KDE_AUTODEPS=true (default) or
-# cmake-utils.eclass if false. All its public variables and helper functions
-# (not phase functions) may be considered as part of this eclass's API.
-#
-# This eclass's phase functions are not intended to be mixed and matched, so if
-# any phase functions are overridden the version here should also be called.
-
-if [[ -z ${_KDE5_ECLASS} ]]; then
-_KDE5_ECLASS=1
-
-# Propagate KMNAME to kde.org.eclass
-# PORTING: Use KDE_ORG_NAME from kde.org.eclass instead
-if [[ -z ${KDE_ORG_NAME} ]]; then
-	KDE_ORG_NAME=${KMNAME:=$PN}
-fi
-
-inherit flag-o-matic kde.org kde5-functions xdg
-
-# @ECLASS-VARIABLE: KDE_AUTODEPS
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# For any other value, add dependencies on dev-qt/qtcore:5, kde-frameworks/kf-env
-# and kde-frameworks/extra-cmake-modules:5. Additionally, required blockers may
-# be set depending on the value of CATEGORY.
-# PORTING: no replacement
-: ${KDE_AUTODEPS:=true}
-
-# @ECLASS-VARIABLE: KDE_DEBUG
-# @DESCRIPTION:
-# If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and -DQT_NO_DEBUG
-# to CPPFLAGS.
-# Otherwise, add debug to IUSE.
-# PORTING: ECM_DEBUG in ecm.eclass
-: ${KDE_DEBUG:=true}
-
-# @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# Otherwise, add "designer" to IUSE to toggle build of designer plugins
-# and add the necessary DEPENDs.
-# PORTING: ECM_DESIGNERPLUGIN in ecm.eclass
-: ${KDE_DESIGNERPLUGIN:=false}
-
-# @ECLASS-VARIABLE: KDE_EXAMPLES
-# @DESCRIPTION:
-# If set to "false", unconditionally ignore a top-level examples subdirectory.
-# Otherwise, add "examples" to IUSE to toggle adding that subdirectory.
-# PORTING: ECM_EXAMPLES in ecm.eclass
-: ${KDE_EXAMPLES:=false}
-
-# @ECLASS-VARIABLE: KDE_HANDBOOK
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and
-# generate and install KDE handbook.
-# If set to "optional", config with -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
-# when USE=!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.
-# PORTING: ECM_HANDBOOK in ecm.eclass
-: ${KDE_HANDBOOK:=false}
-
-# @ECLASS-VARIABLE: KDE_DOC_DIR
-# @DESCRIPTION:
-# Specifies the location of the KDE handbook if not the default.
-# PORTING: ECM_HANDBOOK_DIR in ecm.eclass
-: ${KDE_DOC_DIR:=doc}
-
-# @ECLASS-VARIABLE: KDE_PO_DIRS
-# @DESCRIPTION:
-# Specifies the possible locations of KDE l10n files if not the default.
-# PORTING: ECM_PO_DIRS in ecm.eclass
-: ${KDE_PO_DIRS:="po poqm"}
-
-# @ECLASS-VARIABLE: KDE_QTHELP
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# Otherwise, add "doc" to IUSE, add the appropriate dependency, generate
-# and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
-# PORTING: ECM_QTHELP in ecm.eclass
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-	: ${KDE_QTHELP:=true}
-fi
-: ${KDE_QTHELP:=false}
-
-# @ECLASS-VARIABLE: KDE_TEST
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5.
-# If set to "optional", configure with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON
-# when USE=!test.
-# If set to "forceoptional", remove a Qt5Test dependency and comment test
-# subdirs from the root CMakeLists.txt in addition to the above.
-# If set to "forceoptional-recursive", remove Qt5Test dependencies and make
-# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in ${S}
-# and below conditional on BUILD_TESTING. This is always meant as a short-term
-# fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
-# PORTING: ECM_TEST in ecm.eclass
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-	: ${KDE_TEST:=true}
-fi
-: ${KDE_TEST:=false}
-
-# @ECLASS-VARIABLE: KDE_SUBSLOT
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# If set to "true", add a subslot to the package, where subslot is either
-# defined as major.minor version for kde-*/ categories or ${PV} if other.
-# For any other value, that value will be used as subslot.
-# PORTING: no replacement, define in ebuild
-: ${KDE_SUBSLOT:=false}
-
-# PORTING: LICENSE no longer set by eclass, define in ebuild
-LICENSE="GPL-2"
-# PORTING: SLOT no longer set by eclass except for kde-frameworks
-[[ ${CATEGORY} = kde-frameworks ]] || SLOT=5
-
-case ${KDE_SUBSLOT} in
-	false)  ;;
-	true)
-		case ${CATEGORY} in
-			kde-frameworks | \
-			kde-plasma | \
-			kde-apps)
-				SLOT+="/$(ver_cut 1-2)"
-				;;
-			*)
-				SLOT+="/${PV}"
-				;;
-		esac
-		;;
-	*)
-		SLOT+="/${KDE_SUBSLOT}"
-		;;
-esac
-
-case ${KDE_AUTODEPS} in
-	false)
-		inherit cmake-utils
-		# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
-		# @DESCRIPTION:
-		# If set to "false", do nothing.
-		# For any other value, assume the package is using KDEInstallDirs macro and switch
-		# KDE_INSTALL_USE_QT_SYS_PATHS to ON.
-		: ${ECM_KDEINSTALLDIRS:=true}
-
-		case ${KDE_DEBUG} in
-			false)	;;
-			*)
-				IUSE+=" debug"
-				;;
-		esac
-
-		case ${KDE_TEST} in
-			false)	;;
-			*)
-				IUSE+=" test"
-				DEPEND+=" test? ( dev-qt/qttest:5 )"
-				;;
-		esac
-		;;
-	*)
-		# all packages need breeze/oxygen icons for basic iconset, bug #564838
-		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
-			ECM_NONGUI=false
-		fi
-		# propagate deprecated variables to ecm.eclass
-		if [[ -z ${ECM_DESIGNERPLUGIN} && ${CATEGORY} != kde-apps ]]; then
-			ECM_DESIGNERPLUGIN=${KDE_DESIGNERPLUGIN}
-			KDE_DESIGNERPLUGIN=false # use fallback var only for kde-apps
-		fi
-		[[ -z ${ECM_DEBUG} ]] && ECM_DEBUG=${KDE_DEBUG}
-		[[ -z ${ECM_EXAMPLES} ]] && ECM_EXAMPLES=${KDE_EXAMPLES}
-		[[ -z ${ECM_HANDBOOK} ]] && ECM_HANDBOOK=${KDE_HANDBOOK}
-		[[ -z ${ECM_HANDBOOK_DIR} ]] && ECM_HANDBOOK_DIR=${KDE_DOC_DIR}
-		[[ -z ${ECM_PO_DIRS} ]] && ECM_PO_DIRS=${KDE_PO_DIRS}
-		[[ -z ${ECM_QTHELP} ]] && ECM_QTHELP=${KDE_QTHELP}
-		[[ -z ${ECM_TEST} ]] && ECM_TEST=${KDE_TEST}
-		[[ -z ${KFMIN} ]] && KFMIN=${FRAMEWORKS_MINIMAL}
-		inherit ecm
-		;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
-
-# @FUNCTION: _kde5_strip_handbook_translations
-# @INTERNAL
-# @DESCRIPTION:
-# If LINGUAS is defined, enable only the requested translations when required.
-_kde5_strip_handbook_translations() {
-	if ! [[ -v LINGUAS ]]; then
-		return
-	fi
-
-	local lang po
-	for po in ${ECM_PO_DIRS}; do
-		if [[ -d ${po} ]] ; then
-			pushd ${po} > /dev/null || die
-			local lang
-			for lang in *; do
-				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
-					case ${lang} in
-						cmake_modules | \
-						CMakeLists.txt | \
-						${PN}.pot)	;;
-						*) rm -r ${lang} || die	;;
-					esac
-					if [[ -e CMakeLists.txt ]] ; then
-						cmake_comment_add_subdirectory ${lang}
-						sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
-							-i CMakeLists.txt || die
-					fi
-				fi
-			done
-			popd > /dev/null || die
-		fi
-	done
-}
-
-# @FUNCTION: kde5_pkg_pretend
-# @DESCRIPTION:
-# Checks if the active compiler meets the minimum version requirements.
-# phase function is only exported if KDE_GCC_MINIMAL is defined.
-kde5_pkg_pretend() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) ;;
-		*) ecm_pkg_pretend ;;
-	esac
-}
-
-# @FUNCTION: kde5_pkg_setup
-# @DESCRIPTION:
-# Checks if the active compiler meets the minimum version requirements.
-kde5_pkg_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) ;;
-		*) ecm_pkg_setup ;;
-	esac
-}
-
-# @FUNCTION: kde5_src_unpack
-# @DESCRIPTION:
-# Unpack the sources, automatically handling both release and live ebuilds.
-kde5_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-	kde.org_src_unpack
-}
-
-# @FUNCTION: kde5_src_prepare
-# @DESCRIPTION:
-# Wrapper for cmake-utils_src_prepare with lots of extra logic for magic
-# handling of linguas, tests, handbook etc.
-kde5_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false)
-			cmake-utils_src_prepare
-
-			_kde5_strip_handbook_translations
-
-			# only build unit tests when required
-			if ! { in_iuse test && use test; } ; then
-				if [[ ${KDE_TEST} = forceoptional ]] ; then
-					punt_bogus_dep Qt5 Test
-					# if forceoptional, also cover non-kde categories
-					cmake_comment_add_subdirectory autotests test tests
-				elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
-					cmake_comment_add_subdirectory autotests test tests
-				fi
-			fi
-			# in frameworks, tests = manual tests so never build them
-			if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then
-				cmake_comment_add_subdirectory tests
-			fi
-			;;
-		*) ecm_src_prepare ;;
-	esac
-
-	# PORTING: bogus, overzealous 'en' docbook disabling is not carried over
-	if [[ ${KDE_BUILD_TYPE} = release && ${CATEGORY} != kde-apps ]] ; then
-		if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && -v LINGUAS ]] ; then
-			pushd ${KDE_DOC_DIR} > /dev/null || die
-			local lang
-			for lang in *; do
-				if ! has ${lang} ${LINGUAS} ; then
-					cmake_comment_add_subdirectory ${lang}
-				fi
-			done
-			popd > /dev/null || die
-		fi
-	fi
-}
-
-# @FUNCTION: kde5_src_configure
-# @DESCRIPTION:
-# Wrapper for cmake-utils_src_configure with extra logic for magic handling of
-# handbook, tests etc.
-kde5_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false)
-			# we rely on cmake-utils.eclass to append -DNDEBUG too
-			if in_iuse debug && ! use debug; then
-				append-cppflags -DQT_NO_DEBUG
-			fi
-
-			local cmakeargs
-
-			if in_iuse test && ! use test ; then
-				cmakeargs+=( -DBUILD_TESTING=OFF )
-
-				if [[ ${KDE_TEST} = optional ]] ; then
-					cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON )
-				fi
-			fi
-			if [[ ${ECM_KDEINSTALLDIRS} != false ]] ; then
-				cmakeargs+=(
-					# install mkspecs in the same directory as qt stuff
-					-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-					# move handbook outside of doc dir, bug 667138
-					-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help"
-				)
-			fi
-
-			# allow the ebuild to override what we set here
-			mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}")
-
-			cmake-utils_src_configure
-			;;
-		*) ecm_src_configure ;;
-	esac
-}
-
-# @FUNCTION: kde5_src_compile
-# @DESCRIPTION:
-# Wrapper for cmake-utils_src_compile. Currently doesn't do anything extra, but
-# is included as part of the API just in case it's needed in the future.
-kde5_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) cmake-utils_src_compile ;;
-		*) ecm_src_compile ;;
-	esac
-}
-
-# @FUNCTION: kde5_src_test
-# @DESCRIPTION:
-# Wrapper for cmake-utils_src_test with extra logic for magic handling of dbus
-# and virtualx.
-kde5_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) cmake-utils_src_test ;;
-		*) ecm_src_test ;;
-	esac
-}
-
-# @FUNCTION: kde5_src_install
-# @DESCRIPTION:
-# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra.
-kde5_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) cmake-utils_src_install ;;
-		*) ecm_src_install ;;
-	esac
-}
-
-# @FUNCTION: kde5_pkg_preinst
-# @DESCRIPTION:
-# Sets up environment variables required in kde5_pkg_postinst.
-kde5_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) xdg_pkg_preinst ;;
-		*) ecm_pkg_preinst ;;
-	esac
-}
-
-# @FUNCTION: kde5_pkg_postinst
-# @DESCRIPTION:
-# Updates the various XDG caches (icon, desktop, mime) if necessary.
-kde5_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) xdg_pkg_postinst ;;
-		*) ecm_pkg_postinst ;;
-	esac
-}
-
-# @FUNCTION: kde5_pkg_postrm
-# @DESCRIPTION:
-# Updates the various XDG caches (icon, desktop, mime) if necessary.
-kde5_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${KDE_AUTODEPS} in
-		false) xdg_pkg_postrm ;;
-		*) ecm_pkg_postrm ;;
-	esac
-}
-
-fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2294814a906848f47a0a3869a721826962504c3a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 20:11:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 20:11:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2294814a

cmake.eclass: Ban CMAKE_MIN_VERSION for real

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b95f000302..35745def4b 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -103,6 +103,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
+[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION has been removed and is a no-op"
 [[ ${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=\"\" instead"
 [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY instead"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     23bc7197cc2377e86efaf8a9d7f67f4a6d703d90
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 21:06:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 21:06:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=23bc7197

cmake.eclass: CMAKE_MIN_VERSION porting instructions

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 35745def4b..65a7664226 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -103,7 +103,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
-[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION has been removed and is a no-op"
+[[ ${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=\"\" instead"
 [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY instead"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     49a24b22df3641af3d87c5b546ae14b099ed9ae2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 21:23:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 12:19:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=49a24b22

cmake.eclass: src_prepare: Revert to cmake-utils.eclass behaviour

Re-adding pushd/popd until we figure out how to make it consistent
across the eclass.

Bug: https://bugs.gentoo.org/704524
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 65a7664226..6227785dc9 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -294,6 +294,8 @@ _cmake_modify-cmakelists() {
 cmake_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	pushd "${S}" > /dev/null || die
+
 	default_src_prepare
 	_cmake_check_build_dir
 
@@ -327,6 +329,8 @@ cmake_src_prepare() {
 	# Remove dangerous things.
 	_cmake_modify-cmakelists
 
+	popd > /dev/null || die
+
 	# make ${S} read-only in order to detect broken build-systems
 	if [[ ${CMAKE_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
 		chmod -R a-w "${S}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     da57cac42b3623363c5c20b891c73561dc599846
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 18:43:34 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 18:55:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=da57cac4

kde.org.eclass: Mark KDE Frameworks 5.66.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 98cfe73c0e..fe82883fc5 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.66.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     887484bdd2b7ad104ec66f7c9ad11c30d162e7e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 10:00:40 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 11:03:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=887484bd

cmake.eclass: Fix fatal typo

Thanks-to: Tomas Mozes <hydrapolic <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 6227785dc9..f523d7eb4e 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -567,7 +567,7 @@ cmake_build() {
 		emake)
 			[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
 			[[ "${CMAKE_VERBOSE}" != "OFF" ]] && local verbosity="VERBOSE=1"
-			emake "${verbosity} ""$@"
+			emake "${verbosity}" "$@"
 			;;
 		ninja)
 			[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6525e1f94752c843aedcf924b2403979a07bd0e4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 13:51:47 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 13:58:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6525e1f9

cmake.eclass: Fix build with CMAKE_VERBOSE=OFF

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f523d7eb4e..b7044d3144 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -566,8 +566,10 @@ cmake_build() {
 	case ${CMAKE_MAKEFILE_GENERATOR} in
 		emake)
 			[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
-			[[ "${CMAKE_VERBOSE}" != "OFF" ]] && local verbosity="VERBOSE=1"
-			emake "${verbosity}" "$@"
+			case ${CMAKE_VERBOSE} in
+				OFF) emake VERBOSE=1 "$@" ;;
+				*) emake "$@" ;;
+			esac
 			;;
 		ninja)
 			[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1fd9b8d6c9103aa774f98a5c0c16c94fee7c99b3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 13:54:05 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 13:58:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1fd9b8d6

cmake.eclass: Add comment regarding cmake_src_prepare pushd/popd

We'll have to test affected packages when changing this.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b7044d3144..bd78401163 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -294,6 +294,8 @@ _cmake_modify-cmakelists() {
 cmake_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	# FIXME: workaround from cmake-utils; use current working directory instead, bug #704524
+	# esp. test with 'special' pkgs like: app-arch/brotli, media-gfx/gmic, net-libs/quiche
 	pushd "${S}" > /dev/null || die
 
 	default_src_prepare

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     be9ce89f403b825b82a28b3402608a61a2bbcebe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 14:13:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 14:13:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=be9ce89f

cmake.eclass: Fix cmake-utils_src_make error message

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 1d1e701a6c..462316d3b2 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -587,7 +587,7 @@ cmake_build() {
 # @DESCRIPTION:
 # Banned. Use cmake_build instead.
 cmake-utils_src_make() {
-	die "cmake_src_make is banned. Use cmake_build instead"
+	die "cmake-utils_src_make is banned. Use cmake_build instead"
 }
 
 # @FUNCTION: cmake_src_test

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0215336cf58a5a6460b8d7a31301928a4116a2f0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 14:13:27 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 14:13:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0215336c

cmake.eclass: Fix CMAKE_VERBOSE logic

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index bd78401163..1d1e701a6c 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -569,8 +569,8 @@ cmake_build() {
 		emake)
 			[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
 			case ${CMAKE_VERBOSE} in
-				OFF) emake VERBOSE=1 "$@" ;;
-				*) emake "$@" ;;
+				OFF) emake "$@" ;;
+				*) emake VERBOSE=1 "$@" ;;
 			esac
 			;;
 		ninja)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     012a1ca67eca44de4fad91b2d549b6e7461e09df
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 09:14:20 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 09:14:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=012a1ca6

kde.org.eclass: Mark KDE Release Service 19.12.1 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 fe82883fc5..77e7cbc4a1 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.66.0 )
+KDE_UNRELEASED=( kde-apps-19.12.1 kde-frameworks-5.66.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1e20102f8e6286856c1a1896b410224006c30c35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 17:26:24 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 17:26:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1e20102f

kde.org.eclass: Mark KDE Release Service 19.12.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 77e7cbc4a1..fe82883fc5 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.12.1 kde-frameworks-5.66.0 )
+KDE_UNRELEASED=( kde-frameworks-5.66.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a8188b579b2ea60f99677ed9c357145b2c7e1367
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 11:37:06 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 11:37:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8188b57

kde.org.eclass: Mark KDE Frameworks 5.66.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 fe82883fc5..98cfe73c0e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.66.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     feb67d5fd7e7838639cd878b2322d00b4b83897a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 23:29:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 23:29:33 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=feb67d5f

kde.org.eclass: Support kde-plasma unstable point release tarballs

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 98cfe73c0e..2776b5b972 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -136,7 +136,7 @@ _kde.org_calculate_src_uri() {
 			;;
 		kde-plasma)
 			case ${PV} in
-				5.??.[6-9]? )
+				5.??.[6-9]?* )
 					_src_uri+="unstable/plasma/$(ver_cut 1-3)/"
 					RESTRICT+=" mirror"
 					;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9a528556a368412a6cee62567d0d1740f3739209
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 17:46:45 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 17:46:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a528556

kde.org.eclass: Mark KDE Frameworks 5.67.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 2776b5b972..a70d17cd09 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.67.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     91214e3ded43bb295df3558ba8885347f011ba34
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 01:15:04 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 01:15:04 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=91214e3d

kde.org.eclass: Mark KDE Release Service 19.12.2 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 a70d17cd09..69a7d240a6 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.67.0 )
+KDE_UNRELEASED=( kde-frameworks-5.67.0 kde-apps-19.12.2 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e425f3de45df8653b96360a118161b8a941329c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 14:25:21 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 15:32:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e425f3de

kde.org.eclass: Mark KDE Plasma 5.18.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 a70d17cd09..a8aa57bc81 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.67.0 )
+KDE_UNRELEASED=( kde-frameworks-5.67.0 kde-plasma-5.18.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     45731f99fb87b95520e966858c4f9f672cf162be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 14:21:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 15:32:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=45731f99

kde.org.eclass: Mark KDE Release Service 19.12.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 69a7d240a6..a70d17cd09 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.67.0 kde-apps-19.12.2 )
+KDE_UNRELEASED=( kde-frameworks-5.67.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     182f7b6928ef5e89543b435465f038b0815012f2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 17:15:17 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 20:01:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=182f7b69

kde.org.eclass: Mark KDE Frameworks 5.67.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 a8aa57bc81..18c2884457 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.67.0 kde-plasma-5.18.0 )
+KDE_UNRELEASED=( kde-plasma-5.18.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0462a092c4ba94acdc3150caa16144a45fef7180
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:44:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 11:44:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0462a092

kde.org.eclass: Mark KDE Plasma 5.18.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 18c2884457..2776b5b972 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.18.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e3c62c49414975781ca2ef1bdc4fde60ac4ec548
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  3 08:22:47 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 08:22:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e3c62c49

kde.org.eclass: Mark KDE Release Service 19.12.3 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 2776b5b972..f132873ff6 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-19.12.3 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     774f51fce91c2446d696bee9d12baede0f8b11fb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 19:04:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 19:20:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=774f51fc

kde.org.eclass: Mark Release Service 19.12.3 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f132873ff6..2776b5b972 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-19.12.3 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e7c80d92b20afff89dcefa75258e423312599830
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  7 14:49:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  7 14:49:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7c80d92

kde.org.eclass: Mark KDE Frameworks 5.68 as unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 2776b5b972..da7bcf9cd6 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.68 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     eac8692a11557248c51048c65a7a4af17a056605
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 11:50:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 13:33:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eac8692a

kde.org.eclass: Mark KDE Frameworks 5.68.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 da7bcf9cd6..2776b5b972 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.68 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ed6084d902979c53477f2084f9c292e0553b97a5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 15:30:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 22:26:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed6084d9

ecm.eclass: Drop kde5.eclass support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 53 ++++++++++++++---------------------------------------
 1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 35cb767344..a125162fb2 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -173,17 +173,10 @@ case ${ECM_NONGUI} in
 	true) ;;
 	false)
 		# gui applications need breeze or oxygen for basic iconset, bug #564838
-		if [[ -n ${_KDE5_ECLASS} ]] ; then
-			RDEPEND+=" || (
-				>=kde-frameworks/breeze-icons-${KFMIN}:${KFSLOT}
-				kde-frameworks/oxygen-icons:*
-			)"
-		else
-			RDEPEND+=" || (
-				kde-frameworks/breeze-icons:*
-				kde-frameworks/oxygen-icons:*
-			)"
-		fi
+		RDEPEND+=" || (
+			kde-frameworks/breeze-icons:*
+			kde-frameworks/oxygen-icons:*
+		)"
 		;;
 	*)
 		eerror "Unknown value for \${ECM_NONGUI}"
@@ -205,11 +198,7 @@ esac
 case ${ECM_DESIGNERPLUGIN} in
 	true)
 		IUSE+=" designer"
-		if [[ -n ${_KDE5_ECLASS} ]] ; then
-			BDEPEND+=" designer? ( >=dev-qt/designer-5.12.3:${KFSLOT} )"
-		else
-			BDEPEND+=" designer? ( dev-qt/designer:${KFSLOT} )"
-		fi
+		BDEPEND+=" designer? ( dev-qt/designer:${KFSLOT} )"
 		;;
 	false) ;;
 	*)
@@ -265,14 +254,11 @@ esac
 case ${ECM_QTHELP} in
 	true)
 		IUSE+=" doc"
-		if [[ -n ${_KDE5_ECLASS} ]] ; then
-			COMMONDEPEND+=" doc? ( >=dev-qt/qt-docs-5.12.3:${KFSLOT} )"
-			BDEPEND+=" doc? ( >=dev-qt/qthelp-5.12.3:${KFSLOT} )"
-		else
-			COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )"
-			BDEPEND+=" doc? ( dev-qt/qthelp:${KFSLOT} )"
-		fi
-		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
+			dev-qt/qthelp:${KFSLOT}
+		)"
 		;;
 	false) ;;
 	*)
@@ -284,11 +270,7 @@ esac
 case ${ECM_TEST} in
 	true|optional|forceoptional|forceoptional-recursive)
 		IUSE+=" test"
-		if [[ -n ${_KDE5_ECLASS} ]] ; then
-			DEPEND+=" test? ( >=dev-qt/qttest-5.12.3:${KFSLOT} )"
-		else
-			DEPEND+=" test? ( dev-qt/qttest:${KFSLOT} )"
-		fi
+		DEPEND+=" test? ( dev-qt/qttest:${KFSLOT} )"
 		RESTRICT+=" !test? ( test )"
 		;;
 	false) ;;
@@ -300,11 +282,7 @@ esac
 
 BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}"
 RDEPEND+=" >=kde-frameworks/kf-env-4"
-if [[ -n ${_KDE5_ECLASS} ]] ; then
-	COMMONDEPEND+=" >=dev-qt/qtcore-5.12.3:${KFSLOT}"
-else
-	COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
-fi
+COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
 
 DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
@@ -466,11 +444,8 @@ ecm_src_prepare() {
 		done
 	fi
 
-	# don't change behaviour for kde5.eclass consumers
-	# for ported ebuilds, limit playing field of this to kde-*/ categories
-	if [[ -n ${_KDE5_ECLASS} ]] ; then
-		_ecm_strip_handbook_translations # TODO: kde5.eclass cleanup
-	elif [[ ${CATEGORY} = kde-* ]] ; then
+	# limit playing field of locale stripping to kde-*/ categories
+	if [[ ${CATEGORY} = kde-* ]] ; then
 		# 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

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     729972a64abc532f57ab4c643196c70f835c41a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 15:32:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:41:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=729972a6

ecm.eclass: Drop KDE Applications 19.08.3 support

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index a125162fb2..dbb8cc7a81 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -207,27 +207,6 @@ case ${ECM_DESIGNERPLUGIN} in
 		;;
 esac
 
-# @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# Otherwise, add "designer" to IUSE to toggle build of designer plugins
-# and add the necessary BDEPEND.
-# TODO: drop after KDE Applications 19.08.3 removal
-: ${KDE_DESIGNERPLUGIN:=false}
-case ${KDE_DESIGNERPLUGIN} in
-	true)
-		IUSE+=" designer"
-		BDEPEND+="
-			designer? ( >=kde-frameworks/kdesignerplugin-${KFMIN}:${KFSLOT} )
-		"
-		;;
-	false) ;;
-	*)
-		eerror "Unknown value for \${KDE_DESIGNERPLUGIN}"
-		die "Value ${KDE_DESIGNERPLUGIN} is not supported"
-		;;
-esac
-
 case ${ECM_EXAMPLES} in
 	true)
 		IUSE+=" examples"
@@ -520,11 +499,6 @@ ecm_src_configure() {
 		cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
 	fi
 
-	# TODO: drop after KDE Applications 19.08.3 removal
-	if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-		cmakeargs+=( $(cmake_use_find_package designer KF5DesignerPlugin) )
-	fi
-
 	if [[ ${ECM_QTHELP} = true ]]; then
 		cmakeargs+=( -DBUILD_QCH=$(usex doc) )
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ca41425cdf2901f0eeeb3c2401e62163b434b7d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 15:36:03 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:41:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca41425c

kde.org.eclass: Drop kde-apps-19.08.3 support, prepare for release-service beta

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 2776b5b972..bb9bd618eb 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -110,10 +110,9 @@ _kde.org_calculate_src_uri() {
 	if [[ ${KDE_RELEASE_SERVICE} = true ]]; then
 		case ${PV} in
 			??.??.[6-9]? )
-				_src_uri+="unstable/applications/${PV}/src/"
+				_src_uri+="unstable/release-service/${PV}/src/"
 				RESTRICT+=" mirror"
 				;;
-			19.08.3? ) _src_uri+="stable/applications/${PV}/src/" ;;
 			*) _src_uri+="stable/release-service/${PV}/src/" ;;
 		esac
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     14a4616cf802f3b897d9daf74901d7522aabebdf
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 00:44:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 00:46:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=14a4616c

cmake.eclass: do not append -DNDEBUG to CPPFLAGS

The NDEBUG macro turns the assert() function into a noop. This gives a
small performance boost, but may allow subtle programming errors to go
unnoticed.

This code was added back in 2008, when we started passing
-DCMAKE_BUILD_TYPE=None instead of Release or Debug. It probably tries
to mimic a default behavior of Release type builds.

Other common build systems do not do this by default. For example,
autoconf's AC_HEADER_ASSERT macro only sets NDEBUG if --disable-assert
is passed to configure (it defaults to enabled).

It is better to let users add this to CPPFLAGS themselves if they really
want to save those few CPU cycles.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 462316d3b2..f1e013cd24 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -371,15 +371,6 @@ cmake_src_configure() {
 	# Fix xdg collision with sandbox
 	xdg_environment_reset
 
-	# @SEE CMAKE_BUILD_TYPE
-	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
-		# Handle release builds
-		if ! in_iuse debug || ! use debug; then
-			local CPPFLAGS=${CPPFLAGS}
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
 	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
 	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1f4a58b2d53b1ae8d006be6fb53a491c5167a7c1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 11:30:02 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 00:47:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1f4a58b2

ecm.eclass: Drop references to -DNDEBUG of cmake.eclass

Flag has been removed from there.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index dbb8cc7a81..12b31e4ef3 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -74,8 +74,8 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_po
 
 # @ECLASS-VARIABLE: ECM_DEBUG
 # @DESCRIPTION:
-# Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake_src_configure)
-# and -DQT_NO_DEBUG to CPPFLAGS. If set to "false", do nothing.
+# Add "debug" to IUSE. If !debug, add -DQT_NO_DEBUG to CPPFLAGS. If set to
+# "false", do nothing.
 : ${ECM_DEBUG:=true}
 
 # @ECLASS-VARIABLE: ECM_DESIGNERPLUGIN
@@ -476,7 +476,6 @@ ecm_src_prepare() {
 ecm_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# we rely on cmake.eclass to append -DNDEBUG too
 	if in_iuse debug && ! use debug; then
 		append-cppflags -DQT_NO_DEBUG
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     75091aa986172f4a86d05733a12fc64e6c7d2464
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 12:41:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 14:23:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=75091aa9

kde.org.eclass: Mark KDE Release Service 20.03.90 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 bb9bd618eb..649fd4aef6 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-20.03.90 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f27875f489384835165638b5ccb6a2c3561f3457
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 17:52:01 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 17:52:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f27875f4

kde.org.eclass: Mark KDE Release Service 20.03.90 (20.04 RC) as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 649fd4aef6..bb9bd618eb 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-20.03.90 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7c5e0826411ebebe31c05e8dd010ea80ef2da70a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 19:30:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 19:30:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c5e0826

kde.org.eclass: Mark KDE Frameworks 5.69.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 bb9bd618eb..0add316baa 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.69.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bb9352eaa4e149475a4f2c8a34f115b9e27fe732
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 22:11:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 15:38:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb9352ea

kde.org.eclass: Allow to use SRC_URI in addition to live sources

Copied from qt5-build.eclass.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 0add316baa..a2f6bd0c34 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -250,11 +250,10 @@ kde.org_pkg_nofetch() {
 kde.org_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
+	case ${KDE_BUILD_TYPE} in
+		live) git-r3_src_unpack ;&
+		*) default ;;
+	esac
 }
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6a8e1a77c44e8194b29279643f6b9fd8e3d4b7ba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 09:31:55 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 09:31:55 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a8e1a77

kde.org.eclass: Mark KDE Frameworks 5.69 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 a2f6bd0c34..f2e6f03b22 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.69.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ece98022e05c221c915d98016aebb0fb91b31c2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 19:13:27 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 19:13:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ece98022

kde.org.eclass: Mark KDE Release Service 20.04.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f2e6f03b22..a5b30b8120 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-20.04.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bb97d066dd96c3fe812a091a5e70255fc110a955
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 21:07:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 21:13:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb97d066

ecm.eclass: Disable overzealous upstream disable-deprecated-before

Upstream detects .git directory in root CMakeLists.txt and adds aggressive
definitions like -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 which means it will
frequently fail to build with newish Qt versions.

Due to this we end up with the weird situation that stable branch fails to
build even though inevitably much older release tarballs build fine.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 12b31e4ef3..5724c74500 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -423,8 +423,14 @@ ecm_src_prepare() {
 		done
 	fi
 
-	# limit playing field of locale stripping to kde-*/ categories
 	if [[ ${CATEGORY} = kde-* ]] ; then
+		# overzealous upstream disable-deprecated-before by .git dir detection
+		if [[ -e .git ]]; then
+			sed -e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/$/ # removed by ecm.eclass/" \
+				-e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/(.*)/(FALSE)/" \
+				-i CMakeLists.txt || die
+		fi
+
 		# 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

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     61625ee1fc6d504b112bd9f2fef9521d0d6c86a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 09:11:37 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 09:11:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=61625ee1

kde.org.eclass: Mark KDE Release Service 20.04.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 a5b30b8120..f2e6f03b22 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-20.04.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1bb6fcb6bf65eed559d7b7a4958643c36f48b369
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 14:46:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 17:20:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bb6fcb6

ecm.eclass: Revert "Disable overzealous upstream disable-deprecated-before"

No longer necessary as upstream devs saw the problem with that and largely
diffused these.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5724c74500..12b31e4ef3 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -423,14 +423,8 @@ ecm_src_prepare() {
 		done
 	fi
 
+	# limit playing field of locale stripping to kde-*/ categories
 	if [[ ${CATEGORY} = kde-* ]] ; then
-		# overzealous upstream disable-deprecated-before by .git dir detection
-		if [[ -e .git ]]; then
-			sed -e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/$/ # removed by ecm.eclass/" \
-				-e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/(.*)/(FALSE)/" \
-				-i CMakeLists.txt || die
-		fi
-
 		# 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

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d68231745b96bd5348a4593430c44fb85242dff8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 23:10:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May  1 23:16:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6823174

kde.org.eclass: Mark KDE Frameworks 5.70.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f2e6f03b22..5db8feb30e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.70.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     435afb69bd00aad9698defcd7df48961d9b029bd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 09:47:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May  9 09:47:42 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=435afb69

kde.org.eclass: Mark KDE Frameworks 5.70.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 5db8feb30e..f2e6f03b22 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.70.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dcfd82626d37478bf612daa817eda87cf4faa8e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 16:27:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 12 16:27:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dcfd8262

kde.org.eclass: Mark KDE Release Service 20.04.1 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f2e6f03b22..acb3d1350f 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-20.04.1 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b34c96361c37a9d5027de6125677ee4571491f4c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 13:09:39 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 15 13:09:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b34c9636

kde.org.eclass: Mark KDE Release Service 20.04.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 acb3d1350f..f2e6f03b22 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -67,7 +67,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-20.04.1 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     eda2e4b1f3d77d77b354f9d46eaed5001c56ccff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 06:19:37 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 15:22:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eda2e4b1

kde.org.eclass: Switch EGIT_MIRROR to https://invent.kde.org/kde

Upstream did a mass-import to KDE group first, and those links persist even
after the move into subgroups, so for now we can use it as flat structure
fallback URI, coming from cgit.kde.org.

See also: https://mail.kde.org/pipermail/kde-community/2020q2/006241.html
See also: https://mail.kde.org/pipermail/kde-cvs-announce/2020/000198.html

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f2e6f03b22..2d21bacc5c 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -171,7 +171,7 @@ _kde.org_calculate_live_repo() {
 	# @DESCRIPTION:
 	# This variable allows easy overriding of default kde mirror service
 	# (anongit) with anything else you might want to use.
-	EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
+	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/kde}
 
 	if [[ ${PV} == ??.??.49.9999 && ${KDE_RELEASE_SERVICE} = true ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1dfb073303b39c71c2afdfbec0ecbd7d56ae3e27
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 23:13:21 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 21:24:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1dfb0733

kde.org.eclass: Add KDE_ORG_CATEGORIES map and KDE_ORG_CATEGORY

To support invent.kde.org git repository addresses without redirect warnings.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 2d21bacc5c..aaee2a2cba 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -34,6 +34,50 @@ fi
 
 EXPORT_FUNCTIONS pkg_nofetch src_unpack
 
+# @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
+# @INTERNAL
+# @DESCRIPTION
+# Map of ${CATEGORY}=<upstream category> key-value pairs.
+declare -A KDE_ORG_CATEGORIES=(
+	[app-accessibility]=accessibility
+	[app-admin]=system
+	[app-backup]=system
+	[app-cdr]=utilities
+	[app-editors]=office
+	[app-office]=office
+	[app-text]=office
+	[dev-libs]=libraries
+	[dev-util]=sdk
+	[games-kids]=education
+	[kde-frameworks]=frameworks
+	[kde-plasma]=plasma
+	[mail-client]=pim
+	[media-gfx]=graphics
+	[media-libs]=libraries
+	[media-sound]=multimedia
+	[media-video]=multimedia
+	[net-im]=network
+	[net-irc]=network
+	[net-libs]=libraries
+	[net-misc]=network
+	[net-p2p]=network
+	[sci-astronomy]=education
+	[sci-calculators]=utilities
+	[sci-mathematics]=education
+	[sci-visualization]=education
+	[sys-block]=system
+	[sys-libs]=system
+	[www-client]=network
+	[x11-libs]=libraries
+)
+readonly KDE_ORG_CATEGORIES
+
+# @ECLASS-VARIABLE: KDE_ORG_CATEGORY
+# @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}}
+
 # @ECLASS-VARIABLE: KDE_ORG_NAME
 # @DESCRIPTION:
 # If unset, default value is set to ${PN}.
@@ -171,7 +215,7 @@ _kde.org_calculate_live_repo() {
 	# @DESCRIPTION:
 	# This variable allows easy overriding of default kde mirror service
 	# (anongit) with anything else you might want to use.
-	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/kde}
+	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
 
 	if [[ ${PV} == ??.??.49.9999 && ${KDE_RELEASE_SERVICE} = true ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8935253a99117afa0b9763ed9331bbc3510f2a84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 21:32:07 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 21:32:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8935253a

kde.org.eclass: Map app-editors to utilities instead

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 aaee2a2cba..e32cfe2fb4 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -43,7 +43,7 @@ declare -A KDE_ORG_CATEGORIES=(
 	[app-admin]=system
 	[app-backup]=system
 	[app-cdr]=utilities
-	[app-editors]=office
+	[app-editors]=utilities
 	[app-office]=office
 	[app-text]=office
 	[dev-libs]=libraries

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dabf669718b4dac04c85141205b7096e184026af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 21:59:23 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 21:59:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dabf6697

kde.org.eclass: Add games-board and games-mud categories

Both map to 'games' upstream.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index e32cfe2fb4..961df97698 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -48,7 +48,9 @@ declare -A KDE_ORG_CATEGORIES=(
 	[app-text]=office
 	[dev-libs]=libraries
 	[dev-util]=sdk
+	[games-board]=games
 	[games-kids]=education
+	[games-mud]=games
 	[kde-frameworks]=frameworks
 	[kde-plasma]=plasma
 	[mail-client]=pim

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0c8a137b83a574563bd5aefc0eaa09b220584976
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  4 14:11:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 14:11:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c8a137b

kde.org.eclass: Mark KDE Plasma 5.19.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 961df97698..b7781d4d2c 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-plasma-5.19.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d245779f991843dbd10207abb5e2778af99f4734
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 20:00:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 20:00:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d245779f

kde.org.eclass: Mark KDE Frameworks 5.71.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 b7781d4d2c..6c358bd621 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.19.0 )
+KDE_UNRELEASED=( kde-plasma-5.19.0 kde-frameworks-5.71.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e6a23f9ec663a841e4761e399f731fdc8df37685
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 21:51:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 22:15:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6a23f9e

kde.org.eclass: kde-frameworks/kxmlrpcclient moved to portingAids

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 6c358bd621..9bb4fa0dc0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -177,6 +177,9 @@ _kde.org_calculate_src_uri() {
 				kross)
 					_src_uri+="portingAids/"
 					;;
+				kxmlrpcclient)
+					[[ ${PV} = 5.70.* ]] || _src_uri+="portingAids/"
+					;;
 			esac
 			;;
 		kde-plasma)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4b669dc80d2397aa52e4c07e59f7bf93df4b5c0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 10:11:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 10:11:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b669dc8

kde.org.eclass: Mark KDE Plasma 5.19.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 9bb4fa0dc0..6e5b52a1e1 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.19.0 kde-frameworks-5.71.0 )
+KDE_UNRELEASED=( kde-frameworks-5.71.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cecc2d957927ce7b3ff9db90a1f6daef6cad4e33
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 10:26:30 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 10:26:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cecc2d95

kde.org.eclass: Mark KDE Release Service 20.04.2 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 6e5b52a1e1..26996b764a 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.71.0 )
+KDE_UNRELEASED=( kde-apps-20.04.2 kde-frameworks-5.71.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     427400e652a085e7cc190b44cc2982f40d0f5b4b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 22:29:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 22:29:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=427400e6

kde.org.eclass: Mark KDE Frameworks 5.71.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 26996b764a..96e132b46f 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-20.04.2 kde-frameworks-5.71.0 )
+KDE_UNRELEASED=( kde-apps-20.04.2 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f47240606d6b6d2cc45ccfef549a45bcbc8f7e7f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 22:29:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 22:29:42 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4724060

kde.org.eclass: Mark KDE Release Service 20.04.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 96e132b46f..38911dc5c1 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-20.04.2 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     eb6924d4f2fc7dcaaa6e65ca69624151050fad06
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 12:33:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 12:33:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb6924d4

ecm.eclass: Drop duplicate local lang declaration

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 12b31e4ef3..8d358a91f9 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -322,7 +322,6 @@ _ecm_strip_handbook_translations() {
 	for po in ${ECM_PO_DIRS}; do
 		if [[ -d ${po} ]] ; then
 			pushd ${po} > /dev/null || die
-			local lang
 			for lang in *; do
 				if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
 					case ${lang} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas K. Hüttel]

commit:     7318b8b9cfc9d2a172e75701ea95f63f7cffa0f5
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 24 21:24:36 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 24 21:29:04 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7318b8b9

cmake*.eclass: Hardcode CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX for riscv

Bug: https://bugs.gentoo.org/689410
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 eclass/cmake.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f1e013cd24..9f47538018 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -471,6 +471,12 @@ cmake_src_configure() {
 		SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
 		SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
 	_EOF_
+
+	# See bug 689410
+	if [[ "${ARCH}" == riscv ]]; then
+		echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die
+	fi
+
 	if [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]]; then
 		echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     708d457c51c45898b81b34c948fcdceda42cb152
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 09:02:57 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 09:02:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=708d457c

kde.org.eclass: Mark KDE Frameworks 5.73.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 6d26d7964a..20e60da487 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -113,7 +113,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.73.0 kde-apps-20.08.0 )
+KDE_UNRELEASED=( kde-apps-20.08.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     401256407964a357e1e717e0e3116006de0531c6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 18:12:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 18:12:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=40125640

kde.org.eclass: Fix invent.kde.org EGIT_REPO_URI

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 38911dc5c1..58db8bef2a 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -238,7 +238,7 @@ _kde.org_calculate_live_repo() {
 	# @DESCRIPTION:
 	# This variable allows overriding of default repository
 	# name. Specify only if this differs from PN and KDE_ORG_NAME.
-	EGIT_REPO_URI="${EGIT_MIRROR}/${EGIT_REPONAME:=$KDE_ORG_NAME}"
+	EGIT_REPO_URI="${EGIT_MIRROR}/${EGIT_REPONAME:=$KDE_ORG_NAME}.git"
 }
 
 case ${KDE_BUILD_TYPE} in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7c8eb2dee113a4770eb562ebcd5c8e08ef01c672
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 16:30:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 17:23:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c8eb2de

cmake.eclass: cmake_run_in: New function

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 9f47538018..240ab87bf6 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -147,6 +147,22 @@ _cmake_check_build_dir() {
 	einfo "Working in BUILD_DIR: \"$BUILD_DIR\""
 }
 
+# @FUNCTION: cmake_run_in
+# @USAGE: <working dir> <run command>
+# @DESCRIPTION:
+# Set the desired working dir for a function or command.
+cmake_run_in() {
+	if [[ -z ${2} ]]; then
+		die "${FUNCNAME[0]} must be passed at least two arguments"
+	fi
+
+	[[ -e ${1} ]] || die "${FUNCNAME[0]}: Nonexistent path: ${1}"
+
+	pushd ${1} > /dev/null || die
+		"${@:2}"
+	popd > /dev/null || die
+}
+
 # @FUNCTION: cmake_comment_add_subdirectory
 # @USAGE: <subdirectory>
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7f989409cf6d8916c7f521de8bba0ac03a86f92a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 18:05:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 18:10:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f989409

cmake.eclass: If inherited from ecm.eclass, set ECM_DISABLE_QMLPLUGINDUMP

Works with downstream patch added to kde-frameworks/extra-cmake-modules in
commit f5b2cf80ea9696a5efbc2064cd432670670af486

Bug: https://bugs.gentoo.org/640432
Bug: https://bugs.gentoo.org/683102
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index d9fb203ede..f04888f187 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -489,6 +489,10 @@ cmake_src_configure() {
 		SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
 	_EOF_
 
+	if [[ -n ${_ECM_ECLASS} ]]; then
+		echo 'SET (ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die
+	fi
+
 	# See bug 689410
 	if [[ "${ARCH}" == riscv ]]; then
 		echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     16bf0280919858f9a2f9b93f7668396c3a66a1e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 17:13:07 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 17:23:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=16bf0280

cmake.eclass: cmake_comment_add_subdirectory: line length reduction

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 240ab87bf6..d9fb203ede 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -169,16 +169,17 @@ cmake_run_in() {
 # Comment out one or more add_subdirectory calls in CMakeLists.txt in the current directory
 cmake_comment_add_subdirectory() {
 	if [[ -z ${1} ]]; then
-		die "comment_add_subdirectory must be passed at least one directory name to comment"
+		die "${FUNCNAME[0]} must be passed at least one directory name to comment"
 	fi
 
-	if [[ -e "CMakeLists.txt" ]]; then
-		local d
-		for d in $@; do
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
-				-i CMakeLists.txt || die "failed to comment add_subdirectory(${d})"
-		done
-	fi
+	[[ -e "CMakeLists.txt" ]] || return
+
+	local d
+	for d in $@; do
+		d=${d//\//\\/}
+		sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
+			-i CMakeLists.txt || die "failed to comment add_subdirectory(${d})"
+	done
 }
 
 # @FUNCTION: comment_add_subdirectory

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2d2ac09e31a2c854f653d71031700192b03d9a9c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 08:16:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 08:16:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d2ac09e

kde.org.eclass: Revert "Temporarily disable KDE Plasma 5.20 branch detection"

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 ffe01da284..58db8bef2a 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -226,7 +226,7 @@ _kde.org_calculate_live_repo() {
 		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi
 
-	if [[ ${PV} != 9999 && ${PV} != 5.20.49.9999 && ${CATEGORY} = kde-plasma ]]; then
+	if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     aefc8b1c2c9776d9dd9b3480361e087175fb8f20
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 19:16:06 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 19:49:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aefc8b1c

kde.org.eclass: Add net-firewall/ to recognised KDE_ORG_CATEGORIES

Mapping to 'network' upstream.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 58db8bef2a..ac8bb365e0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -58,6 +58,7 @@ declare -A KDE_ORG_CATEGORIES=(
 	[media-libs]=libraries
 	[media-sound]=multimedia
 	[media-video]=multimedia
+	[net-firewall]=network
 	[net-im]=network
 	[net-irc]=network
 	[net-libs]=libraries

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e8279e2dc5aa9af1cd9c0a09e61ba5e3ddc79fd4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 13:36:07 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 13:36:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8279e2d

kde.org.eclass: Mark KDE Release Service 20.08.2 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 196869aadf..03a6010885 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.75.0 )
+KDE_UNRELEASED=( kde-frameworks-5.75.0 kde-apps-20.08.2 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e1ec170455fe5a42e80e702e642636cbad8c2fa1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 13:35:24 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 13:35:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1ec1704

kde.org.eclass: Mark KDE Frameworks 5.75.0 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 ac8bb365e0..196869aadf 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.75.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7bdb2611cace12e7a2a83b265164f0c2a953a05a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 12:51:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 12:51:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7bdb2611

kde.org.eclass: Mark KDE Release Service 20.08.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f84edc3781..08c6e52c29 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.75.0 kde-apps-20.08.2 kde-plasma-5.20.0 )
+KDE_UNRELEASED=( kde-frameworks-5.75.0 kde-plasma-5.20.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8609bab30da2ffdf59fd6836ee0b11fb2ac35225
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 19:48:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 18:37:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8609bab3

kde.org.eclass: Drop obsolete KDE Frameworks 5.70 quirk

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index d59a05153a..f84edc3781 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -175,11 +175,9 @@ _kde.org_calculate_src_uri() {
 				kjs | \
 				kjsembed | \
 				kmediaplayer | \
-				kross)
-					_src_uri+="portingAids/"
-					;;
+				kross | \
 				kxmlrpcclient)
-					[[ ${PV} = 5.70.* ]] || _src_uri+="portingAids/"
+					_src_uri+="portingAids/"
 					;;
 			esac
 			;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ce04d25f26dbaf4a150be16df96beb3f3c1ed215
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 23:23:24 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:23:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce04d25f

ecm.eclass: Drop obsolete kde5*.eclass porting clues

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 8d358a91f9..c763957bf8 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -19,13 +19,6 @@
 #
 # This eclass's phase functions are not intended to be mixed and matched, so if
 # any phase functions are overridden the version here should also be called.
-#
-# Porting from kde5.class
-# - Convert all add_*_dep dependency functions to regular dependencies
-# - Manually set LICENSE
-# - Manually set SLOT
-# - Rename vars and function names as needed, see kde5.eclass PORTING comments
-# - Instead of FRAMEWORKS_MINIMAL, define KFMIN in ebuilds and use it for deps
 
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
@@ -267,24 +260,6 @@ DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
-# @FUNCTION: _ecm_banned_var
-# @INTERNAL
-# @DESCRIPTION:
-# Banned kde5*.eclass variables are banned.
-_ecm_banned_var() {
-	die "$1 is banned. use $2 instead."
-}
-
-if [[ -z ${_KDE5_ECLASS} ]] ; then
-	[[ -n ${KDE_DEBUG} ]] && _ecm_banned_var KDE_DEBUG ECM_DEBUG
-	[[ -n ${KDE_EXAMPLES} ]] && _ecm_banned_var KDE_EXAMPLES ECM_EXAMPLES
-	[[ -n ${KDE_HANDBOOK} ]] && _ecm_banned_var KDE_HANDBOOK ECM_HANDBOOK
-	[[ -n ${KDE_DOC_DIR} ]] && _ecm_banned_var KDE_DOC_DIR ECM_HANDBOOK_DIR
-	[[ -n ${KDE_PO_DIRS} ]] && _ecm_banned_var KDE_PO_DIRS ECM_PO_DIRS
-	[[ -n ${KDE_QTHELP} ]] && _ecm_banned_var KDE_QTHELP ECM_QTHELP
-	[[ -n ${KDE_TEST} ]] && _ecm_banned_var KDE_TEST ECM_TEST
-fi
-
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b03f03566313675e3464eadde4ab31c9e292bfab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 23:23:21 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:23:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b03f0356

kde.org.eclass: Make 'Unreleased' ascii art work for all categories

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 43ed9225d8..51eef46969 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -267,7 +267,10 @@ kde.org_pkg_nofetch() {
 	case ${CATEGORY} in
 		kde-frameworks) sched_uri+="/Frameworks" ;;
 		kde-plasma) sched_uri+="/Plasma_5" ;;
-		kde-apps) sched_uri+="/release_service/$(ver_cut 1-2)_Release_Schedule" ;;
+		*)
+			[[ ${KDE_RELEASE_SERVICE} = true ]] &&
+				sched_uri+="/release_service/$(ver_cut 1-2)_Release_Schedule"
+			;;
 	esac
 
 	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     36ea2a40e6bdd0274c7670c1857eac890674ea3e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 23:23:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:23:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=36ea2a40

kde.org.eclass: KDE Applications -> Release Service

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 4c6f0d3dbc..43ed9225d8 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -8,7 +8,7 @@
 # @BLURB: Support eclass for packages that are hosted on kde.org infrastructure.
 # @DESCRIPTION:
 # This eclass is mainly providing facilities for the upstream release groups
-# Frameworks, Plasma, Applications to assemble default SRC_URI for tarballs,
+# Frameworks, Plasma, Release Service to assemble default SRC_URI for tarballs,
 # set up git-r3.eclass for stable/master branch versions or restrict access to
 # unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may
 # be also used by any other package hosted on kde.org.
@@ -267,7 +267,7 @@ kde.org_pkg_nofetch() {
 	case ${CATEGORY} in
 		kde-frameworks) sched_uri+="/Frameworks" ;;
 		kde-plasma) sched_uri+="/Plasma_5" ;;
-		kde-apps) sched_uri+="/Applications/$(ver_cut 1-2)_Release_Schedule" ;;
+		kde-apps) sched_uri+="/release_service/$(ver_cut 1-2)_Release_Schedule" ;;
 	esac
 
 	eerror " _   _ _   _ ____  _____ _     _____    _    ____  _____ ____  "

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     89bfbb04f02a119c0d1d4c631f6122b1b62849b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 23:54:23 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 23:54:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=89bfbb04

kde.org.eclass: Fix DESCRIPTION tags

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 c2dfc4748e..8565edb2b6 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -36,7 +36,7 @@ EXPORT_FUNCTIONS pkg_nofetch src_unpack
 
 # @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
 # @INTERNAL
-# @DESCRIPTION
+# @DESCRIPTION:
 # Map of ${CATEGORY}=<upstream category> key-value pairs.
 declare -A KDE_ORG_CATEGORIES=(
 	[app-accessibility]=accessibility
@@ -110,7 +110,7 @@ esac
 
 # @ECLASS-VARIABLE: KDE_UNRELEASED
 # @INTERNAL
-# @DESCRIPTION
+# @DESCRIPTION:
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d89d40d01dc0b389190f24e41c8edd8cebab3b11
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 10:34:35 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 10:34:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d89d40d0

kde.org.eclass: Mark KDE Frameworks 5.77 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 438c41d028..931c74f3f4 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.77.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a69e682819b1348afbab97743cae9d79cacade8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 17:24:33 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 17:24:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a69e6828

kde.org.eclass: Mark KDE Release Service 20.12.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 4da959db71..99a7e85aed 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.78.0 kde-apps-20.12.1 )
+KDE_UNRELEASED=( kde-frameworks-5.78.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c7a60a01b52c76796e62ed3a36f7ab051e078102
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 12:56:32 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 13:02:49 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7a60a01

kde.org.eclass: Mark KDE Frameworks 5.79.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 dfc01755e9..838e6c2af7 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.79.0 kde-plasma-5.21.0 )
+KDE_UNRELEASED=( kde-plasma-5.21.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0bb55f6eaf3c718efe89f9458756a9c4559a344c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 11:52:57 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:06:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0bb55f6e

cmake.eclass: Document _cmake_check_build_dir and _cmake_modify-cmakelists

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index e9543c1fd3..ec3c9bf8d7 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -135,6 +135,9 @@ _cmake_banned_func() {
 	die "${FUNCNAME[1]} is banned. use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 }
 
+# @FUNCTION: _cmake_check_build_dir
+# @INTERNAL
+# @DESCRIPTION:
 # Determine using IN or OUT source build
 _cmake_check_build_dir() {
 	: ${CMAKE_USE_DIR:=${S}}
@@ -268,6 +271,9 @@ cmake-utils_use() { _cmake_banned_func "" "$@" ; }
 # Banned. Use -DNOFOO=$(usex !foo) instead.
 cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
 
+# @FUNCTION: _cmake_modify-cmakelists
+# @INTERNAL
+# @DESCRIPTION:
 # Internal function for modifying hardcoded definitions.
 # Removes dangerous definitions that override Gentoo settings.
 _cmake_modify-cmakelists() {

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     313d2757d55ea85bc685ab19d14fc68cfbaf2b45
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 12:06:05 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:06:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=313d2757

cmake.eclass: Documentation: cmake_src_prepare() *MUST* be run

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index ddb6709176..7fd74b548f 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -313,7 +313,7 @@ _cmake_modify-cmakelists() {
 
 # @FUNCTION: cmake_src_prepare
 # @DESCRIPTION:
-# Apply ebuild and user patches.
+# Apply ebuild and user patches. *MUST* be run or cmake_src_configure will fail.
 cmake_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e329c2ca01b6c53bb1823b26ddbfad18bbc31b38
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 11:58:45 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:06:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e329c2ca

cmake.eclass: Better description of cmake_build() and cmake_src_compile()

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index ec3c9bf8d7..ddb6709176 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -567,8 +567,8 @@ cmake_src_configure() {
 
 # @FUNCTION: cmake_src_compile
 # @DESCRIPTION:
-# General function for compiling with cmake.
-# Automatically detects the build type. All arguments are passed to emake.
+# General function for compiling with cmake. All arguments are passed
+# to cmake_build.
 cmake_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -578,7 +578,8 @@ cmake_src_compile() {
 # @FUNCTION: cmake_build
 # @DESCRIPTION:
 # Function for building the package. Automatically detects the build type.
-# All arguments are passed to emake.
+# All arguments are passed to eninja (default) or emake depending on the value
+# of CMAKE_MAKEFILE_GENERATOR.
 cmake_build() {
 	debug-print-function ${FUNCNAME} "$@"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b15bf6366bc3b2b714d45b6574235b112d179cce
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 11:47:04 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:06:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b15bf636

cmake.eclass: Fix mycmakeargs documentation

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index d74b4ffa6c..e9543c1fd3 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -362,11 +362,11 @@ cmake_src_prepare() {
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Optional cmake defines as a bash array. Should be defined before calling
-# src_configure.
+# cmake_src_configure.
 # @CODE
 # src_configure() {
 # 	local mycmakeargs=(
-# 		$(cmake_use_with openconnect)
+# 		$(cmake_use_find_package foo LibFoo)
 # 	)
 #
 # 	cmake_src_configure

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7ba20cc083a22aa4d3b0434e9b615efe7140554a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 12:28:06 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:33:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ba20cc0

cmake.eclass: Group all banned cmake-utils_* functions together

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 7fd74b548f..5bead99f6f 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -127,14 +127,6 @@ if [[ ${PN} != cmake ]]; then
 	BDEPEND+=" dev-util/cmake"
 fi
 
-# @FUNCTION: _cmake_banned_func
-# @INTERNAL
-# @DESCRIPTION:
-# Banned functions are banned.
-_cmake_banned_func() {
-	die "${FUNCNAME[1]} is banned. use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-}
-
 # @FUNCTION: _cmake_check_build_dir
 # @INTERNAL
 # @DESCRIPTION:
@@ -193,18 +185,6 @@ comment_add_subdirectory() {
 	die "comment_add_subdirectory is banned. Use cmake_comment_add_subdirectory 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_use_find_package
 # @USAGE: <USE flag> <package name>
 # @DESCRIPTION:
@@ -223,6 +203,26 @@ 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<related_CMake_variable>=\"\$(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:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     47658a3692438894c64329fcfd33ae25ebe4ad74
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 12:30:54 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:33:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=47658a36

cmake.eclass: Merge mycmakeargs description into cmake_src_configure()

Makes it a part of cmake_src_configure() rather than oddly appearing
under FUNCTIONS.

Bug: https://bugs.gentoo.org/771876
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 5bead99f6f..8bf9be8271 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -364,25 +364,20 @@ cmake_src_prepare() {
 	_CMAKE_SRC_PREPARE_HAS_RUN=1
 }
 
-# @VARIABLE: mycmakeargs
-# @DEFAULT_UNSET
+# @FUNCTION: cmake_src_configure
 # @DESCRIPTION:
-# Optional cmake defines as a bash array. Should be defined before calling
-# cmake_src_configure.
+# General function for configuring with cmake. Default behaviour is to start an
+# out-of-source build.
+# Passes arguments to cmake by reading from an optionally pre-defined local
+# mycmakeargs bash array.
 # @CODE
 # src_configure() {
 # 	local mycmakeargs=(
 # 		$(cmake_use_find_package foo LibFoo)
 # 	)
-#
 # 	cmake_src_configure
 # }
 # @CODE
-
-# @FUNCTION: cmake_src_configure
-# @DESCRIPTION:
-# General function for configuring with cmake. Default behaviour is to start an
-# out-of-source build.
 cmake_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2207044dc41abd1e0a811929b40eb2471822e676
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 12:44:05 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 12:56:30 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2207044d

cmake.eclass: Move _cmake_check_build_dir to a better place

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 8bf9be8271..840c6e041c 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -127,21 +127,6 @@ if [[ ${PN} != cmake ]]; then
 	BDEPEND+=" dev-util/cmake"
 fi
 
-# @FUNCTION: _cmake_check_build_dir
-# @INTERNAL
-# @DESCRIPTION:
-# Determine using IN or OUT source build
-_cmake_check_build_dir() {
-	: ${CMAKE_USE_DIR:=${S}}
-	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		# we build in source dir
-		BUILD_DIR="${CMAKE_USE_DIR}"
-	fi
-
-	mkdir -p "${BUILD_DIR}" || die
-	einfo "Working in BUILD_DIR: \"$BUILD_DIR\""
-}
-
 # @FUNCTION: cmake_run_in
 # @USAGE: <working dir> <run command>
 # @DESCRIPTION:
@@ -271,6 +256,21 @@ cmake-utils_use() { _cmake_banned_func "" "$@" ; }
 # Banned. Use -DNOFOO=$(usex !foo) instead.
 cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
 
+# @FUNCTION: _cmake_check_build_dir
+# @INTERNAL
+# @DESCRIPTION:
+# Determine using IN or OUT source build
+_cmake_check_build_dir() {
+	: ${CMAKE_USE_DIR:=${S}}
+	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
+		# we build in source dir
+		BUILD_DIR="${CMAKE_USE_DIR}"
+	fi
+
+	mkdir -p "${BUILD_DIR}" || die
+	einfo "Working in BUILD_DIR: \"$BUILD_DIR\""
+}
+
 # @FUNCTION: _cmake_modify-cmakelists
 # @INTERNAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     306a1c7d6248aa52aa46ef84104b044fb74acb14
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 12:54:15 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 13:01:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=306a1c7d

kde.org.eclass: Fix remaining missing documentation

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 6e08fc2944..7d46b8e324 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -133,6 +133,10 @@ case ${CATEGORY} in
 	*) ;;
 esac
 
+# @FUNCTION: _kde.org_is_unreleased
+# @INTERNAL
+# @DESCRIPTION:
+# Return true if $CATEGORY-$PV matches against an entry in KDE_UNRELEASED array.
 _kde.org_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do
@@ -148,6 +152,9 @@ _kde.org_is_unreleased() {
 	return 1
 }
 
+# @FUNCTION: _kde.org_calculate_src_uri
+# @INTERNAL
+# @DESCRIPTION:
 # Determine fetch location for released tarballs
 _kde.org_calculate_src_uri() {
 	debug-print-function ${FUNCNAME} "$@"
@@ -209,6 +216,9 @@ _kde.org_calculate_src_uri() {
 	fi
 }
 
+# @FUNCTION: _kde.org_calculate_live_repo
+# @INTERNAL
+# @DESCRIPTION:
 # Determine fetch location for live sources
 _kde.org_calculate_live_repo() {
 	debug-print-function ${FUNCNAME} "$@"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a542d15c46137158987e312a910d24023fd392af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 11:26:44 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 11:26:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a542d15c

kde.org.eclass: Mark KDE Frameworks 5.80.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 ed7e8f6286..7d46b8e324 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.80.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8fa9017b04de80172e397826b68ff94eb331717e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 23:10:02 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 19:46:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8fa9017b

kde.org.eclass: Mark KDE Frameworks 5.81 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 7d46b8e324..9255bd97b2 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-frameworks-5.81.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     95c6a706a1ee74dcb664c2b11d3d61b252d53903
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 12:32:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 12:32:47 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=95c6a706

kde.org.eclass: Mark KDE Frameworks 5.81 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 9255bd97b2..7d46b8e324 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -114,7 +114,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.81.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a65bdb69e58217beeb1685d302e9fa33524c9840
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 11:24:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 11:24:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a65bdb69

ecm.eclass: KDE Applications -> KDE Gear

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5fc50523d4..5e541f8cf5 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -10,7 +10,7 @@
 # This eclass is intended to streamline the creation of ebuilds for packages
 # that use cmake and KDE Frameworks' extra-cmake-modules, thereby following
 # some of their packaging conventions. It is primarily intended for the three
-# upstream release groups (Frameworks, Plasma, Applications) but also for any
+# upstream release groups (Frameworks, Plasma, Gear) but also for any
 # other package that follows similar conventions.
 #
 # This eclass unconditionally inherits cmake.eclass and all its public

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d59a0593cd7a521f3d635aca601ef65599359e59
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 08:54:45 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 11:18:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d59a0593

kde.org.eclass: KDE_RELEASE_SERVICE -> KDE_GEAR

The unbranded KDE Release Schedule formerly known as KDE Applications
is now known as KDE Gear.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 7d46b8e324..3f9850a067 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -7,8 +7,8 @@
 # @SUPPORTED_EAPIS: 7
 # @BLURB: Support eclass for packages that are hosted on kde.org infrastructure.
 # @DESCRIPTION:
-# This eclass is mainly providing facilities for the upstream release groups
-# Frameworks, Plasma, Release Service to assemble default SRC_URI for tarballs,
+# This eclass is mainly providing facilities for the three upstream release
+# groups (Frameworks, Plasma, Gear) to assemble default SRC_URI for tarballs,
 # set up git-r3.eclass for stable/master branch versions or restrict access to
 # unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may
 # be also used by any other package hosted on kde.org.
@@ -87,11 +87,11 @@ readonly KDE_ORG_CATEGORIES
 # Name of the package as hosted on kde.org mirrors.
 : ${KDE_ORG_NAME:=$PN}
 
-# @ECLASS-VARIABLE: KDE_RELEASE_SERVICE
+# @ECLASS-VARIABLE: KDE_GEAR
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # If set to "true", set SRC_URI accordingly and apply KDE_UNRELEASED.
-: ${KDE_RELEASE_SERVICE:=false}
+: ${KDE_GEAR:=false}
 
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:
@@ -120,7 +120,7 @@ HOMEPAGE="https://kde.org/"
 
 case ${CATEGORY} in
 	kde-apps)
-		KDE_RELEASE_SERVICE=true
+		KDE_GEAR=true
 		;;
 	kde-plasma)
 		HOMEPAGE="https://kde.org/plasma-desktop"
@@ -142,7 +142,7 @@ _kde.org_is_unreleased() {
 	for pair in "${KDE_UNRELEASED[@]}" ; do
 		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
 			return 0
-		elif [[ ${KDE_RELEASE_SERVICE} = true ]]; then
+		elif [[ ${KDE_GEAR} = true ]]; then
 			if [[ "${pair/kde-apps/${CATEGORY}}" = "${CATEGORY}-${PV}" ]]; then
 				return 0
 			fi
@@ -161,7 +161,7 @@ _kde.org_calculate_src_uri() {
 
 	local _src_uri="mirror://kde/"
 
-	if [[ ${KDE_RELEASE_SERVICE} = true ]]; then
+	if [[ ${KDE_GEAR} = true ]]; then
 		case ${PV} in
 			??.??.[6-9]? )
 				_src_uri+="unstable/release-service/${PV}/src/"
@@ -231,7 +231,7 @@ _kde.org_calculate_live_repo() {
 	# (anongit) with anything else you might want to use.
 	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
 
-	if [[ ${PV} == ??.??.49.9999 && ${KDE_RELEASE_SERVICE} = true ]]; then
+	if [[ ${PV} == ??.??.49.9999 && ${KDE_GEAR} = true ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi
 
@@ -278,8 +278,8 @@ kde.org_pkg_nofetch() {
 		kde-frameworks) sched_uri+="/Frameworks" ;;
 		kde-plasma) sched_uri+="/Plasma_5" ;;
 		*)
-			[[ ${KDE_RELEASE_SERVICE} = true ]] &&
-				sched_uri+="/release_service/$(ver_cut 1-2)_Release_Schedule"
+			[[ ${KDE_GEAR} = true ]] &&
+				sched_uri+="/KDE_Gear_$(ver_cut 1-2)_Schedule"
 			;;
 	esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0dc4f9005b423257d938033424117c4b590d4f30
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 21:11:16 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 21:14:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dc4f900

ecm.eclass: EAPI whitelist and EXPORT_FUNCTIONS ahead of inherit guard

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5e541f8cf5..5f10a7caf7 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -20,6 +20,17 @@
 # This eclass's phase functions are not intended to be mixed and matched, so if
 # any phase functions are overridden the version here should also be called.
 
+case ${EAPI} in
+	7) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+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 [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
 
@@ -48,17 +59,6 @@ if [[ ${ECM_NONGUI} = false ]] ; then
 	inherit xdg
 fi
 
-case ${EAPI} in
-	7) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-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
-
 # @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
 # @DESCRIPTION:
 # Assume the package is using KDEInstallDirs macro and switch

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c161088700310ac5545db82e290de3676ee711b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 21:19:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 21:19:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c1610887

kde.org.eclass: EAPI whitelist and EXPORT_FUNCTIONS ahead of inherit guard

Add EAPI whitelist in the first place.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 0dc7320d3e..fef8b31735 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -15,6 +15,13 @@
 # It also contains default meta variables for settings not specific to any
 # particular build system.
 
+case ${EAPI} in
+	7) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+EXPORT_FUNCTIONS pkg_nofetch src_unpack
+
 if [[ -z ${_KDE_ORG_ECLASS} ]]; then
 _KDE_ORG_ECLASS=1
 
@@ -32,8 +39,6 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	inherit git-r3
 fi
 
-EXPORT_FUNCTIONS pkg_nofetch src_unpack
-
 # @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
 # @INTERNAL
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7c859941ce1232284096713654fc87dd4f9738b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 18:20:09 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 18:20:09 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c859941

kde.org.eclass: Mark KDE Gear 21.04.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 fef8b31735..fee743ed13 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -119,7 +119,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-21.04.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     99e1e156836a66a4da9788ec9c1a4f6514cdc66a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 18:47:26 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 20:26:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=99e1e156

kde.org.eclass: Support Qt5PatchCollection stable branch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 596322f4b1..651ef680d4 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -52,6 +52,7 @@ declare -A KDE_ORG_CATEGORIES=(
 	[app-office]=office
 	[app-text]=office
 	[dev-libs]=libraries
+	[dev-qt]=qt/qt
 	[dev-util]=sdk
 	[games-board]=games
 	[games-kids]=education
@@ -249,6 +250,10 @@ _kde.org_calculate_live_repo() {
 	# (anongit) with anything else you might want to use.
 	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
 
+	if [[ ${PV} == ?.??.9999 && ${CATEGORY} = dev-qt ]]; then
+		EGIT_BRANCH="kde/$(ver_cut 1-2)"
+	fi
+
 	if [[ ${PV} == ??.??.49.9999 && ${KDE_GEAR} = true ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     104515216fbb9ac5bc27ebc7c8395019a7bc82e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 14:33:37 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 20:26:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=10451521

kde.org.eclass: Add KDE_ORG_COMMIT to provide invent.kde.org snapshots

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index fee743ed13..596322f4b1 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -86,6 +86,13 @@ readonly KDE_ORG_CATEGORIES
 # category on invent.kde.org, with "kde" as fallback value.
 : ${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}}
 
+# @ECLASS-VARIABLE: KDE_ORG_COMMIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If set, instead of a regular release tarball, pull tar.gz snapshot from an
+# invent.kde.org repository identified by KDE_ORG_CATEGORY and KDE_ORG_NAME
+# at the desired COMMIT ID.
+
 # @ECLASS-VARIABLE: KDE_ORG_NAME
 # @DESCRIPTION:
 # If unset, default value is set to ${PN}.
@@ -214,7 +221,13 @@ _kde.org_calculate_src_uri() {
 		esac
 	fi
 
-	SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz"
+	if [[ -n ${KDE_ORG_COMMIT} ]]; then
+		SRC_URI="https://invent.kde.org/${KDE_ORG_CATEGORY}/${KDE_ORG_NAME}/-/"
+		SRC_URI+="archive/${KDE_ORG_COMMIT}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}.tar.gz"
+		SRC_URI+=" -> ${KDE_ORG_NAME}-${PV}-${KDE_ORG_COMMIT:0:8}.tar.gz"
+	else
+		SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz"
+	fi
 
 	if _kde.org_is_unreleased ; then
 		RESTRICT+=" fetch"
@@ -260,14 +273,14 @@ case ${KDE_BUILD_TYPE} in
 	*)
 		_kde.org_calculate_src_uri
 		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
+		if [[ -n ${KDE_ORG_COMMIT} ]]; then
+			S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}
+		else
+			S=${WORKDIR}/${KDE_ORG_NAME}-${PV}
+		fi
 		;;
 esac
 
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	S=${WORKDIR}/${KDE_ORG_NAME}-${PV}
-fi
-
 # @FUNCTION: kde.org_pkg_nofetch
 # @DESCRIPTION:
 # Intended for use in the KDE overlay. If this package matches something in

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     01793b81590fb61e5609f62c411cf9ad05aac22d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 17:53:00 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 20:26:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=01793b81

kde.org.eclass: Support Qt5PatchCollection snapshots

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 651ef680d4..c0392fc1e0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -132,6 +132,11 @@ KDE_UNRELEASED=( )
 HOMEPAGE="https://kde.org/"
 
 case ${CATEGORY} in
+	dev-qt)
+		KDE_ORG_NAME=${QT5_MODULE:-${PN}}
+		HOMEPAGE="https://community.kde.org/Qt5PatchCollection
+			https://invent.kde.org/qt/qt/ https://www.qt.io/"
+		;;
 	kde-apps)
 		KDE_GEAR=true
 		;;
@@ -280,6 +285,7 @@ case ${KDE_BUILD_TYPE} in
 		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 		if [[ -n ${KDE_ORG_COMMIT} ]]; then
 			S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}
+			[[ ${CATEGORY} == dev-qt ]] && QT5_BUILD_DIR="${S}_build"
 		else
 			S=${WORKDIR}/${KDE_ORG_NAME}-${PV}
 		fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6fb216ef00b189777169405c617790242246fec8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 00:29:35 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 08:07:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fb216ef

kde.org.eclass: mark KDE_SELINUX_MODULE as @PRE_INHERIT

Controls IUSE="selinux" and SELinux policy dependency
in global scope.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index c0392fc1e0..ee154f0aa0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -107,6 +107,7 @@ readonly KDE_ORG_CATEGORIES
 : ${KDE_GEAR:=false}
 
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # If set to "none", do nothing.
 # For any other value, add selinux to IUSE, and depending on that useflag

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4d911627e8a8fd16e092a12ba19e41f844b09c78
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May  8 11:16:59 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May  8 11:16:59 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d911627

kde.org.eclass: Mark KDE Frameworks 5.82 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 d5871e206c..ee154f0aa0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,7 +128,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.82.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8f77538f05d3476de247667cde2051bc5902c2d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 04:15:43 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  9 16:52:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f77538f

cmake.eclass: mark CMAKE_EXTRA_CACHE_FILE, CMAKE_QA_SRC_DIR_READONLY as @USER_VARIABLEs

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 2d5fdb7293..870e8dba5f 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -82,6 +82,7 @@ _CMAKE_ECLASS=1
 : ${CMAKE_WARN_UNUSED_CLI:=yes}
 
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
@@ -89,6 +90,7 @@ _CMAKE_ECLASS=1
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 # @ECLASS-VARIABLE: CMAKE_QA_SRC_DIR_READONLY
+# @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # After running cmake_src_prepare, sets ${S} to read-only. This is

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bfed3e5d1c5d34ca4a43a6b98cfd46db5fa4dacf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 00:20:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  9 16:52:17 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bfed3e5d

cmake.eclass: mark CMAKE_MAKEFILE_GENERATOR as @PRE_INHERIT

We use this to control our dependencies in global scope.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 840c6e041c..2d5fdb7293 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -48,6 +48,7 @@ _CMAKE_ECLASS=1
 # Set to enable in-source build.
 
 # @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specify a makefile generator to be used by cmake.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f544da8624c90a97e901711e82dc39965f17f8b4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 07:46:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 12 07:49:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f544da86

kde.org.eclass: Mark KDE Gear 21.04.1 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 ee154f0aa0..5a44b1c49a 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,7 +128,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-21.04.1 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d348bcc606e0600e60b0378474a1454e854739ad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 11:20:36 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 13 11:20:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d348bcc6

kde.org.eclass: Mark KDE Gear 21.04.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 5a44b1c49a..ee154f0aa0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,7 +128,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-21.04.1 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     35ea32640b2c2cfb329bf1acb1143f1051157451
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 17:23:03 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 17:23:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=35ea3264

kde.org.eclass: Mark KDE Gear 21.04.3 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 26aeaea08b..d0693d9c0b 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,7 +128,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.84.0 )
+KDE_UNRELEASED=( kde-frameworks-5.84.0 kde-apps-21.04.3 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5da03f93d92bbd525b56a69b6fe4a2481936ea17
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 11:21:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 11:21:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5da03f93

kde.org.eclass: Mark KDE Gear 21.04.3 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 d0693d9c0b..26aeaea08b 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,7 +128,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.84.0 kde-apps-21.04.3 )
+KDE_UNRELEASED=( kde-frameworks-5.84.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2e83df1a1156f71a5f4a192ce4355ac0c60b0f02
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 16:39:03 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 16:39:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e83df1a

kde.org.eclass: Mark KDE Frameworks 5.84.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 26aeaea08b..ee154f0aa0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -128,7 +128,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.84.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ee2db584e3388e1c3375ff071aa3b21366b6704b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 08:00:24 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 08:18:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee2db584

kde.org.eclass: Harmonise equals operator to == everywhere

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index ee154f0aa0..0503bcf6a2 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -30,12 +30,12 @@ _KDE_ORG_ECLASS=1
 # If PV matches "*9999*", this is automatically set to "live".
 # Otherwise, this is automatically set to "release".
 KDE_BUILD_TYPE="release"
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	KDE_BUILD_TYPE="live"
 fi
 export KDE_BUILD_TYPE
 
-if [[ ${KDE_BUILD_TYPE} = live ]]; then
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	inherit git-r3
 fi
 
@@ -147,7 +147,7 @@ case ${CATEGORY} in
 	kde-frameworks)
 		HOMEPAGE="https://kde.org/products/frameworks/"
 		SLOT=5/${PV}
-		[[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+		[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
 		;;
 	*) ;;
 esac
@@ -159,10 +159,10 @@ esac
 _kde.org_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do
-		if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+		if [[ "${pair}" == "${CATEGORY}-${PV}" ]]; then
 			return 0
-		elif [[ ${KDE_GEAR} = true ]]; then
-			if [[ "${pair/kde-apps/${CATEGORY}}" = "${CATEGORY}-${PV}" ]]; then
+		elif [[ ${KDE_GEAR} == true ]]; then
+			if [[ "${pair/kde-apps/${CATEGORY}}" == "${CATEGORY}-${PV}" ]]; then
 				return 0
 			fi
 		fi
@@ -180,7 +180,7 @@ _kde.org_calculate_src_uri() {
 
 	local _src_uri="mirror://kde/"
 
-	if [[ ${KDE_GEAR} = true ]]; then
+	if [[ ${KDE_GEAR} == true ]]; then
 		case ${PV} in
 			??.??.[6-9]? )
 				_src_uri+="unstable/release-service/${PV}/src/"
@@ -218,7 +218,7 @@ _kde.org_calculate_src_uri() {
 			;;
 	esac
 
-	if [[ ${PN} = kdevelop* ]]; then
+	if [[ ${PN} == kdevelop* ]]; then
 		case ${PV} in
 			*.*.[6-9]? )
 				_src_uri+="unstable/kdevelop/${PV}/src/"
@@ -256,19 +256,19 @@ _kde.org_calculate_live_repo() {
 	# (anongit) with anything else you might want to use.
 	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
 
-	if [[ ${PV} == ?.??.9999 && ${CATEGORY} = dev-qt ]]; then
+	if [[ ${PV} == ?.??.9999 && ${CATEGORY} == dev-qt ]]; then
 		EGIT_BRANCH="kde/$(ver_cut 1-2)"
 	fi
 
-	if [[ ${PV} == ??.??.49.9999 && ${KDE_GEAR} = true ]]; then
+	if [[ ${PV} == ??.??.49.9999 && ${KDE_GEAR} == true ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi
 
-	if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+	if [[ ${PV} != 9999 && ${CATEGORY} == kde-plasma ]]; then
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
-	if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then
+	if [[ ${PV} != 9999 && ${PN} == kdevelop* ]]; then
 		EGIT_BRANCH="$(ver_cut 1-2)"
 	fi
 
@@ -308,7 +308,7 @@ kde.org_pkg_nofetch() {
 		kde-frameworks) sched_uri+="/Frameworks" ;;
 		kde-plasma) sched_uri+="/Plasma_5" ;;
 		*)
-			[[ ${KDE_GEAR} = true ]] &&
+			[[ ${KDE_GEAR} == true ]] &&
 				sched_uri+="/KDE_Gear_$(ver_cut 1-2)_Schedule"
 			;;
 	esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ed5820b5009a75d18184f052005155579f8842e5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 10:40:16 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 16:55:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed5820b5

cmake.eclass: Move supported EAPI check and EXPORT_FUNCTIONS on top

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 870e8dba5f..05556e49f1 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -17,6 +17,13 @@
 # out-of-source builds (default), in-source builds and an implementation of the
 # well-known use_enable function for CMake.
 
+case ${EAPI:-0} in
+	7) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+
 if [[ -z ${_CMAKE_ECLASS} ]]; then
 _CMAKE_ECLASS=1
 
@@ -97,15 +104,8 @@ _CMAKE_ECLASS=1
 # a user flag and should under _no circumstances_ be set in the ebuild.
 # Helps in improving QA of build systems that write to source tree.
 
-case ${EAPI} in
-	7) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-
 [[ ${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=\"\" instead"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     67adf37b7294378d0f41c2a215962bbcc5a35469
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 08:01:59 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 08:18:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=67adf37b

kde.org.eclass: Support EAPI-8

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 0503bcf6a2..31359c3f63 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 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
@@ -15,8 +15,8 @@
 # It also contains default meta variables for settings not specific to any
 # particular build system.
 
-case ${EAPI} in
-	7) ;;
+case ${EAPI:-0} in
+	7|8) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     19b4ef26c52864d1e0dce7d07e7d2d009ea73094
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 08:30:46 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 08:53:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=19b4ef26

kde.org.eclass: Allow KDE_BUILD_TYPE to hold "snapshot" value

This value is set in conjunction with KDE_ORG_COMMIT to distinguish
between proper release tarballs and snapshots.

Minor changes in adv. of follow-up commit:
- KDE_GEAR: move kde-apps/ fallback decl below default, improve eclassdoc
- PRE_INHERIT: set it where necessary

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 50 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 31359c3f63..18f198e522 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -25,20 +25,6 @@ EXPORT_FUNCTIONS pkg_nofetch src_unpack
 if [[ -z ${_KDE_ORG_ECLASS} ]]; then
 _KDE_ORG_ECLASS=1
 
-# @ECLASS-VARIABLE: KDE_BUILD_TYPE
-# @DESCRIPTION:
-# If PV matches "*9999*", this is automatically set to "live".
-# Otherwise, this is automatically set to "release".
-KDE_BUILD_TYPE="release"
-if [[ ${PV} == *9999* ]]; then
-	KDE_BUILD_TYPE="live"
-fi
-export KDE_BUILD_TYPE
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	inherit git-r3
-fi
-
 # @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
 # @INTERNAL
 # @DESCRIPTION:
@@ -82,12 +68,14 @@ declare -A KDE_ORG_CATEGORIES=(
 readonly KDE_ORG_CATEGORIES
 
 # @ECLASS-VARIABLE: KDE_ORG_CATEGORY
+# @PRE_INHERIT
 # @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}}
 
 # @ECLASS-VARIABLE: KDE_ORG_COMMIT
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, instead of a regular release tarball, pull tar.gz snapshot from an
@@ -95,16 +83,42 @@ readonly KDE_ORG_CATEGORIES
 # at the desired COMMIT ID.
 
 # @ECLASS-VARIABLE: KDE_ORG_NAME
+# @PRE_INHERIT
 # @DESCRIPTION:
 # If unset, default value is set to ${PN}.
 # Name of the package as hosted on kde.org mirrors.
 : ${KDE_ORG_NAME:=$PN}
 
 # @ECLASS-VARIABLE: KDE_GEAR
+# @PRE_INHERIT
 # @DESCRIPTION:
-# If set to "false", do nothing.
+# Mark package is being part of KDE Gear release schedule.
+# By default, this is set to "false" and does nothing.
+# If CATEGORY equals kde-apps, this is automatically set to "true".
 # If set to "true", set SRC_URI accordingly and apply KDE_UNRELEASED.
 : ${KDE_GEAR:=false}
+if [[ ${CATEGORY} == kde-apps ]]; then
+	KDE_GEAR=true
+fi
+
+# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @DESCRIPTION:
+# By default, this is set to "release".
+# If PV matches "*9999*", this is automatically set to "live" and will cause
+# git-r3.eclass to be inherited.
+# In EAPI-8, if KDE_ORG_COMMIT is set, this is automatically set to "snapshot".
+KDE_BUILD_TYPE="release"
+if [[ ${PV} == *9999* ]]; then
+	KDE_BUILD_TYPE="live"
+fi
+if [[ ${EAPI} == 8 ]] && [[ -n ${KDE_ORG_COMMIT} ]]; then
+	KDE_BUILD_TYPE="snapshot"
+fi
+export KDE_BUILD_TYPE
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+	inherit git-r3
+fi
 
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @PRE_INHERIT
@@ -138,16 +152,13 @@ case ${CATEGORY} in
 		HOMEPAGE="https://community.kde.org/Qt5PatchCollection
 			https://invent.kde.org/qt/qt/ https://www.qt.io/"
 		;;
-	kde-apps)
-		KDE_GEAR=true
-		;;
 	kde-plasma)
 		HOMEPAGE="https://kde.org/plasma-desktop"
 		;;
 	kde-frameworks)
 		HOMEPAGE="https://kde.org/products/frameworks/"
 		SLOT=5/${PV}
-		[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+		[[ ${KDE_BUILD_TYPE} != live ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
 		;;
 	*) ;;
 esac
@@ -284,6 +295,7 @@ case ${KDE_BUILD_TYPE} in
 	*)
 		_kde.org_calculate_src_uri
 		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
+		# TODO: simplify after dropping support for EAPI-7
 		if [[ -n ${KDE_ORG_COMMIT} ]]; then
 			S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}
 			[[ ${CATEGORY} == dev-qt ]] && QT5_BUILD_DIR="${S}_build"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     879869d48d0458310a2db068f974053607bf4f0c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 16:38:40 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 16:38:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=879869d4

kde.org.eclass: Mark KDE Frameworks 5.85.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 2486528c98..18f198e522 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -142,7 +142,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.85.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dc28662e0bbc33e86df44ed2ce13c979a43e81d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 11:59:46 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 14:12:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc28662e

kde.org.eclass: Revert "Allow KDE_BUILD_TYPE to hold "snapshot" value"

Not enough resulting simplification in eclass to justify complicating
an ebuild facing variable.

Partially reverts commit 19b4ef26c52864d1e0dce7d07e7d2d009ea73094.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 18f198e522..aab7abcd6c 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -15,7 +15,7 @@
 # It also contains default meta variables for settings not specific to any
 # particular build system.
 
-case ${EAPI:-0} in
+case ${EAPI} in
 	7|8) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
@@ -25,6 +25,20 @@ EXPORT_FUNCTIONS pkg_nofetch src_unpack
 if [[ -z ${_KDE_ORG_ECLASS} ]]; then
 _KDE_ORG_ECLASS=1
 
+# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @DESCRIPTION:
+# If PV matches "*9999*", this is automatically set to "live".
+# Otherwise, this is automatically set to "release".
+KDE_BUILD_TYPE="release"
+if [[ ${PV} == *9999* ]]; then
+	KDE_BUILD_TYPE="live"
+fi
+export KDE_BUILD_TYPE
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+	inherit git-r3
+fi
+
 # @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
 # @INTERNAL
 # @DESCRIPTION:
@@ -101,25 +115,6 @@ if [[ ${CATEGORY} == kde-apps ]]; then
 	KDE_GEAR=true
 fi
 
-# @ECLASS-VARIABLE: KDE_BUILD_TYPE
-# @DESCRIPTION:
-# By default, this is set to "release".
-# If PV matches "*9999*", this is automatically set to "live" and will cause
-# git-r3.eclass to be inherited.
-# In EAPI-8, if KDE_ORG_COMMIT is set, this is automatically set to "snapshot".
-KDE_BUILD_TYPE="release"
-if [[ ${PV} == *9999* ]]; then
-	KDE_BUILD_TYPE="live"
-fi
-if [[ ${EAPI} == 8 ]] && [[ -n ${KDE_ORG_COMMIT} ]]; then
-	KDE_BUILD_TYPE="snapshot"
-fi
-export KDE_BUILD_TYPE
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	inherit git-r3
-fi
-
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -158,7 +153,7 @@ case ${CATEGORY} in
 	kde-frameworks)
 		HOMEPAGE="https://kde.org/products/frameworks/"
 		SLOT=5/${PV}
-		[[ ${KDE_BUILD_TYPE} != live ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+		[[ ${KDE_BUILD_TYPE} == release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
 		;;
 	*) ;;
 esac
@@ -295,7 +290,6 @@ case ${KDE_BUILD_TYPE} in
 	*)
 		_kde.org_calculate_src_uri
 		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
-		# TODO: simplify after dropping support for EAPI-7
 		if [[ -n ${KDE_ORG_COMMIT} ]]; then
 			S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}
 			[[ ${CATEGORY} == dev-qt ]] && QT5_BUILD_DIR="${S}_build"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     ca79336c00701b0f0981adf57e2e0f6e614c3a0e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 11:25:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:10:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca79336c

cmake.eclass: Support EAPI-8

Switch to using current working directory instead of ${S}
when initializing ${CMAKE_USE_DIR} and ${BUILD_DIR}.

Raise baseline cmake version to 3.20.

Bug: https://bugs.gentoo.org/704524
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 81 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 05556e49f1..b78441bfaa 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -9,7 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake eclass makes creating ebuilds for cmake-based packages much easier.
@@ -17,8 +17,8 @@
 # out-of-source builds (default), in-source builds and an implementation of the
 # well-known use_enable function for CMake.
 
-case ${EAPI:-0} in
-	7) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -28,12 +28,14 @@ if [[ -z ${_CMAKE_ECLASS} ]]; then
 _CMAKE_ECLASS=1
 
 # @ECLASS-VARIABLE: BUILD_DIR
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Build directory where all cmake processed files should be generated.
 # For in-source build it's fixed to ${CMAKE_USE_DIR}.
 # For out-of-source build it can be overridden, by default it uses
-# ${WORKDIR}/${P}_build.
-: ${BUILD_DIR:=${WORKDIR}/${P}_build}
+# ${CMAKE_USE_DIR}_build (in EAPI-7: ${WORKDIR}/${P}_build).
+[[ ${EAPI} == 7 ]] && : ${BUILD_DIR:=${WORKDIR}/${P}_build}
+# EAPI-8: set inside _cmake_check_build_dir
 
 # @ECLASS-VARIABLE: CMAKE_BINARY
 # @DESCRIPTION:
@@ -65,16 +67,16 @@ _CMAKE_ECLASS=1
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
 # @DESCRIPTION:
-# Space-separated list of CMake modules that will be removed in $S during
-# src_prepare, in order to force packages to use the system version.
-# Set to empty to disable removing modules entirely.
+# Space-separated list of CMake modules to be removed in ${CMAKE_USE_DIR}
+# (in EAPI-7: ${S}) during src_prepare, in order to force packages to use the
+# system version.  Set to empty to disable removing modules entirely.
 : ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
 
 # @ECLASS-VARIABLE: CMAKE_USE_DIR
 # @DESCRIPTION:
 # Sets the directory where we are working with cmake, for example when
 # application uses autotools and only one plugin needs to be done by cmake.
-# By default it uses ${S}.
+# By default it uses current working directory (in EAPI-7: ${S}).
 
 # @ECLASS-VARIABLE: CMAKE_VERBOSE
 # @DESCRIPTION:
@@ -100,9 +102,9 @@ _CMAKE_ECLASS=1
 # @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# After running cmake_src_prepare, sets ${S} to read-only. This is
-# a user flag and should under _no circumstances_ be set in the ebuild.
-# Helps in improving QA of build systems that write to source tree.
+# After running cmake_src_prepare, sets ${CMAKE_USE_DIR} (in EAPI-7: ${S}) to
+# read-only. This is a user flag and should under _no circumstances_ be set in
+# the ebuild. Helps in improving QA of build systems that write to source tree.
 
 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
@@ -127,7 +129,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	BDEPEND+=" dev-util/cmake"
+	BDEPEND+=" >=dev-util/cmake-3.20"
 fi
 
 # @FUNCTION: cmake_run_in
@@ -264,14 +266,22 @@ cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
 # @DESCRIPTION:
 # Determine using IN or OUT source build
 _cmake_check_build_dir() {
-	: ${CMAKE_USE_DIR:=${S}}
+	if [[ ${EAPI} == 7 ]]; then
+		: ${CMAKE_USE_DIR:=${S}}
+	else
+		: ${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}
 	fi
 
+	einfo "Source directory (CMAKE_USE_DIR): \"${CMAKE_USE_DIR}\""
+	einfo "Build directory  (BUILD_DIR):     \"${BUILD_DIR}\""
+
 	mkdir -p "${BUILD_DIR}" || die
-	einfo "Working in BUILD_DIR: \"$BUILD_DIR\""
 }
 
 # @FUNCTION: _cmake_modify-cmakelists
@@ -320,12 +330,14 @@ _cmake_modify-cmakelists() {
 cmake_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# FIXME: workaround from cmake-utils; use current working directory instead, bug #704524
-	# esp. test with 'special' pkgs like: app-arch/brotli, media-gfx/gmic, net-libs/quiche
-	pushd "${S}" > /dev/null || die
+	if [[ ${EAPI} == 7 ]]; then
+		pushd "${S}" > /dev/null || die # workaround from cmake-utils
+		# in EAPI-8, we use current working directory instead, bug #704524
+		# esp. test with 'special' pkgs like: app-arch/brotli, media-gfx/gmic, net-libs/quiche
+	fi
+	_cmake_check_build_dir
 
 	default_src_prepare
-	_cmake_check_build_dir
 
 	# check if CMakeLists.txt exist and if no then die
 	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
@@ -351,17 +363,28 @@ cmake_src_prepare() {
 
 	local name
 	for name in "${modules_list[@]}" ; do
-		find "${S}" -name ${name}.cmake -exec rm -v {} + || die
+		if [[ ${EAPI} == 7 ]]; then
+			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
+		else
+			find -name "${name}.cmake" -exec rm -v {} + || die
+		fi
 	done
 
 	# Remove dangerous things.
 	_cmake_modify-cmakelists
 
-	popd > /dev/null || die
+	if [[ ${EAPI} == 7 ]]; then
+		popd > /dev/null || die
+	fi
 
-	# make ${S} read-only in order to detect broken build-systems
+	# Make ${CMAKE_USE_DIR} (in EAPI-7: ${S}) read-only in order to detect
+	# broken build systems.
 	if [[ ${CMAKE_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		chmod -R a-w "${S}"
+		if [[ ${EAPI} == 7 ]]; then
+			chmod -R a-w "${S}"
+		else
+			chmod -R a-w "${CMAKE_USE_DIR}"
+		fi
 	fi
 
 	_CMAKE_SRC_PREPARE_HAS_RUN=1
@@ -657,9 +680,15 @@ cmake_src_install() {
 		die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
 	popd > /dev/null || die
 
-	pushd "${S}" > /dev/null || die
-	einstalldocs
-	popd > /dev/null || die
+	if [[ ${EAPI} == 7 ]]; then
+		pushd "${S}" > /dev/null || die
+		einstalldocs
+		popd > /dev/null || die
+	else
+		pushd "${CMAKE_USE_DIR}" > /dev/null || die
+		einstalldocs
+		popd > /dev/null || die
+	fi
 }
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     70ed594d0d6a67b486c8781e02dbab1bba92aba4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  5 22:30:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:10:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70ed594d

ecm.eclass: Drop exec. bit from .desktop files in xdg standard dir

Bug: https://bugs.gentoo.org/621970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 919c7514b5..1f62d7f7af 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -30,6 +30,7 @@ if [[ -v KDE_GCC_MINIMAL ]]; then
 fi
 
 EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_postinst pkg_postrm
+[[ ${EAPI} != 7 ]] && EXPORT_FUNCTIONS src_install
 
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
@@ -535,12 +536,26 @@ ecm_src_test() {
 
 # @FUNCTION: ecm_src_install
 # @DESCRIPTION:
-# Wrapper for cmake_src_install. Currently doesn't do anything extra, but
-# is included as part of the API just in case it's needed in the future.
+# Wrapper for cmake_src_install. Drops executable bit from .desktop files
+# installed inside /usr/share/applications. This is set by cmake when install()
+# is called in PROGRAM form, as seen in many kde.org projects.
 ecm_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	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
+	fi
 }
 
 # @FUNCTION: ecm_pkg_preinst

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c4a09deca98a78649976f966fd6e8489e041e64c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 19:31:36 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:10:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c4a09dec

cmake.eclass: Enable CMAKE_INSTALL_ALWAYS

Bug: https://bugs.gentoo.org/735820
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 3c61107182..8befd9e5a9 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -537,6 +537,11 @@ cmake_src_configure() {
 		echo 'set(CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die
 	fi
 
+	# See bug 735820
+	if [[ ${EAPI} != 7 ]]; then
+		echo 'set(CMAKE_INSTALL_ALWAYS 1)' >> "${common_config}" || die
+	fi
+
 	# Wipe the default optimization flags out of CMake
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]]; then
 		cat >> ${common_config} <<- _EOF_ || die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     7a440e37c189fb350b824203221acb9ab7920824
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 08:02:30 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:10:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a440e37

cmake.eclass: Default CMAKE_BUILD_TYPE=RelWithDebInfo in EAPI 8

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 8befd9e5a9..3021a3a2b1 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -42,14 +42,19 @@ _CMAKE_ECLASS=1
 # Eclass can use different cmake binary than the one provided in by system.
 : ${CMAKE_BINARY:=cmake}
 
+[[ ${EAPI} == 7 ]] && : ${CMAKE_BUILD_TYPE:=Gentoo}
 # @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
 # @DESCRIPTION:
 # Set to override default CMAKE_BUILD_TYPE. Only useful for packages
 # known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
 # If about to be set - needs to be set before invoking cmake_src_configure.
-# You usually do *NOT* want nor need to set it as it pulls CMake default
-# build-type specific compiler flags overriding make.conf.
-: ${CMAKE_BUILD_TYPE:=Gentoo}
+#
+# The default is RelWithDebInfo as that is least likely to append undesirable
+# flags. However, you may still need to sed CMake files or choose a different
+# build type to achieve desirable results.
+#
+# In EAPI 7, the default was non-standard build type of Gentoo.
+: ${CMAKE_BUILD_TYPE:=RelWithDebInfo}
 
 # @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
 # @DEFAULT_UNSET

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     40e9ac8f62c95c5d991148d8912422e8eaa8813d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 18:02:54 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:10:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=40e9ac8f

cmake.eclass: Enforce CMAKE_REMOVE_MODULES_LIST be an array

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b78441bfaa..3c61107182 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -66,11 +66,23 @@ _CMAKE_ECLASS=1
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
+# @PRE_INHERIT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
-# Space-separated list of CMake modules to be removed in ${CMAKE_USE_DIR}
-# (in EAPI-7: ${S}) during src_prepare, in order to force packages to use the
-# system version.  Set to empty to disable removing modules entirely.
-: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
+# Array of .cmake modules to be removed in ${CMAKE_USE_DIR} (in EAPI-7: ${S})
+# during src_prepare, in order to force packages to use the system version.
+# By default, contains "FindBLAS" and "FindLAPACK".
+# Set to empty to disable removing modules entirely.
+if [[ ${CMAKE_REMOVE_MODULES_LIST} ]]; then
+	if [[ ${EAPI} != 7 ]]; then
+		[[ ${CMAKE_REMOVE_MODULES_LIST@a} == *a* ]] ||
+			die "CMAKE_REMOVE_MODULES_LIST must be an array"
+	fi
+else
+	if ! [[ ${CMAKE_REMOVE_MODULES_LIST@a} == *a* && ${#CMAKE_REMOVE_MODULES_LIST[@]} -eq 0 ]]; then
+		CMAKE_REMOVE_MODULES_LIST=( FindBLAS FindLAPACK )
+	fi
+fi
 
 # @ECLASS-VARIABLE: CMAKE_USE_DIR
 # @DESCRIPTION:
@@ -355,10 +367,10 @@ cmake_src_prepare() {
 	fi
 
 	local modules_list
-	if [[ $(declare -p CMAKE_REMOVE_MODULES_LIST) == "declare -a"* ]]; then
-		modules_list=( "${CMAKE_REMOVE_MODULES_LIST[@]}" )
-	else
+	if [[ ${EAPI} == 7 && $(declare -p CMAKE_REMOVE_MODULES_LIST) != "declare -a"* ]]; then
 		modules_list=( ${CMAKE_REMOVE_MODULES_LIST} )
+	else
+		modules_list=( "${CMAKE_REMOVE_MODULES_LIST[@]}" )
 	fi
 
 	local name

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4d627557db2199dc0fc5c32cce3b5ebad271bd3c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 11:35:22 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 13:10:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d627557

ecm.eclass: Support EAPI-8

Raise baseline Frameworks version to 5.82.0.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5f10a7caf7..919c7514b5 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: ecm.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Support eclass for packages that use KDE Frameworks with ECM.
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages
@@ -21,7 +21,7 @@
 # any phase functions are overridden the version here should also be called.
 
 case ${EAPI} in
-	7) ;;
+	7|8) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -154,7 +154,7 @@ fi
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KFMIN:=$(ver_cut 1-2)}
 fi
-: ${KFMIN:=5.64.0}
+: ${KFMIN:=5.82.0}
 
 # @ECLASS-VARIABLE: KFSLOT
 # @INTERNAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     23ea70513e81f0f00bcc36dddc7ab9945cb909b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 31 17:23:08 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 31 17:23:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=23ea7051

kde.org.eclass: Move EXPORT_FUNCTIONS below guard

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 21d96602c0..c375893e25 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -20,8 +20,6 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_nofetch src_unpack
-
 if [[ -z ${_KDE_ORG_ECLASS} ]]; then
 _KDE_ORG_ECLASS=1
 
@@ -354,3 +352,5 @@ kde.org_src_unpack() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_nofetch src_unpack

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     125ebdcb780b8171f8bfb67625581291c382d9bf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 10:12:55 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 10:12:55 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=125ebdcb

kde.org.eclass: Mark KDE Gear 21.08.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 c375893e25..bf087dfc8a 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-21.08.1 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a2efb902352fffc48ff27bef73b8ff24b7b05b39
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 18:14:27 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 18:14:27 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2efb902

ecm.eclass: Sync with Gentoo ebuild repository

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 1f62d7f7af..a2c8ed1c95 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -5,6 +5,7 @@
 # @MAINTAINER:
 # kde@gentoo.org
 # @SUPPORTED_EAPIS: 7 8
+# @PROVIDES: cmake
 # @BLURB: Support eclass for packages that use KDE Frameworks with ECM.
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages
@@ -22,16 +23,9 @@
 
 case ${EAPI} in
 	7|8) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
+	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-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
-[[ ${EAPI} != 7 ]] && EXPORT_FUNCTIONS src_install
-
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
 
@@ -42,6 +36,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
+
 # @ECLASS-VARIABLE: ECM_NONGUI
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -54,8 +50,6 @@ if [[ ${CATEGORY} = kde-frameworks ]] ; then
 fi
 : ${ECM_NONGUI:=false}
 
-inherit cmake flag-o-matic toolchain-funcs virtualx
-
 if [[ ${ECM_NONGUI} = false ]] ; then
 	inherit xdg
 fi
@@ -272,7 +266,7 @@ unset COMMONDEPEND
 # @DESCRIPTION:
 # Determine if the current GCC version is acceptable, otherwise die.
 _ecm_check_gcc_version() {
-	if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then
+	if [[ ${MERGE_TYPE} != binary && -v ${KDE_GCC_MINIMAL} ]] && tc-is-gcc; then
 
 		local version=$(gcc-version)
 
@@ -601,3 +595,13 @@ ecm_pkg_postrm() {
 }
 
 fi
+
+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

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     610f33f8baee8c02c46df6eb1674f5534eabb5c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 18:13:22 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 18:13:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=610f33f8

cmake.eclass: Sync with Gentoo ebuild repository

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 3021a3a2b1..02683634af 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -10,6 +10,7 @@
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
 # @SUPPORTED_EAPIS: 7 8
+# @PROVIDES: ninja-utils
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake eclass makes creating ebuilds for cmake-based packages much easier.
@@ -19,14 +20,14 @@
 
 case ${EAPI} in
 	7|8) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
+	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-
 if [[ -z ${_CMAKE_ECLASS} ]]; then
 _CMAKE_ECLASS=1
 
+inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
+
 # @ECLASS-VARIABLE: BUILD_DIR
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -123,11 +124,9 @@ fi
 # read-only. This is a user flag and should under _no circumstances_ be set in
 # the ebuild. Helps in improving QA of build systems that write to source tree.
 
-inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
-
 [[ ${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=\"\" instead"
+[[ ${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"
@@ -146,7 +145,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	BDEPEND+=" >=dev-util/cmake-3.20"
+	BDEPEND+=" >=dev-util/cmake-3.20.5"
 fi
 
 # @FUNCTION: cmake_run_in
@@ -714,3 +713,5 @@ cmake_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     db7907acfa8b38dcedd29aee4b0cdbd8f723f75a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 21:56:18 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 21:56:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=db7907ac

kde.org.eclass: Support different dev-qt stable branch PV

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 bb53f9d5b1..acf451b296 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -260,7 +260,7 @@ _kde.org_calculate_live_repo() {
 	# (anongit) with anything else you might want to use.
 	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
 
-	if [[ ${PV} == ?.??.9999 && ${CATEGORY} == dev-qt ]]; then
+	if [[ ${PV} == 5.??(.?)*.9999 && ${CATEGORY} == dev-qt ]]; then
 		EGIT_BRANCH="kde/$(ver_cut 1-2)"
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1a72c8a7611e6ef576f5fba7fc16e03929bd07cf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 19:25:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 19:25:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a72c8a7

kde.org.eclass: Mark KDE Frameworks 5.86.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 acf451b296..9e357001a9 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.86.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     02c9e18195b69e2053027f125badf77d7b3067bc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  6 14:18:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  6 14:18:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=02c9e181

kde.org.eclass: Fix KDE_UNRELEASED

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 2ee6174b5e..02c4a57dc0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.87.0 kde-gear-21.08.2 )
+KDE_UNRELEASED=( kde-frameworks-5.87.0 kde-apps-21.08.2 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2cbc4f9937b584b17ef9715141d1f26b2da7b84e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 14:43:43 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 14:43:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2cbc4f99

kde.org.eclass: Drop obsolete kdevelop* quirks, keep 5.6.2 supported

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 638661c5e3..1b693adbad 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -222,14 +222,8 @@ _kde.org_calculate_src_uri() {
 			;;
 	esac
 
-	if [[ ${PN} == kdevelop* ]]; then
-		case ${PV} in
-			*.*.[6-9]? )
-				_src_uri+="unstable/kdevelop/${PV}/src/"
-				RESTRICT+=" mirror"
-				;;
-			*) _src_uri+="stable/kdevelop/${PV}/src/" ;;
-		esac
+	if [[ ${PN} == kdevelop* && ${PV} == 5.6.2 ]]; then
+		_src_uri+="stable/kdevelop/${PV}/src/"
 	fi
 
 	if [[ -n ${KDE_ORG_COMMIT} ]]; then
@@ -272,10 +266,6 @@ _kde.org_calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
-	if [[ ${PV} != 9999 && ${PN} == kdevelop* ]]; then
-		EGIT_BRANCH="$(ver_cut 1-2)"
-	fi
-
 	# @ECLASS-VARIABLE: EGIT_REPONAME
 	# @DESCRIPTION:
 	# This variable allows overriding of default repository

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     055b94c6a25ec20b92229b5e8afd78b306ba247a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 19:04:35 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 19:04:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=055b94c6

kde.org.eclass: Mark KDE Frameworks 5.88.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 1b693adbad..4128e1238d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.88.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Sam James]

commit:     323b59ccbd7ebf199f934eeeab8fc23ca881b9db
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Wed Oct 20 08:34:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 03:48:06 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=323b59cc

ecm.eclass: set KDE_DEBUG=1 for ecm_src_test

The KDE_DEBUG variable [1] prevents crash handlers such as DrKonqi from launching
if a test were to segfault.

This prevents a hanging test phase where DrKonqi has launched and is waiting
for input on the virtx display.

[sam: We already try to disable apport/similar crash reporters because they
slow down tests, don't always play well in sandbox, and confuse users, so
this seems like a natural change.]

[1]: https://userbase.kde.org/KDE_System_Administration/Environment_Variables#KDE_DEBUG

Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22643
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/ecm.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index a2c8ed1c95..5ae6e73401 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -508,7 +508,8 @@ ecm_src_test() {
 			export $(dbus-launch)
 		fi
 
-		cmake_src_test
+		# KDE_DEBUG stops crash handlers from launching and hanging the test phase
+		KDE_DEBUG=1 cmake_src_test
 	}
 
 	# When run as normal user during ebuild development with the ebuild command,

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a50e128f26003fce1c8f918d259397c916d91cab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 21:46:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 21:47:14 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a50e128f

kde.org.eclass: Mark KDE Frameworks 5.89 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 7fe592b71f..4128e1238d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.89.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4635dbecb2ee1129f6f7cde8a29fc27a618ecbbe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 20:14:48 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 20:38:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4635dbec

ecm.eclass: Case-insensitivity for grep and sed

Reported-by: Milos Popovic <gpopac <AT> gmail.com>
Bug: https://bugs.gentoo.org/829998
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5ae6e73401..baece9e6e6 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -380,7 +380,7 @@ ecm_src_prepare() {
 
 		if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then
 			ecm_punt_bogus_dep KF5 DocTools
-			sed -i -e "/kdoctools_install/ s/^/#DONT/" CMakeLists.txt || die
+			sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
 		fi
 	fi
 
@@ -412,12 +412,12 @@ ecm_src_prepare() {
 			local f pf="${T}/${P}"-tests-optional.patch
 			touch ${pf} || die "Failed to touch patch file"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
-				grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
+				grep -li "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
 				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
 				pushd ${f%/*} > /dev/null || die
 					ecm_punt_bogus_dep Qt5 Test
 					sed -i CMakeLists.txt -e \
-						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
+						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/I" \
 						|| die
 				popd > /dev/null || die
 				diff -Naur ${f}.old ${f} 1>>${pf}

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     a8e2d266582bcc9c91e3a45ac4aa41859a3f4a13
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 15:38:48 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 18:44:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8e2d266

ecm.eclass: Introduce ecm_punt_kf_module and ecm_punt_qt_module

Upstream has begun replacing

	find_package(Qt5 ...)

with

	find_package(Qt${QT_MAJOR_VERSION}) ...)

for optional build with Qt6 - this breaks existing ecm_punt_bogus_dep()
regexps. There is no known usage of ecm_punt_bogus_dep with anything
else than Qt5 or KF5, so simply replace it with two public functions
fixed on Qt* and KF* module removal.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index baece9e6e6..9903eeef3e 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -312,6 +312,56 @@ _ecm_strip_handbook_translations() {
 	done
 }
 
+# @FUNCTION: _ecm_punt_kfqt_module
+# @USAGE: <prefix> <dependency>
+# @INTERNAL
+# @DESCRIPTION:
+# Removes a specified dependency from a find_package call with multiple
+# components.
+_ecm_punt_kfqt_module() {
+	local prefix=${1}
+	local dep=${2}
+
+	[[ ! -e "CMakeLists.txt" ]] && return
+
+	# FIXME: dep=WebKit will result in 'Widgets' over 'WebKitWidgets' (no regression)
+	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \
+		CMakeLists.txt > "${T}/bogus${dep}"
+
+	# pcregrep returns non-zero on no matches/error
+	[[ $? -ne 0 ]] && return
+
+	local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1)
+	local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1)
+	local last=$(( length + first - 1))
+
+	# FIXME: may leave empty find_package($prefix) behind (no regression, non-trivial)
+	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
+
+	if [[ ${length} -eq 1 ]] ; then
+		sed -e "/find_package\s*(\s*${prefix}\([0-9]|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by ecm.eclass - /" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+# @FUNCTION: ecm_punt_kf_module
+# @USAGE: <modulename>
+# @DESCRIPTION:
+# Removes a Frameworks (KF - matching any single-digit version)
+# module from a find_package call with multiple components.
+ecm_punt_kf_module() {
+	_ecm_punt_kfqt_module kf ${1}
+}
+
+# @FUNCTION: ecm_punt_qt_module
+# @USAGE: <modulename>
+# @DESCRIPTION:
+# Removes a Qt (matching any single-digit version) module from a
+# find_package call with multiple components.
+ecm_punt_qt_module() {
+	_ecm_punt_kfqt_module qt ${1}
+}
+
 # @FUNCTION: ecm_punt_bogus_dep
 # @USAGE: <prefix> <dependency>
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e960c044f7bcb8f0e9bc16e14cf19a394a456ee2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 16:51:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 18:44:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e960c044

ecm.eclass: Use new ecm_punt_kf_module/ecm_punt_qt_module internally

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 9903eeef3e..e173139565 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -429,7 +429,7 @@ ecm_src_prepare() {
 		cmake_comment_add_subdirectory ${ECM_HANDBOOK_DIR}
 
 		if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then
-			ecm_punt_bogus_dep KF5 DocTools
+			ecm_punt_kf_module DocTools
 			sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
 		fi
 	fi
@@ -454,18 +454,18 @@ ecm_src_prepare() {
 	# only build unit tests when required
 	if ! { in_iuse test && use test; } ; then
 		if [[ ${ECM_TEST} = forceoptional ]] ; then
-			ecm_punt_bogus_dep Qt5 Test
+			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_bogus_dep Qt5 Test
+			ecm_punt_qt_module Test
 			local f pf="${T}/${P}"-tests-optional.patch
 			touch ${pf} || die "Failed to touch patch file"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
 				grep -li "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
 				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
 				pushd ${f%/*} > /dev/null || die
-					ecm_punt_bogus_dep Qt5 Test
+					ecm_punt_qt_module Test
 					sed -i CMakeLists.txt -e \
 						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/I" \
 						|| die

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f05718149bde5d68c298a4f1a9b7a5b4a787ef3e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  7 09:59:42 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 09:59:42 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f0571814

kde.org.eclass: Mark KDE Gear 21.12.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 289c9b6278..00e3bd5856 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.90.0 kde-apps-21.12.1 )
+KDE_UNRELEASED=( kde-frameworks-5.90.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     07f51c3d74c5387d581a95be90985a80c2155481
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 12:39:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 12:43:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=07f51c3d

ecm.eclass: Fix sed typo in _ecm_punt_kfqt_module()

But also add '${dep}' info to 'removed by ecm.eclass' output.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 148a59369c..a0ba4090ce 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -335,11 +335,10 @@ _ecm_punt_kfqt_module() {
 	local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1)
 	local last=$(( length + first - 1))
 
-	# FIXME: may leave empty find_package($prefix) behind (no regression, non-trivial)
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} -eq 1 ]] ; then
-		sed -e "/find_package\s*(\s*${prefix}\([0-9]|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by ecm.eclass - /" \
+		sed -e "/find_package\s*(\s*${prefix}\([0-9]\|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# '${dep}' removed by ecm.eclass - /" \
 			-i CMakeLists.txt || die
 	fi
 }

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c7cc96186b6322b4e23afabada56836b5d605b27
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 07:33:59 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 07:34:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7cc9618

kde.org.eclass: Add kde-frameworks/countryflags to portingAids URIs

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 0b5ed199e6..a803cab662 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -198,6 +198,7 @@ _kde.org_calculate_src_uri() {
 		kde-frameworks)
 			_src_uri+="stable/frameworks/$(ver_cut 1-2)/"
 			case ${PN} in
+				countryflags | \
 				kdelibs4support | \
 				kdesignerplugin | \
 				kdewebkit | \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6fba24b57f21a1c16fab5d707acd9f533fc0327f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  3 17:10:17 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  3 17:10:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fba24b5

kde.org.eclass: Mark KDE Gear 21.12.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 57958a44a0..a803cab662 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-21.12.2 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     04185da129d212b2e92ce5975abfae03b006d7d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 17:40:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 17:40:28 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=04185da1

cmake.eclass: Fix MYCMAKEARGS support with >=dev-util/cmake-3.23

Bug: https://bugs.gentoo.org/833100
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 36f2621e19..64a2931898 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -593,9 +593,12 @@ cmake_src_configure() {
 		"${mycmakeargs_local[@]}"
 		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
-		"${MYCMAKEARGS}"
 	)
 
+	if [[ -n ${MYCMAKEARGS} ]] ; then
+		cmakeargs+=( "${MYCMAKEARGS}" )
+	fi
+
 	if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
 		cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     05bc71ff824090fb9217ba8e9df69f7234ae027b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 16:43:25 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 16:54:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=05bc71ff

cmake.eclass: Document MYCMAKEARGS

Bug: https://bugs.gentoo.org/824030
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 64a2931898..f0a59a2ac4 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -406,6 +406,12 @@ cmake_src_prepare() {
 	_CMAKE_SRC_PREPARE_HAS_RUN=1
 }
 
+# @VARIABLE: MYCMAKEARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# User-controlled environment variable containing arguments to be passed to
+# cmake in cmake_src_configure.
+
 # @FUNCTION: cmake_src_configure
 # @DESCRIPTION:
 # General function for configuring with cmake. Default behaviour is to start an

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     591d8256b3a673470c98f96588dd4a0ef18b7c6c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 08:04:54 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 23:20:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=591d8256

kde.org.eclass: Use KDE_ORG_NAME to determine fetch location

Makes much more sense here instead of PN, and avoids duplicating checks
for split packages.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index a803cab662..2ddde6a865 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -197,8 +197,7 @@ _kde.org_calculate_src_uri() {
 	case ${CATEGORY} in
 		kde-frameworks)
 			_src_uri+="stable/frameworks/$(ver_cut 1-2)/"
-			case ${PN} in
-				countryflags | \
+			case ${KDE_ORG_NAME} in
 				kdelibs4support | \
 				kdesignerplugin | \
 				kdewebkit | \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6f9549ca8ae59e7c6d38d686ce356f04f91e9318
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 20:29:29 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:41:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6f9549ca

*.eclass: @ECLASS-VARIABLE renamed to @ECLASS_VARIABLE

Bug: https://bugs.gentoo.org/835396
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass   | 22 +++++++++++-----------
 eclass/ecm.eclass     | 28 ++++++++++++++--------------
 eclass/kde.org.eclass | 20 ++++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f0a59a2ac4..29f973794b 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -28,7 +28,7 @@ _CMAKE_ECLASS=1
 
 inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 
-# @ECLASS-VARIABLE: BUILD_DIR
+# @ECLASS_VARIABLE: BUILD_DIR
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Build directory where all cmake processed files should be generated.
@@ -38,13 +38,13 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 [[ ${EAPI} == 7 ]] && : ${BUILD_DIR:=${WORKDIR}/${P}_build}
 # EAPI-8: set inside _cmake_check_build_dir
 
-# @ECLASS-VARIABLE: CMAKE_BINARY
+# @ECLASS_VARIABLE: CMAKE_BINARY
 # @DESCRIPTION:
 # Eclass can use different cmake binary than the one provided in by system.
 : ${CMAKE_BINARY:=cmake}
 
 [[ ${EAPI} == 7 ]] && : ${CMAKE_BUILD_TYPE:=Gentoo}
-# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
+# @ECLASS_VARIABLE: CMAKE_BUILD_TYPE
 # @DESCRIPTION:
 # Set to override default CMAKE_BUILD_TYPE. Only useful for packages
 # known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
@@ -57,12 +57,12 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 # In EAPI 7, the default was non-standard build type of Gentoo.
 : ${CMAKE_BUILD_TYPE:=RelWithDebInfo}
 
-# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
+# @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set to enable in-source build.
 
-# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @ECLASS_VARIABLE: CMAKE_MAKEFILE_GENERATOR
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -71,7 +71,7 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 # The default is set to "ninja".
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
+# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -90,25 +90,25 @@ else
 	fi
 fi
 
-# @ECLASS-VARIABLE: CMAKE_USE_DIR
+# @ECLASS_VARIABLE: CMAKE_USE_DIR
 # @DESCRIPTION:
 # Sets the directory where we are working with cmake, for example when
 # application uses autotools and only one plugin needs to be done by cmake.
 # By default it uses current working directory (in EAPI-7: ${S}).
 
-# @ECLASS-VARIABLE: CMAKE_VERBOSE
+# @ECLASS_VARIABLE: CMAKE_VERBOSE
 # @DESCRIPTION:
 # Set to OFF to disable verbose messages during compilation
 : ${CMAKE_VERBOSE:=ON}
 
-# @ECLASS-VARIABLE: CMAKE_WARN_UNUSED_CLI
+# @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}
 
-# @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE
 # @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -116,7 +116,7 @@ fi
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
-# @ECLASS-VARIABLE: CMAKE_QA_SRC_DIR_READONLY
+# @ECLASS_VARIABLE: CMAKE_QA_SRC_DIR_READONLY
 # @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index a0ba4090ce..042280b77f 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -29,7 +29,7 @@ esac
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
 
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass manpage.
 # Here we redefine default value to be manual, if your package needs virtualx
@@ -38,7 +38,7 @@ _ECM_ECLASS=1
 
 inherit cmake flag-o-matic toolchain-funcs virtualx
 
-# @ECLASS-VARIABLE: ECM_NONGUI
+# @ECLASS_VARIABLE: ECM_NONGUI
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # By default, for all CATEGORIES except kde-frameworks, assume we are building
@@ -54,31 +54,31 @@ if [[ ${ECM_NONGUI} = false ]] ; then
 	inherit xdg
 fi
 
-# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
+# @ECLASS_VARIABLE: ECM_KDEINSTALLDIRS
 # @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}
 
-# @ECLASS-VARIABLE: ECM_DEBUG
+# @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}
 
-# @ECLASS-VARIABLE: ECM_DESIGNERPLUGIN
+# @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}
 
-# @ECLASS-VARIABLE: ECM_EXAMPLES
+# @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}
 
-# @ECLASS-VARIABLE: ECM_HANDBOOK
+# @ECLASS_VARIABLE: ECM_HANDBOOK
 # @DESCRIPTION:
 # Will accept "true", "false", "optional", "forceoptional". If set to "false",
 # do nothing.
@@ -92,20 +92,20 @@ fi
 # CMakeLists.txt in addition to the above.
 : ${ECM_HANDBOOK:=false}
 
-# @ECLASS-VARIABLE: ECM_HANDBOOK_DIR
+# @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}
 
-# @ECLASS-VARIABLE: ECM_PO_DIRS
+# @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"}
 
-# @ECLASS-VARIABLE: ECM_QTHELP
+# @ECLASS_VARIABLE: ECM_QTHELP
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Default value for all CATEGORIES except kde-frameworks is "false".
@@ -117,7 +117,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${ECM_QTHELP:=false}
 
-# @ECLASS-VARIABLE: ECM_TEST
+# @ECLASS_VARIABLE: ECM_TEST
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Will accept "true", "false", "optional", "forceoptional",
@@ -139,7 +139,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${ECM_TEST:=false}
 
-# @ECLASS-VARIABLE: KFMIN
+# @ECLASS_VARIABLE: KFMIN
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. Default value for kde-frameworks
@@ -151,7 +151,7 @@ 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.
@@ -255,7 +255,7 @@ DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
-# @ECLASS-VARIABLE: KDE_GCC_MINIMAL
+# @ECLASS_VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Minimum version of active GCC to require. This is checked in

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 2ddde6a865..e4bde18bfb 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -23,7 +23,7 @@ esac
 if [[ -z ${_KDE_ORG_ECLASS} ]]; then
 _KDE_ORG_ECLASS=1
 
-# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @ECLASS_VARIABLE: KDE_BUILD_TYPE
 # @DESCRIPTION:
 # If PV matches "*9999*", this is automatically set to "live".
 # Otherwise, this is automatically set to "release".
@@ -37,7 +37,7 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	inherit git-r3
 fi
 
-# @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
+# @ECLASS_VARIABLE: KDE_ORG_CATEGORIES
 # @INTERNAL
 # @DESCRIPTION:
 # Map of ${CATEGORY}=<upstream category> key-value pairs.
@@ -79,14 +79,14 @@ declare -A KDE_ORG_CATEGORIES=(
 )
 readonly KDE_ORG_CATEGORIES
 
-# @ECLASS-VARIABLE: KDE_ORG_CATEGORY
+# @ECLASS_VARIABLE: KDE_ORG_CATEGORY
 # @PRE_INHERIT
 # @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}}
 
-# @ECLASS-VARIABLE: KDE_ORG_COMMIT
+# @ECLASS_VARIABLE: KDE_ORG_COMMIT
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -94,14 +94,14 @@ readonly KDE_ORG_CATEGORIES
 # invent.kde.org repository identified by KDE_ORG_CATEGORY and KDE_ORG_NAME
 # at the desired COMMIT ID.
 
-# @ECLASS-VARIABLE: KDE_ORG_NAME
+# @ECLASS_VARIABLE: KDE_ORG_NAME
 # @PRE_INHERIT
 # @DESCRIPTION:
 # If unset, default value is set to ${PN}.
 # Name of the package as hosted on kde.org mirrors.
 : ${KDE_ORG_NAME:=$PN}
 
-# @ECLASS-VARIABLE: KDE_GEAR
+# @ECLASS_VARIABLE: KDE_GEAR
 # @PRE_INHERIT
 # @DESCRIPTION:
 # Mark package is being part of KDE Gear release schedule.
@@ -113,7 +113,7 @@ if [[ ${CATEGORY} == kde-apps ]]; then
 	KDE_GEAR=true
 fi
 
-# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
+# @ECLASS_VARIABLE: KDE_SELINUX_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
 # If set to "none", do nothing.
@@ -129,7 +129,7 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
-# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @ECLASS_VARIABLE: KDE_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION:
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
@@ -248,7 +248,7 @@ _kde.org_calculate_live_repo() {
 
 	SRC_URI=""
 
-	# @ECLASS-VARIABLE: EGIT_MIRROR
+	# @ECLASS_VARIABLE: EGIT_MIRROR
 	# @DESCRIPTION:
 	# This variable allows easy overriding of default kde mirror service
 	# (anongit) with anything else you might want to use.
@@ -266,7 +266,7 @@ _kde.org_calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
-	# @ECLASS-VARIABLE: EGIT_REPONAME
+	# @ECLASS_VARIABLE: EGIT_REPONAME
 	# @DESCRIPTION:
 	# This variable allows overriding of default repository
 	# name. Specify only if this differs from PN and KDE_ORG_NAME.

[gentoo-commits] proj/kde:master commit in: eclass/

[Sam James]

commit:     be4fe1ef01f1245eb9a8852bf101c4da0071e0e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 00:27:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 05:04:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=be4fe1ef

ecm.eclass: provides virtualx.eclass

As discussed with asturm.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 042280b77f..09916c44db 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -5,7 +5,7 @@
 # @MAINTAINER:
 # kde@gentoo.org
 # @SUPPORTED_EAPIS: 7 8
-# @PROVIDES: cmake
+# @PROVIDES: cmake virtualx
 # @BLURB: Support eclass for packages that use KDE Frameworks with ECM.
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0d63824f2f7b3ca2669f2d07ad729d86af88fea6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 11:05:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 12 11:05:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d63824f

kde.org.eclass: Mark KDE Gear 22.04.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 d2437de6cf..6c7702e0f7 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.94.0 kde-apps-22.04.1 )
+KDE_UNRELEASED=( kde-frameworks-5.94.0 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fdb822d708ff09fb65e76cce2ce7cdd2b76abec5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 10:56:24 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 14 10:56:24 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fdb822d7

kde.org.eclass: Mark KDE Frameworks 5.94.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 6c7702e0f7..e4bde18bfb 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.94.0 )
+KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0fa260e7bc3879145f60c9d920be64bdd763c307
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 13:32:00 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 13:32:00 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fa260e7

kde.org.eclass: Mark KDE Gear 22.04.2 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 e4bde18bfb..4a424dd2b0 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
+KDE_UNRELEASED=( kde-apps-22.04.2 )
 
 HOMEPAGE="https://kde.org/"
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     408b2af14216e691ad8e57664957d965c2a8ff0f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 10:40:16 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 13:13:09 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=408b2af1

cmake.eclass: Prepare for makeopts_jobs default inf change

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 29f973794b..59e5b60957 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -674,7 +674,8 @@ cmake_src_test() {
 
 	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
 
-	set -- ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"
+	set -- ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)" \
+		--test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"
 	echo "$@" >&2
 	if "$@" ; then
 		einfo "Tests succeeded."

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b51187f38365d3a658c10b84e9c65d8bfbe67bff
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 13:49:23 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 13:13:21 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b51187f3

kde.org.eclass: Don't indent eclass documentation

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 4a424dd2b0..7eb6013d6d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -137,6 +137,16 @@ esac
 # a proper error message via pkg_nofetch.
 KDE_UNRELEASED=( kde-apps-22.04.2 )
 
+# @ECLASS_VARIABLE: EGIT_MIRROR
+# @DESCRIPTION:
+# This variable allows easy overriding of default kde mirror service
+# (anongit) with anything else you might want to use.
+
+# @ECLASS_VARIABLE: EGIT_REPONAME
+# @DESCRIPTION:
+# This variable allows overriding of default repository name.
+# Specify only if this differs from PN and KDE_ORG_NAME.
+
 HOMEPAGE="https://kde.org/"
 
 case ${CATEGORY} in
@@ -248,10 +258,6 @@ _kde.org_calculate_live_repo() {
 
 	SRC_URI=""
 
-	# @ECLASS_VARIABLE: EGIT_MIRROR
-	# @DESCRIPTION:
-	# This variable allows easy overriding of default kde mirror service
-	# (anongit) with anything else you might want to use.
 	EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}}
 
 	if [[ ${PV} == 5.??(.?)*.9999 && ${CATEGORY} == dev-qt ]]; then
@@ -266,10 +272,6 @@ _kde.org_calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
-	# @ECLASS_VARIABLE: EGIT_REPONAME
-	# @DESCRIPTION:
-	# This variable allows overriding of default repository
-	# name. Specify only if this differs from PN and KDE_ORG_NAME.
 	EGIT_REPO_URI="${EGIT_MIRROR}/${EGIT_REPONAME:=$KDE_ORG_NAME}.git"
 }
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     24ff4cd76e4b3f8f7343180ad14547d7f081e014
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 11:28:23 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 11:28:23 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=24ff4cd7

kde.org.eclass: Mark KDE Gear 22.04.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 5e99452a49..7a9765a353 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-apps-22.04.2 kde-plasma-5.25.0 )
+KDE_UNRELEASED=( kde-plasma-5.25.0 )
 
 # @ECLASS_VARIABLE: EGIT_MIRROR
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b695b17e20a71b6c7a3075a2ca1bae068a4b8753
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 19:37:54 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 19:37:54 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b695b17e

kde.org.eclass: Mark KDE Frameworks 5.95 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 339738a6c4..7a9765a353 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.25.0 kde-frameworks-5.95.0 kde-frameworks-5.95.0 )
+KDE_UNRELEASED=( kde-plasma-5.25.0 )
 
 # @ECLASS_VARIABLE: EGIT_MIRROR
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9533e961994092d3982a778b40296049dae0345e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 09:34:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 09:34:47 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9533e961

virtualdbus.eclass: @ECLASS-VARIABLE renamed to @ECLASS_VARIABLE

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/virtualdbus.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/virtualdbus.eclass b/eclass/virtualdbus.eclass
index 45918f33b6..fa567c7ab6 100644
--- a/eclass/virtualdbus.eclass
+++ b/eclass/virtualdbus.eclass
@@ -8,20 +8,20 @@
 #  kde@gentoo.org
 # @BLURB: This eclass can be used for packages that needs a working dbus session bus during test phase. UNTESTED SO FAR.
 
-# @ECLASS-VARIABLE: VIRTUALDBUS_REQUIRED
+# @ECLASS_VARIABLE: VIRTUALDBUS_REQUIRED
 # @DESCRIPTION:
 #  Is a dependency on dbus etc needed?
 #  Valid values are "always", "optional", and "manual".
 #  "tests" is a synonym for "optional".
 : ${VIRTUALDBUS_REQUIRED:=optional}
 
-# @ECLASS-VARIABLE: VIRTUALDBUS_USE
+# @ECLASS_VARIABLE: VIRTUALDBUS_USE
 # @DESCRIPTION:
 #  If VIRTUALDBUS_REQUIRED=optional, what USE flag should control
 #  the dependency?
 : ${VIRTUALDBUS_USE:=test}
 
-# @ECLASS-VARIABLE: VIRTUALDBUS_DEPEND
+# @ECLASS_VARIABLE: VIRTUALDBUS_DEPEND
 # @DESCRIPTION:
 #  Dep string available for use outside of eclass, in case a more
 #  complicated dep is needed.

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6edf81a0f924cfdb6ba13f370191b9e752d3f59d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 12:56:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 12:56:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6edf81a0

kde.org.eclass: Mark KDE Frameworks 5.96 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 6a3b0a9e17..b6d369237e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -135,7 +135,7 @@ esac
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-frameworks-5.96.0 )
+KDE_UNRELEASED=( )
 
 # @ECLASS_VARIABLE: EGIT_MIRROR
 # @DESCRIPTION:

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     19977e2a7e14052aae5d5d8e86e5426f8c9d97c7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 21:39:51 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 22:25:11 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=19977e2a

kde.org.eclass: Drop obsolete kdevelop SRC_URI quirk

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index b6d369237e..cade214918 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -232,10 +232,6 @@ _kde.org_calculate_src_uri() {
 			;;
 	esac
 
-	if [[ ${PN} == kdevelop* && ${PV} == 5.6.2 ]]; then
-		_src_uri+="stable/kdevelop/${PV}/src/"
-	fi
-
 	if [[ -n ${KDE_ORG_COMMIT} ]]; then
 		SRC_URI="https://invent.kde.org/${KDE_ORG_CATEGORY}/${KDE_ORG_NAME}/-/"
 		SRC_URI+="archive/${KDE_ORG_COMMIT}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}.tar.gz"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     dd461449713167cffb13b506fab9df2ab974adc4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 17:36:39 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 08:28:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd461449

frameworks.kde.org.eclass: Mark 5.97 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 63e6d83de4..876c05c9b6 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.97.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     07a039f1ca521bacc77ef4d82be81b77c8d5a61d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 21:20:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 21:37:13 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=07a039f1

gear.kde.org.eclass: Mark 22.08.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 13b9a89861..66c86b59fa 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.08.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     da1db8c25016738babb26299ff1e94ac37e84fdb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 11:39:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 12:44:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=da1db8c2

gear.kde.org.eclass: Mark 22.08.1 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 a43ad67b6b..66c86b59fa 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.08.1 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0112fd9023aff857c905ca13af83f10d244df518
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 10:28:19 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 13:22:21 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0112fd90

frameworks.kde.org.eclass: Mark 5.98.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 01382fe92c..876c05c9b6 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.98.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     1ee2c73aa8b5e0f2d951d3687b23824052673042
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 10:25:05 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 14:55:32 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ee2c73a

ecm.eclass: Workaround Portage depgraph shortcomings from revdeps' side

Bug: https://bugs.gentoo.org/836726
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5a5b94d349..4549fb6bf8 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -218,13 +218,32 @@ 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"
 		COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )"
 		BDEPEND+=" doc? (
 			>=app-doc/doxygen-1.8.13-r1
-			dev-qt/qthelp:${KFSLOT}
+			|| (
+				(
+					=dev-qt/qtcore-5.15.6*:5
+					=dev-qt/qtgui-5.15.6*:5
+					=dev-qt/qthelp-5.15.6*:5
+					=dev-qt/qtsql-5.15.6*:5
+					=dev-qt/qtwidgets-5.15.6*:5
+				)
+				(
+					=dev-qt/qtcore-5.15.5*:5
+					=dev-qt/qtgui-5.15.5*:5
+					=dev-qt/qthelp-5.15.5*:5
+					=dev-qt/qtsql-5.15.5*:5
+					=dev-qt/qtwidgets-5.15.5*:5
+				)
+			)
 		)"
 		;;
 	false) ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     70409b54aad5815075dad6a1926807baa6b663fa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 21:04:07 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 21:19:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70409b54

ecm.eclass: Switch to pcre2grep, add dev-libs/libpcre2 to BDEPEND

The dependency is basically free since dev-qt/qtcore:5 or dev-qt/qtbase:6
already depend on dev-libs/libpcre2.

Bug: https://bugs.gentoo.org/872068
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 4549fb6bf8..96aedf08d3 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -266,7 +266,10 @@ case ${ECM_TEST} in
 		;;
 esac
 
-BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}"
+BDEPEND+="
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}
+	dev-libs/libpcre2:*
+"
 RDEPEND+=" >=kde-frameworks/kf-env-4"
 COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
 
@@ -344,10 +347,10 @@ _ecm_punt_kfqt_module() {
 	[[ ! -e "CMakeLists.txt" ]] && return
 
 	# FIXME: dep=WebKit will result in 'Widgets' over 'WebKitWidgets' (no regression)
-	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \
+	pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \
 		CMakeLists.txt > "${T}/bogus${dep}"
 
-	# pcregrep returns non-zero on no matches/error
+	# pcre2grep returns non-zero on no matches/error
 	[[ $? -ne 0 ]] && return
 
 	local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1)
@@ -405,10 +408,10 @@ ecm_punt_bogus_dep() {
 			-i CMakeLists.txt || die
 		return
 	else
-		pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+		pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 	fi
 
-	# pcregrep returns non-zero on no matches/error
+	# pcre2grep returns non-zero on no matches/error
 	if [[ $? -ne 0 ]] ; then
 		return
 	fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     adc3212ef7172df09f4695b955b8e2af2fa9be9f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 18:07:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 08:11:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=adc3212e

frameworks.kde.org.eclass: Mark 5.99.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 0f7c13bf31..876c05c9b6 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.99.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bb102e0939cd07595e07e76ac0fd93b112ae4c5f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 12:35:42 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 12:37:08 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb102e09

plasma.kde.org.eclass: Mark 5.26.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 e97b341b80..b0aad867ec 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.26.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Sam James]

commit:     086560a10b2f0b69559708f337868db7c091f7f2
Author:     Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Wed Aug 24 02:16:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 20:34:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=086560a1

cmake.eclass: add CMAKE_SKIP_TESTS

Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/27052
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/cmake.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 59e5b60957..98538f783a 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -124,6 +124,12 @@ fi
 # read-only. This is a user flag and should under _no circumstances_ be set in
 # 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.
+
 [[ ${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"
@@ -673,6 +679,7 @@ cmake_src_test() {
 	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
 
 	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+	[[ -n ${CMAKE_SKIP_TESTS} ]] && myctestargs+=( -E '('$( IFS='|'; echo "${CMAKE_SKIP_TESTS[*]}")')'  )
 
 	set -- ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)" \
 		--test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     b3f7153b98097876421773ec8139b89512598f0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 18:44:07 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:44:07 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b3f7153b

kde.org.eclass: With KDE_ORG_COMMIT, fetch from mirror://gentoo first

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index efc6f0a3ea..a39e205d0e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -167,9 +167,11 @@ case ${KDE_BUILD_TYPE} in
 		;;
 	*)
 		if [[ -n ${KDE_ORG_COMMIT} ]]; then
-			SRC_URI="https://invent.kde.org/${KDE_ORG_CATEGORY}/${KDE_ORG_NAME}/-/"
+			_KDE_ORG_TARFILE="${KDE_ORG_NAME}-${PV}-${KDE_ORG_COMMIT:0:8}.tar.gz"
+			SRC_URI="mirror://gentoo/${_KDE_ORG_TARFILE}"
+			SRC_URI+=" https://invent.kde.org/${KDE_ORG_CATEGORY}/${KDE_ORG_NAME}/-/"
 			SRC_URI+="archive/${KDE_ORG_COMMIT}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}.tar.gz"
-			SRC_URI+=" -> ${KDE_ORG_NAME}-${PV}-${KDE_ORG_COMMIT:0:8}.tar.gz"
+			SRC_URI+=" -> ${_KDE_ORG_TARFILE}"
 		fi
 		[[ ${KDE_ORG_UNRELEASED} == true ]] && RESTRICT+=" fetch"
 		debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d6b5e72fc0f26014e36b8d1be87dd383aa5d74c0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 19:47:56 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 19:47:56 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6b5e72f

ecm.eclass: Drop obsolete Qt 5.15.5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index d95a60e5b8..61d41d43ee 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -228,21 +228,12 @@ case ${ECM_QTHELP} in
 		COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )"
 		BDEPEND+=" doc? (
 			>=app-doc/doxygen-1.8.13-r1
-			|| (
-				(
-					=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
-				)
-				(
-					=dev-qt/qtcore-5.15.5*:5
-					=dev-qt/qtgui-5.15.5*:5
-					=dev-qt/qthelp-5.15.5*:5
-					=dev-qt/qtsql-5.15.5*:5
-					=dev-qt/qtwidgets-5.15.5*: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
 			)
 		)"
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fc4888a6f4eed9d83d2c30823f5be0072d26b8e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 01:41:25 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 15:50:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc4888a6

cmake.eclass: comment typo fix

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index a50a8bf7f8..d52ea32d93 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -360,7 +360,7 @@ cmake_src_prepare() {
 
 	default_src_prepare
 
-	# check if CMakeLists.txt exist and if no then die
+	# check if CMakeLists.txt exists and if not then die
 	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
 		eerror "Unable to locate CMakeLists.txt under:"
 		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cda3419752edab5d177b2e740df8731f363fbf72
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 01:39:38 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 15:50:43 2022 +0000
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 <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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) ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cafeb032b276db836c7ca1b53c05f6d9748d1bbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 17:57:31 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 21:24:24 2022 +0000
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 <asturm <AT> 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=9999
+fi
+SLOT=${_SLOT}/${_SUBSLOT}
+unset _SLOT _SUBSLOT
 
 # @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
 # @INTERNAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     cbe952b4c0118d5d180810e3c16031f895f06428
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 18:50:30 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 21:24:24 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbe952b4

ecm.eclass: Initial support for Qt6-based consumers

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     b9789e26a686553a61a2a6e6b7b050e973f2defe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 23:34:27 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 23:35:32 2022 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     36e93c4b391449c27dfe3974ff26f057ca5b3c9e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 23:33:01 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 23:35:26 2022 +0000
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) <gentoo <AT> chuso.net>
Bug: https://bugs.gentoo.org/887235
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     05676f41c8ad85cb5c3fe14a2300d9ec561af8f6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 10:22:14 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 10:22:14 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=05676f41

kde.org.eclass: Drop EAPI-7 support

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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:
 # kde@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/

[Andreas Sturmlechner]

commit:     5ecdb90c0fe91d0724bb5947f9f16b81f41f23b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 10:21:04 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 10:21:04 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ecdb90c

ecm.eclass: Drop EAPI-7 support

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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:
 # kde@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/

[Andreas Sturmlechner]

commit:     7c3f269a9edc5b9ee2f4175175cf4c8c040b60a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 09:11:17 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 09:36:16 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     7d6756c8422726fb75d2bdca762975e06561c54b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 22:10:49 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 17:00:35 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     023b89d012d726e4fa9de9404e8999979d0485c5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 08:59:50 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 11:03:44 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     a431adae9763bde892fa3d4d0bb5122bb4d1dcdd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 11:21:20 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:21:20 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     bc0bd12be73d1d04b825eb2209f14cf943bb8369
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 10:51:10 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 10:51:10 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     9204fa7c2d2d8cd3cce0a7d1ee3f67bb79fded4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 09:59:20 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 10:30:57 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     72c78dbe03c32ff2318e0f3f031d8d377913b3ec
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 12:58:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 12:59:46 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     d501904a3990f07c2cbc759cd80fe5b7060d0cd3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 12:53:10 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 12:53:10 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d501904a

frameworks.kde.org.eclass: Mark 5.104 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     9d608eac695da285af3234855fd13e1585d49140
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:40:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 08:40:12 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     c0dd647e38e739db4e4fa184f739e747892a915a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 18:28:52 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 20:55:11 2023 +0000
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 <floppym <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     3302a8cd9758d7496e703401d13fc65b9fbdfba3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 14:46:01 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 14:47:18 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3302a8cd

plasma.org.eclass: Mark 5.27.3 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     f5d4c32b3895553e040dc0e4a195e3fe4f5bd300
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 17:22:45 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 17:22:45 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     282dbd873deafc6f3c956294ba741e080dac8ea6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 00:23:26 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 18:54:40 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     03bf9f353b7014ff61ed61b381ab517b73a69608
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Apr  9 18:43:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:31:21 2023 +0000
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 <orbea <AT> riseup.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     147f7e85a9722d6eb67a888210b03767b5a75f7f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 04:06:11 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:31:21 2023 +0000
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 <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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:
 # kde@gentoo.org
+# base-system@gentoo.org
 # @AUTHOR:
 # Tomáš Chvátal <scarabeus@gentoo.org>
 # Maciej Mrozowski <reavertm@gentoo.org>

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9e36d762d679b8ce229fb15d8131234e0d3ec8f2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 04:04:27 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:31:21 2023 +0000
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 <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     fa01350086b8d254a03250c6ffab5f2ed4de93b3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 23:19:46 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:31:21 2023 +0000
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 <chewi <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     dfa1acfc797304d73d4014b0c2df7e849878c075
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 22:04:31 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:31:21 2023 +0000
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 <soap <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     cd8ca2ea4bc92301dae4ce7df44fbc243cacfc4e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:39:25 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:11:00 2023 +0000
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 <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     b47c6e219fe71ca3022f33e0cec4dfa59623f9cc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:39:40 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:11:00 2023 +0000
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 <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     cc1bdcd022bdcd319180469ff031987a23c3f3ef
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:39:58 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:11:00 2023 +0000
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 <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     a32a7a70e9120a1f14d51e4f2795b02ff9fa4c76
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:39:30 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:11:00 2023 +0000
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 <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     e7a6bf0add17c5ca8faad1c1577a45f7017a5960
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 17:53:26 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 19:13:14 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     78d54f084506a9a53dea8a8af10280165f385f0d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 13:20:59 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 13:20:59 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     67c3e2d94b37c393f635bb64a86e646272531160
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 13:38:30 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 13:38:30 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     0be5c637065b93b19083172cccdec2f574594e50
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 16:34:15 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 16:34:15 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     8d369f479b1e2a39184f7e0510369f5802afa43d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 16:30:57 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 13 16:30:57 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     0dcbe478843b99daf634f28cbf9395eef408ba79
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 15:48:46 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 15:54:49 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dcbe478

frameworks.kde.org.eclass: Fixup for KF6 support

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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=9999
+fi
 if [[ ${PV/.*} == 5 ]]; then
 	_SLOT=5
-	[[ ${KDE_BUILD_TYPE} == live ]] && _SUBSLOT=9999
 fi
 SLOT=${_SLOT}/${_SUBSLOT}
 unset _SLOT _SUBSLOT
@@ -59,7 +62,9 @@ _KDE_SRC_URI="mirror://kde/"
 
 case ${KDE_BUILD_TYPE} in
 	live)
-		[[ ${PV} == 5.9999 ]] && EGIT_BRANCH="kf5"
+		if [[ ${PV} == 5.9999 ]]; then
+			EGIT_BRANCH="kf5"
+		fi
 		;;
 	*)
 		if [[ -z ${KDE_ORG_COMMIT} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     de26dfceff864a2ad343531f3683961042dea398
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 20:28:51 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 20:28:51 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     5bd2c28df8f44f5515fd621919568cb6ab5b5e83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 20:07:35 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 20:07:35 2023 +0000
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 <asturm <AT> 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: <USE flag> <package name>
 # @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<related_CMake_variable>=\"\$(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/

[Andreas Sturmlechner]

commit:     9b644d5ba0ce49494d254f4cec010e6a4614677a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 20:48:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 20:48:12 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     e4640674ee8579dfa2c330c94cc737a1ec41de37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 20:18:37 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 20 20:18:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4640674

ecm.eclass: Need to exclude KDE Frameworks 5.9999 from KFMIN>=5.240 check

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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.9999 ]] && $(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/

[Andreas Sturmlechner]

commit:     af9f38d884d0a009f06774f68c7cf9b3498c12d3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 20:04:48 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 27 06:52:08 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     45ce71a878d28734231749a28b3765af9e043192
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 10:46:19 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 10:46:19 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     31f39c1644bd9b5bfebded1d8988b902f0f20239
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 09:42:51 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 09:42:51 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     31433838eaf10631f74a41f8785c3dbaa6d2fd03
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 07:11:27 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 07:11:27 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=31433838

kde.org.eclass: Fix Qt5PatchCollection matching to 5.15.*.9999

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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.??.?.9999 && ${CATEGORY} == dev-qt ]]; then
+		if [[ ${PV} == 5.15.*.9999 && ${CATEGORY} == dev-qt ]]; then
 			EGIT_BRANCH="kde/$(ver_cut 1-2)"
 		fi
 		;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     df307a4cda55eaa63949f6d8354babb7a93bda6d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 20:33:30 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 20:34:08 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     ef4c082a5c44e00177298608bae6e2e00b65108f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 10:00:54 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 16:03:04 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     ae61a433c4c25dd5d3dcb58d9367d523c7c1b6d3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 15:15:23 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 15:15:23 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     0ad1e01237a766fdb531d735bfbec1cc0fc20793
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 11:51:58 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 11:51:58 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     ddcd6609520b70fac53605dd598ac1cd735a2f02
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 10:20:32 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 10:20:32 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     2d2bdb49ec5b099004dbd939e2709b198a678d84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  9 11:09:20 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 16:39:26 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     065572bdc5985f3a481348fb69e0780ee2f7d7ba
Author:     Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Wed Apr 19 21:54:01 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 15:03:26 2023 +0000
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 <rrangel <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/30658
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     23f1fc2f04eec136c833d983cbbc9233ac8bf30d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 06:50:27 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 15:03:36 2023 +0000
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 <mgorny <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     2b32cb0d67222da271e2ae25b19479f0374648da
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 09:54:06 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 15:03:30 2023 +0000
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 <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     96d078feec54ab045cc0773dbf3cdfb7d683cc93
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 15:13:25 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 15:03:33 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=96d078fe

cmake.eclass: Support CMAKE_VERBOSE with ninja

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     fa7eb5b9389c9767e78794ad63966cdd4be052c8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 11:18:44 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 15:03:38 2023 +0000
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 <ionen <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     a1b3e9e0835befcb782d9744b1086e5cb4eba412
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  9 12:33:26 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 12:33:26 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     749716069dc59f5553162db86337153e02d531d5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 09:16:33 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 09:16:33 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     91efc16e90cf9a7f70029f7476dc17f3c63f0e8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 10:10:15 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 10:18:03 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     306d1be4b48b586196f00210f5f46f0c496eeae9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 22:56:55 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 23:25:47 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     45e6c18e9550643b5dfe337f06a46910290cf0c4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 12:28:03 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 23:25:47 2023 +0000
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 <asturm <AT> 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.9999 ]] && $(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 ]] && _ecm_strip_handbook_translations
 	fi
 
@@ -551,12 +555,12 @@ ecm_src_configure() {
 		cmakeargs+=( -DBUILD_TESTING=OFF )
 
 		if [[ ${ECM_TEST} = optional ]] ; then
-			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON )
+			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON )
 		fi
 	fi
 
 	if [[ ${ECM_HANDBOOK} = optional ]] ; then
-		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=$(usex !handbook) )
+		cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF${_KFSLOT}DocTools=$(usex !handbook) )
 	fi
 
 	if in_iuse designer && [[ ${ECM_DESIGNERPLUGIN} = true ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8265ebedad8ae06f1889f03ed258d9322055fa58
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 21:04:07 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 23:25:47 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     3988b47f84f5051001afbfa6b30b5c97c4fd72ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 21:33:29 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 23:25:47 2023 +0000
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.9999 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 <asturm <AT> 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=9999
+SLOT=6
+if [[ ${PV} == 5.9999 ]] || 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}/9999
+	fi
 fi
-SLOT=${_SLOT}/${_SUBSLOT}
-unset _SLOT _SUBSLOT
 
 # @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
 # @INTERNAL

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fcf516962acde10c69640181257600254f3dd752
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 20:26:28 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 20:27:20 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     4933c28677189614a6025a68939207ad78b5e014
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 20:23:17 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 20:27:20 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     835a9b5f6cc189360446a80c9aa9b10e9aae74f7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  7 08:21:38 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 09:04:55 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     bb7b1a3a31d8a4bb5de8ab4644dfb566b954fb58
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 11:16:39 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 11:20:20 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     0b622a1ee682356b853a7a7a84fb08e865766fc0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 11:04:56 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 11:04:56 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     92b1152408d6d0b522b5bd52e66a2e6b9c17e433
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 13:27:03 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 13:27:03 2023 +0000
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 <asturm <AT> 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 | \
+		picmi | \
+		spectacle | \
+		svgpart | \
+		sweeper | \
+		thumbnailers | \
+		yakuake)
+			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
+		*) ;;
+	esac
+fi
 
 fi

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0064b9b7eaa908237e22b2bffd64f1c0ed91c5be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 08:21:40 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 09:09:19 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     38ce27e85da2f2e2dbb50ab4ee6a5fc9736a4963
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 09:59:00 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 09:59:00 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     c69d9104ae42916fbeedcd0ba4b6fa00dcb21740
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 09:07:18 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 09:23:28 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     ac80a202e7cda39783fc6309d3d0ed5c70f6a15e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 22:12:19 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 22:16:07 2023 +0000
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 <asturm <AT> 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 | \
 		markdownpart | \
+		mbox-importer | \
+		merkuro | \
+		messagelib | \
 		okular | \
 		palapeli | \
+		parley | \
 		partitionmanager | \
 		picmi | \
+		pim-data-exporter | \
+		pim-sieve-editor | \
+		pimcommon | \
 		spectacle | \
 		svgpart | \
 		sweeper | \
 		thumbnailers | \
-		yakuake)
+		yakuake | \
+		zanshin)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
 		*) ;;
 	esac

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     683d61429e541b13c2f049a6c6ca410089227439
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 16:26:27 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 16:27:30 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=683d6142

ecm.eclass: Drop dev-qt/qtbase:6[test]

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     5047c29ed3890445e94018b66b9bbb2a089aeb38
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 19:10:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 19:15:55 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     aaca17c375360c0e316756798ede5302e3ddcdfe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 20:08:30 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 15:59:00 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     0b956101ca473b9547de02d9f67eb397d7847aee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 21:12:10 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 21:12:38 2023 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     b279c4b7ebcf150673919f8d1b84565a2662e358
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 22:14:53 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 22:15:13 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     6717d6e786e7db9121eece74dfb3cfebfaed592d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 22:17:05 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 22:18:31 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     e62825845c816d8b60202ee38cccca8c72a49d86
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 12:02:09 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 12:02:09 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     f5272ada70e921c24dcf0b8bf15f80fb6084f4f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 13:19:07 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 13:24:39 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     7b9da6e6a6e522ad81ee3bf0dfe3eebeef038e9e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 18:13:33 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 18:13:33 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     82519bb7f595cbb57db022b10cd01d40555c2690
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 11:08:51 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 13:16:37 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     ac79a132a17b805b76e3a9ebd6de9e697974edcc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 14:39:51 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 14:39:51 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     2b4440011b8ae718e744d86bcb1f076c9c4c8f1b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 10:16:16 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 10:16:16 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     37582f536b93020085b3a2f0cebcf32785a93570
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 18:44:57 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 18:44:57 2024 +0000
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 <asturm <AT> 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.9999 ]]; then
-		EGIT_BRANCH="master" # drop after 24.02 branching
-	elif [[ ${PV} == ??.??.49.9999 ]]; then
+	if [[ ${PV} == ??.??.49.9999 ]]; then
 		EGIT_BRANCH="release/$(ver_cut 1-2)"
 	fi
 elif [[ -z ${KDE_ORG_COMMIT} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Sam James]

commit:     8ff1c59b040a3690e371eb3de70acaf08a800bc1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 16:38:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 16:38:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ff1c59b

ecm.eclass: app-doc/doxygen -> app-text/doxygen

Signed-off-by: Sam James <sam <AT> 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/

[Sam James]

commit:     7ae4cf69ce25adda1593cbb8f5538821578cd10b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 18:00:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 18:00:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ae4cf69

cmake.eclass: sys-devel/make -> dev-build/make

Signed-off-by: Sam James <sam <AT> 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/

[Sam James]

commit:     4d4d7cbdafa4534f4520d59a793991f083e24c78
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 19:38:42 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 19:38:42 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d4d7cbd

cmake.eclass: dev-util/cmake -> dev-build/cmake

Signed-off-by: Sam James <sam <AT> 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/

[Andreas Sturmlechner]

commit:     d33ca1df91642b32c3c95448d5f55b58ed725c4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 19:08:59 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 19:08:59 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     91c7179d5c426ef1ab8f074b468a23fdbf1335b7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 08:50:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 09:08:51 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     6fe16889688517aef3a336a20b948a875a217ccd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 13:54:59 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 11:02:40 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     e16f4dfd68afb37f078809d4dbafe62e28b2b7ab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 13:43:10 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 11:02:28 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     b87a7f8ad90acfb8bf989825d2d729ee77934458
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 13:42:58 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 11:02:21 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     3c251ef703e3be667159dde18465e4b41a78ec2f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 13:56:20 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 11:04:02 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     1f01b34afd6be7947d0a7ac99d62218f695f2e40
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 13:42:41 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 11:02:33 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     5f6c4cde43b6cfa1d714b56faa852c94e3f77dfe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 11:35:46 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 11:36:20 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     2f50a35ce082eee0a997f38e8212f602eec062f9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 15:14:25 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 15:25:53 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     76ad139fa613a3eb2a946c922d8fee43db9e1630
Author:     Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Thu Feb  1 03:48:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 19:47:59 2024 +0000
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 <nic <AT> boet.cc>
Closes: https://github.com/gentoo/gentoo/pull/35125
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     30ae9595f7e1f3c434a196fe0d929e546d4dea89
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 14:17:19 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 05:05:14 2024 +0000
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 <asturm <AT> 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"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
@@ -552,8 +560,8 @@ ecm_src_configure() {
 	if in_iuse test && ! use test ; then
 		cmakeargs+=( -DBUILD_TESTING=OFF )
 
-		if [[ ${ECM_TEST} = optional ]] ; then
-			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON )
+		if [[ ${_KFSLOT} = 5 && ${ECM_TEST} = optional ]] ; then
+			cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON )
 		fi
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     533c79980981f12937f2a8b4d94a8255f792e318
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 21:04:42 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 21:05:26 2024 +0000
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 <asturm <AT> 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/

[Andreas Sturmlechner]

commit:     4f10da4ac86b8e8cdc19c9489bc51e83ef385bf9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 04:42:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 19:15:45 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f10da4a

gear.kde.org.eclass: Split future SLOT=5 blocklist into 24.08/"24.11"

More applications were officially ported in git master already.

Update SLOT=5 24.08 blocklist:
- kde-apps/kdeedu-data
- kde-apps/poxml

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/gear.kde.org.eclass | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 8c84fbfc29..4a5b26d64c 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -268,11 +268,21 @@ fi
 if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
-		kalzium | \
 		kdeedu-data | \
-		kdesdk-thumbnailers | \
 		kimagemapeditor | \
 		kmplot | \
+		poxml)
+			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
+		*) ;;
+	esac
+fi
+
+# list of applications ported to KF6 post-24.08 in SLOT=6 having to block SLOT=5
+# (option to build with KF6 in master, but default remains KF5)
+if $(ver_test -gt 24.10.75); then
+	case ${PN} in
+		kalzium | \
+		kdesdk-thumbnailers | \
 		kompare | \
 		krdc | \
 		libkomparediff2 | \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9037f9ab50c6dfdd88b44976b34b687877dcdbc6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 18:32:31 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 18:53:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9037f9ab

frameworks.kde.org.eclass: Mark 5.116 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 b070354823..53811e3399 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.116.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Sam James]

commit:     133086e12e7efbc4be158867eb9219b0a2fee33c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 05:49:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 25 05:49:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=133086e1

plasma.kde.org.eclass: support 6.x betas

Signed-off-by: Sam James <sam <AT> 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 491f1fcecc..1a626de37b 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -63,7 +63,7 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	fi
 elif [[ -z ${KDE_ORG_COMMIT} ]]; then
 	case ${PV} in
-		5.??.[6-9][05]* )
+		5.??.[6-9][05]* | 6.?.[6-9][05]* )
 			_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
 			RESTRICT+=" mirror"
 			;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2a443177a32dad00ac854956f1b78f28d5be7a34
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 12:40:38 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:41:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a443177

kde.org.eclass: Add games-puzzle/ to recognised KDE_ORG_CATEGORIES

Closes: https://bugs.gentoo.org/933195
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde.org.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 6afde204d2..9be501ce9e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -55,6 +55,7 @@ declare -A KDE_ORG_CATEGORIES=(
 	[games-board]=games
 	[games-kids]=education
 	[games-mud]=games
+	[games-puzzle]=games
 	[kde-frameworks]=frameworks
 	[kde-plasma]=plasma
 	[mail-client]=pim

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     26599340669a5ffe29246587b3c54e6ada90c39e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 16:26:08 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 19:33:08 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=26599340

gear.kde.org.eclass: Mark 24.05.1 unreleased

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 b52f3e5e5a..741a173000 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=( 24.05.1 )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c6adb6d459e7177b86d78c99c6b7d67fbdbac862
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 20:36:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 15:19:07 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6adb6d4

ecm.eclass: Pass -DKDE_INSTALL_LIBEXECDIR="${EPREFIX}/usr/libexec"

But only in KF6-based packages as those are still masked, for getting
away with changing installed files.

Bug: https://bugs.gentoo.org/928345
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 7f1b777a45..5864c2764f 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -584,6 +584,12 @@ ecm_src_configure() {
 			# move handbook outside of doc dir, bug 667138
 			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help"
 		)
+
+		# bug 928345
+		# TODO: Eventually it should be put to upstream as to why LIBEXECDIR
+		# in KDEInstallDirsCommon.cmake is set to EXECROOTDIR/LIBDIR/libexec
+		[[ ${_KFSLOT} == 6 ]] && \
+			cmakeargs+=( -DKDE_INSTALL_LIBEXECDIR="${EPREFIX}/usr/libexec" )
 	fi
 
 	# allow the ebuild to override what we set here

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     2baa4847c73784c83c326849bb7f8b475201555b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 17:32:27 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 12:16:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2baa4847

ecm.eclass: For _KFSLOT=6, RDEPEND on >=kde-frameworks/kf-env-6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 5864c2764f..e74f68cf3d 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -277,14 +277,15 @@ BDEPEND+="
 	dev-libs/libpcre2:*
 	>=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
+	RDEPEND+=" >=kde-frameworks/kf-env-6"
 	COMMONDEPEND+=" dev-qt/qtbase:${_KFSLOT}"
 else
+	RDEPEND+=" >=kde-frameworks/kf-env-4"
 	COMMONDEPEND+=" dev-qt/qtcore:${_KFSLOT}"
 	if [[ ${ECM_TEST} != false ]]; then
 		DEPEND+=" test? ( dev-qt/qttest:5 )"

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     63b5ef558d91d9387b5b8396375351741ea87ed1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 15:59:38 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 15:59:38 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=63b5ef55

ecm.eclass: Fix _ecm_check_gcc_version

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index e74f68cf3d..87a2529603 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -307,7 +307,7 @@ unset COMMONDEPEND
 # @DESCRIPTION:
 # Determine if the current GCC version is acceptable, otherwise die.
 _ecm_check_gcc_version() {
-	if [[ ${MERGE_TYPE} != binary && -v ${KDE_GCC_MINIMAL} ]] && tc-is-gcc; then
+	if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then
 
 		local version=$(gcc-version)
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6070a4a6013da345d3a37f4560ee68de1befd18b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 20:53:44 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 16:48:44 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6070a4a6

cmake.eclass: Set CMAKE_TLS_VERIFY=ON

Bug: https://bugs.gentoo.org/927160
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 5e5418bc49..692cbde20c 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -460,6 +460,7 @@ cmake_src_configure() {
 		set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "")
 		set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "")
 		set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "")
+		set(CMAKE_TLS_VERIFY ON CACHE BOOL "")
 	_EOF_
 
 	if [[ -n ${_ECM_ECLASS} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     4ec823b93a188a56cf5adaacd92a39c224b1fa08
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 20:59:33 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 16:48:44 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ec823b9

cmake.eclass: Set CMAKE_COMPILE_WARNING_AS_ERROR=OFF

Bug: https://bugs.gentoo.org/926121
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 692cbde20c..9a0311eab2 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -461,6 +461,7 @@ cmake_src_configure() {
 		set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "")
 		set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "")
 		set(CMAKE_TLS_VERIFY ON CACHE BOOL "")
+		set(CMAKE_COMPILE_WARNING_AS_ERROR OFF CACHE BOOL "")
 	_EOF_
 
 	if [[ -n ${_ECM_ECLASS} ]]; then

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     d17c8cf5447592d61ff1aa598f2a481d6fc3b0db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  4 15:24:01 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 15:24:01 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d17c8cf5

gear.kde.org.eclass: Mark 24.05.2 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 9c28bcc5b0..b52f3e5e5a 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.05.2 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f20956fdcda2938d2ca79d16287757a4605e13a8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 12:25:13 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 12:26:11 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f20956fd

gear.kde.org.eclass: Fix kde-apps/kde-dev-scripts SLOT=5 blocker

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 3173d4110a..b488f62dc5 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -268,7 +268,7 @@ fi
 if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
-		kde-dev-utils | \
+		kde-dev-scripts | \
 		kdevelop | \
 		kdevelop-php | \
 		kdevelop-python | \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c5868cb02d99ec791e0064a81ef5bda62500e158
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 12:51:48 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 13:10:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5868cb0

gear.kde.org.eclass: Move kdesdk-thumbnailers to 24.08 SLOT=5 blockers

Will build this as KF6-based in 24.08, since both at least Fedora and
ArchLinux do so too.

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 ea979d5c83..4666732394 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -269,6 +269,7 @@ if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
 		kde-dev-scripts | \
+		kdesdk-thumbnailers | \
 		kdevelop | \
 		kdevelop-php | \
 		kdevelop-python | \
@@ -291,7 +292,6 @@ fi
 if $(ver_test -gt 24.10.75); then
 	case ${PN} in
 		kalzium | \
-		kdesdk-thumbnailers | \
 		minuet | \
 		skanlite | \
 		step)

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8ad57a497f8fb552c1dcaab32ac93d73af17c70c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 13:09:17 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 13:10:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ad57a49

gear.kde.org.eclass: Move skanlite to 24.08 SLOT=5 blockers

Fedora and OpenSUSE TW build it as KF6-based in 24.05 already, so we can too.

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 4666732394..6e8704bb9e 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -281,7 +281,8 @@ if $(ver_test -gt 24.07.75); then
 		libkomparediff2 | \
 		lokalize | \
 		massif-visualizer | \
-		poxml)
+		poxml | \
+		skanlite)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
 		*) ;;
 	esac
@@ -293,7 +294,6 @@ if $(ver_test -gt 24.10.75); then
 	case ${PN} in
 		kalzium | \
 		minuet | \
-		skanlite | \
 		step)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
 		*) ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     03ead19ca18f1645ac6cef03ab562d7580c72767
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 20:18:36 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 20:18:47 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=03ead19c

cmake.eclass: If inherited from ecm.eclass, set ECM_DISABLE_GIT

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 4dfea4e34d..73e0adaf30 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -468,6 +468,7 @@ cmake_src_configure() {
 		cat >> ${common_config} <<- _EOF_ || die
 			set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")
 			set(ECM_DISABLE_APPSTREAMTEST ON CACHE BOOL "")
+			set(ECM_DISABLE_GIT ON CACHE BOOL "")
 		_EOF_
 	fi
 

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3bbd0d07bd0dbf98732f264838027e519f6a217a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 20:06:40 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 20:07:31 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bbd0d07

cmake.eclass: If inherited from ecm.eclass, set ECM_DISABLE_APPSTREAMTEST

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 9a0311eab2..4dfea4e34d 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -465,7 +465,10 @@ cmake_src_configure() {
 	_EOF_
 
 	if [[ -n ${_ECM_ECLASS} ]]; then
-		echo 'set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die
+		cat >> ${common_config} <<- _EOF_ || die
+			set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")
+			set(ECM_DISABLE_APPSTREAMTEST ON CACHE BOOL "")
+		_EOF_
 	fi
 
 	# See bug 689410

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     c715f7a87d835a5d7eb9204475e4e8360c6e8908
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 20:39:06 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 21:02:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c715f7a8

ecm.eclass: For kde.org projects, try to rename metainfo file real hard

- detect if we are inheriting kde.org.eclass
- detect if package name is not the same as upstream name (KDE_ORG_NAME)
- iterate through "${ED}"/usr/share/metainfo/
- if file contains KDE_ORG_NAME or similar, rename that to ${PN}${SLOT/0*/}
- otherwise, prepend "${PN}${SLOT/0*/}-" after ^org.kde.

Notably, this does not (yet?) trigger if a package ${PN} == ${KDE_ORG_NAME}
but different SLOTs. Should we just do that all the time?

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 87a2529603..a8b40c2b6e 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -649,6 +649,9 @@ ecm_src_test() {
 # Wrapper for cmake_src_install. Drops executable bit from .desktop files
 # installed inside /usr/share/applications. This is set by cmake when install()
 # is called in PROGRAM form, as seen in many kde.org projects.
+# In case kde.org.eclass is detected, in case KDE_ORG_NAME != PN, tries real
+# hard to detect, then rename, metainfo.xml appdata files to something unique
+# including SLOT if else than "0" (basically KDE_ORG_NAME -> PN+SLOT).
 ecm_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -664,6 +667,33 @@ ecm_src_install() {
 			fi
 		done
 	fi
+
+	mv_metainfo() {
+		if [[ -f ${1} ]]; then
+			mv -v ${1} ${1/${2}/${3}} || die
+		fi
+	}
+
+	if [[ -n ${_KDE_ORG_ECLASS} && -d "${ED}"/usr/share/metainfo/ ]]; then
+		if [[ ${KDE_ORG_NAME} != ${PN} ]]; then
+			local ecm_metainfo
+			pushd "${ED}"/usr/share/metainfo/ > /dev/null || die
+			for ecm_metainfo in find * -type f -iname "*metainfo.xml"; do
+				case ${ecm_metainfo} in
+					*${KDE_ORG_NAME}*)
+						mv_metainfo ${ecm_metainfo} ${KDE_ORG_NAME} ${PN}${SLOT/0*/}
+						;;
+					*${KDE_ORG_NAME/-/_}*)
+						mv_metainfo ${ecm_metainfo} ${KDE_ORG_NAME/-/_} ${PN}${SLOT/0*/}
+						;;
+					org.kde.*)
+						mv_metainfo ${ecm_metainfo} "org.kde." "org.kde.${PN}${SLOT/0*/}-"
+						;;
+				esac
+			done
+			popd > /dev/null || die
+		fi
+	fi
 }
 
 # @FUNCTION: ecm_pkg_preinst

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     e5731bb08ff4988ee4660338624d71eec826cfda
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 07:31:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 07:31:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5731bb0

gear.kde.org.eclass: Drop kdegraphics-mobipocket from SLOT 5 blocklist

SLOTs don't collide actually.

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 6e8704bb9e..bac458d5a3 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -132,7 +132,6 @@ if $(ver_test -gt 24.01.75); then
 		kde-dev-utils | \
 		kdebugsettings | \
 		kdeconnect | \
-		kdegraphics-mobipocket | \
 		kdenetwork-filesharing | \
 		kdenlive | \
 		kdepim-addons | \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     8002a040b05f9caa7e47b328c69702eaec0fa153
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 08:34:48 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 08:34:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8002a040

gear.kde.org.eclass: Drop thumbnailers from SLOT 5 blocklist

After it was morphed into a metapackage.

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 bac458d5a3..c37c1fa68f 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -242,7 +242,6 @@ if $(ver_test -gt 24.01.75); then
 		spectacle | \
 		svgpart | \
 		sweeper | \
-		thumbnailers | \
 		yakuake | \
 		zanshin)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     0cd30b7b32dea1edfdac685dee0c9a7cc5302387
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 23:06:06 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 20:53:49 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0cd30b7b

gear.kde.org.eclass: Drop obsolete SLOT 5 blockers

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 89fc846f52..727f1c4ed0 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -94,7 +94,6 @@ if $(ver_test -gt 24.01.75); then
 		dragon | \
 		elisa | \
 		eventviews | \
-		ffmpegthumbs | \
 		filelight | \
 		granatier | \
 		grantlee-editor | \
@@ -267,7 +266,6 @@ if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
 		kde-dev-scripts | \
-		kdesdk-thumbnailers | \
 		kdevelop | \
 		kdevelop-php | \
 		kdevelop-python | \

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     981406b7d11946988c47d4084b6b11af5ce27727
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 16:59:35 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 17:01:05 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=981406b7

ecm-common.eclass: Fix inverted logic in pkg_setup() re KFMIN

Closes: https://bugs.gentoo.org/938312
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm-common.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm-common.eclass b/eclass/ecm-common.eclass
index 460d702dea..63a23878c6 100644
--- a/eclass/ecm-common.eclass
+++ b/eclass/ecm-common.eclass
@@ -325,7 +325,7 @@ ecm-common-check_deps() {
 # preferring KF6.  The result is stored in _KFSLOT, which is then handed
 # to CMakeLists.txt as KFSLOT var for further use.
 ecm-common_pkg_setup() {
-	$(ver_test ${KFMIN} -lt 5.240) && return
+	$(ver_test ${KFMIN} -ge 5.240) && return
 
 	if has_version -b "kde-frameworks/ki18n:6" && {
 		! in_iuse handbook || {

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     15ae9d83694e073d09e68967a4940fe0ef16f063
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 22:29:07 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 22:36:06 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=15ae9d83

ecm-common.eclass: Add _ecm-common-check_deps to simplify pkg_setup()

Bug: https://bugs.gentoo.org/938507
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm-common.eclass | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/eclass/ecm-common.eclass b/eclass/ecm-common.eclass
index 63a23878c6..c0c2b4f7e6 100644
--- a/eclass/ecm-common.eclass
+++ b/eclass/ecm-common.eclass
@@ -309,6 +309,38 @@ _ecm-common_summary() {
 	_EOF_
 }
 
+# @FUNCTION: _ecm-common-check_deps
+# @INTERNAL
+# @DESCRIPTION:
+# Check existence of requested KF6 dependencies.
+_ecm-common-check_deps() {
+	local chk=0
+	case ${1} in
+		i18n)
+			if [[ ${ECM_I18N} ]]; then
+				chk=$(has_version -b "kde-frameworks/ki18n:6")
+			fi
+			;;
+		doctools)
+			if [[ ${ECM_HANDBOOK} ]] && in_iuse handbook; then
+				if use handbook; then
+					chk=$(has_version -b "kde-frameworks/kdoctools:6")
+				fi
+			fi
+			;;
+		kcmutils)
+			if [[ ${ECM_KCM_TARGETS} ]]; then
+				chk=$(has_version -b "kde-frameworks/kcmutils:6")
+			fi
+			;;
+		*)
+			eerror "Unknown value for _ecm-common-check_deps()"
+			die "Value ${1} is not supported"
+			;;
+	esac
+	return ${chk}
+}
+
 # @FUNCTION: ecm-common-check_deps
 # @DESCRIPTION:
 # Override this to add more KF6 has_version checks to pkg_setup(),
@@ -327,15 +359,8 @@ ecm-common-check_deps() {
 ecm-common_pkg_setup() {
 	$(ver_test ${KFMIN} -ge 5.240) && return
 
-	if has_version -b "kde-frameworks/ki18n:6" && {
-		! in_iuse handbook || {
-			in_iuse handbook && use handbook &&
-				has_version -b "kde-frameworks/kdoctools:6"
-			}
-		} && {
-			! [[ ${ECM_KCM_TARGETS} ]] ||
-				has_version -b "kde-frameworks/kcmutils:6"
-		} && ecm-common-check_deps
+	if _ecm-common-check_deps i18n && _ecm-common-check_deps doctools &&
+		_ecm-common-check_deps kcmutils && ecm-common-check_deps
 	then
 		_KFSLOT=6
 	else

[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     6e517d4f77a7b76931bc161db23800456f18cf1f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 03:22:22 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 03:22:22 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e517d4f

frameworks.kde.org.eclass: Mark 6.6.0 as released

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 c94bc0413c..53811e3399 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.6.0 )
+KDE_PV_UNRELEASED=( )
 
 inherit kde.org