Merge changes from overlay: remove kde 4.3 support, do not call epatch_user twice, bump cmake dep

1 files changed, 14 insertions, 19 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ffe2838f7cba..a497f4214aca 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.65 2010/06/26 16:02:18 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.66 2010/08/09 15:59:04 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -50,11 +50,11 @@ 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.3
+# version for apps to work. Currently defaults to 4.4
 # One may override this variable to raise version requirements.
 # For possible values look at KDE_SLOTS and KDE_LIVE_SLOTS variables.
 # Note that it is fixed to ${SLOT} for kde-base packages.
-KDE_MINIMAL="${KDE_MINIMAL:-4.3}"
+KDE_MINIMAL="${KDE_MINIMAL:-4.4}"
 
 # Set slot for packages in kde-base, koffice and kdevelop
 case ${KDEBASE} in
@@ -62,9 +62,9 @@ case ${KDEBASE} in
 		# Determine SLOT from PVs
 		case ${PV} in
 			*.9999*) SLOT="${PV/.9999*/}" ;; # stable live
+			4.6* | 4.5.[6-9]*) SLOT="4.6" ;;
 			4.5* | 4.4.[6-9]*) SLOT="4.5" ;;
 			4.4* | 4.3.[6-9]*) SLOT="4.4" ;;
-			4.3*) SLOT="4.3" ;;
 			9999*) SLOT="live" ;; # regular live
 			*) die "Unsupported ${PV}" ;;
 		esac
@@ -104,7 +104,7 @@ case ${KDEBASE} in
 		;;
 esac
 
-slot_is_at_least 4.5 ${KDE_MINIMAL} && CMAKE_MIN_VERSION="2.6.4"
+slot_is_at_least 4.5 ${KDE_MINIMAL} && CMAKE_MIN_VERSION="2.8.1"
 
 inherit ${buildsystem_eclass}
 
@@ -187,15 +187,14 @@ esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
-# Determine version of qt we enforce as minimal for the package. 4.4.0 4.5.1..
-# Currently defaults to 4.5.1 for KDE 4.3 and earlier
-# or 4.6.0 for KDE 4.4 and later
-if slot_is_at_least 4.4 "${KDE_MINIMAL}"; then
+# Determine version of qt we enforce as minimal for the package. 4.4.0 4.5.1...
+# 4.6.0 for 4.4 and 4.6.3 for 4.5 and later
+if slot_is_at_least 4.5 "${KDE_MINIMAL}"; then
+	QT_MINIMAL="${QT_MINIMAL:-4.6.3}"
+else
 	QT_MINIMAL="${QT_MINIMAL:-4.6.0}"
 fi
 
-QT_MINIMAL="${QT_MINIMAL:-4.5.1}"
-
 # OpenGL dependencies
 qtopengldepend="
 	>=x11-libs/qt-opengl-${QT_MINIMAL}:4
@@ -287,14 +286,11 @@ kdecommondepend="
 	)
 "
 #perl is not needed on host (+ difficult crosscompilation)
-tc-is-cross-compiler || kdecommondepend="$kdecommondepend dev-lang/perl"
+tc-is-cross-compiler || kdecommondepend+=" dev-lang/perl"
 
 if [[ ${PN} != kdelibs ]]; then
 	if [[ ${KDEBASE} = kde-base ]]; then
 		kdecommondepend+=" $(add_kdebase_dep kdelibs)"
-		# libknotificationitem only when SLOT is 4.3
-		[[ ${PN} != libknotificationitem ]] && [[ ${SLOT} = 4.3 ]] && \
-			kdecommondepend+=" $(add_kdebase_dep libknotificationitem)"
 	else
 		kdecommondepend+="
 			>=kde-base/kdelibs-${KDE_MINIMAL}
@@ -457,10 +453,10 @@ case ${BUILD_TYPE} in
 			case ${KDEBASE} in
 				kde-base)
 					case ${PV} in
-						4.[34].8[05] | 4.[34].9[0568])
-							# block for normally packed unstable releases
+						4.[45].8[05] | 4.[45].9[02568])
+							# Normally packed unstable releases
 							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
-						4.[34].[6-9]*)
+						4.[45].[6-9]*)
 							# Repacked tarballs: need to depend on xz-utils to ensure that they can be unpacked
 							SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/src/${_kmname_pv}.tar.xz"
 							DEPEND+=" app-arch/xz-utils"
@@ -624,7 +620,6 @@ kde4-base_src_prepare() {
 
 	# Apply patches
 	base_src_prepare
-	epatch_user
 
 	# Save library dependencies
 	if [[ -n ${KMSAVELIBS} ]] ; then