[eclass] Version bump KDE SC 4.10.0

5 files changed, 43 insertions, 42 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index cf6fe53e93c2..ad64b7c6da2b 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.661 2013/02/04 18:39:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.662 2013/02/07 03:38:33 alexxy Exp $
+
+  07 Feb 2013; Alexey Shvetsov <alexxy@gentoo.org> kde4-base.eclass,
+  kde4-functions.eclass, kde4-meta.eclass, kde4-meta-pkg.eclass:
+  Version bump KDE SC 4.10.0
 
   04 Feb 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
   Add a variable to stop autoformatting when not desired, use '-e' option for
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 912e1d0e832b..19c08d31c7d7 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.122 2013/02/02 16:58:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.123 2013/02/07 03:38:33 alexxy Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -10,8 +10,8 @@
 # The kde4-base.eclass provides support for building KDE4 based ebuilds
 # and KDE4 applications.
 #
-# NOTE: KDE 4 ebuilds currently support EAPI "3".  This will be reviewed
-# over time as new EAPI versions are approved.
+# NOTE: KDE 4 ebuilds currently support EAPIs 3, 4, and 5.  This will be
+# reviewed over time as new EAPI versions are approved.
 
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:
@@ -378,15 +378,20 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
+# We always need the aqua useflag because otherwise we cannot = refer to it inside
+# add_kdebase_dep. This was always kind of a bug, but came to light with EAPI=5
+# (where referring to a use flag not in IUSE masks the ebuild).
+# The only alternative would be to prohibit using add_kdebase_dep if KDE_REQUIRED=never
+IUSE+=" aqua"
+
 case ${KDE_REQUIRED} in
 	always)
-		IUSE+=" aqua"
 		[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" ${kdecommondepend}"
 		[[ -n ${kdedepend} ]] && DEPEND+=" ${kdedepend}"
 		[[ -n ${kderdepend} ]] && RDEPEND+=" ${kderdepend}"
 		;;
 	optional)
-		IUSE+=" aqua kde"
+		IUSE+=" kde"
 		[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" kde? ( ${kdecommondepend} )"
 		[[ -n ${kdedepend} ]] && DEPEND+=" kde? ( ${kdedepend} )"
 		[[ -n ${kderdepend} ]] && RDEPEND+=" kde? ( ${kderdepend} )"
@@ -435,10 +440,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.[89].8[05] | 4.[89].9[0235678])
+				4.?.[6-9]? | 4.??.[6-9]?)
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-				4.[1234567].[12345])
+				4.[1-7].[12345])
 					# Stable KDE SC with old .bz2 support
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 				*)
@@ -448,7 +453,7 @@ _calculate_src_uri() {
 			;;
 		kdevelop|kdevelop-php*|kdevplatform)
 			case ${KDEVELOP_VERSION} in
-				4.[12].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
+				4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
 				*) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
 			esac
 			;;
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index a3f84289a0b7..ce006fc49dd1 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.62 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.63 2013/02/07 03:38:33 alexxy Exp $
 
 inherit versionator
 
@@ -54,28 +54,22 @@ export KDE_BUILD_TYPE
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	case "${KMNAME}" in
 		kdebase-workspace)
-			KDE_SCM="git"
 			EGIT_REPONAME=${EGIT_REPONAME:=kde-workspace}
 		;;
 		kdebase-runtime)
-			KDE_SCM="git"
 			EGIT_REPONAME=${EGIT_REPONAME:=kde-runtime}
 		;;
 		kdebase-apps)
-			KDE_SCM="git"
 			EGIT_REPONAME=${EGIT_REPONAME:=kde-baseapps}
 		;;
-		kde-workspace|kde-runtime|kde-baseapps)
-			KDE_SCM="git"
-		;;
 	esac
 fi
 
 # @ECLASS-VARIABLE: KDE_SCM
 # @DESCRIPTION:
 # If this is a live package which scm does it use
-# Everything else uses svn by default
-KDE_SCM="${KDE_SCM:-svn}"
+# 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" ;;
diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
index 2176b548bdcc..8dab97034719 100644
--- a/eclass/kde4-meta-pkg.eclass
+++ b/eclass/kde4-meta-pkg.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.10 2013/02/02 16:58:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.11 2013/02/07 03:38:33 alexxy Exp $
 
 # @ECLASS: kde4-meta-pkg.eclass
 # @MAINTAINER:
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 0e6ed149f19f..69cb76ad9c72 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.68 2012/09/04 14:08:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.69 2013/02/07 03:38:33 alexxy Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -285,6 +285,7 @@ kde4-meta_create_extractlists() {
 	case ${KMNAME} in
 		kdebase | kdebase-apps | kde-baseapps)
 			KMEXTRACTONLY+="
+				CTestConfig.cmake
 				config-apps.h.cmake
 				ConfigureChecks.cmake"
 			;;
@@ -316,15 +317,10 @@ kde4-meta_create_extractlists() {
 			fi
 			KMEXTRACTONLY+="
 				config-enterprise.h.cmake
-				kleopatra/ConfigureChecks.cmake"
-			if ! [[ $(get_kde_version) < 4.5 ]]; then
-				KMEXTRACTONLY+="
-					CTestCustom.cmake
-					kdepim-version.h.cmake"
-			else
-				KMEXTRACTONLY+="
-					kdepim-version.h"
-			fi
+				kleopatra/ConfigureChecks.cmake
+				CTestCustom.cmake
+				kdepim-version.h.cmake
+				kdepim-version.h"
 			if use_if_iuse kontact; then
 				KMEXTRA+="
 					kontact/plugins/${PLUGINNAME:-${PN}}/"
@@ -565,16 +561,18 @@ kde4-meta_change_cmakelists() {
 					-e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
 					-i kontact/plugins/CMakeLists.txt || die 'failed to override build logic'
 			fi
-			if [[ $(get_kde_version) < 4.5 ]]; then
-				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
+			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
-			fi
+			esac
 			;;
 		kdewebdev)
 			# Disable hardcoded checks