[kde4-eclasses] Wipe out 4.3 remarks.

3 files changed, 11 insertions, 22 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c0c600b90a1..daa632f4ced 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -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,12 @@ 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, 4.6.0 for KDE 4.4 and
-# later and 4.6.3 for KDE 4.5 and later.
+# 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}"
-elif slot_is_at_least 4.4 "${KDE_MINIMAL}"; then
-	QT_MINIMAL="${QT_MINIMAL:-4.6.0}"
 else
-	QT_MINIMAL="${QT_MINIMAL:-4.5.1}"
+	QT_MINIMAL="${QT_MINIMAL:-4.6.0}"
 fi
 
 # OpenGL dependencies
@@ -289,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}
@@ -459,7 +453,7 @@ case ${BUILD_TYPE} in
 			case ${KDEBASE} in
 				kde-base)
 					case ${PV} in
-						4.[34].8[05] | 4.[34].9[02568])
+						4.[45].8[05] | 4.[45].9[02568])
 							case ${KMNAME} in
 								kdepim | kdepim-runtime)
 									SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/src/${_kmname_pv}.tar.bz2"
@@ -470,7 +464,7 @@ case ${BUILD_TYPE} in
 									;;
 								esac
 								;;
-						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"
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 03cd96e0cbb..1dc507ba74a 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -40,7 +40,7 @@ fi
 # @DESCRIPTION:
 # The slots used by all KDE versions later than 4.0. The live KDE releases use
 # KDE_LIVE_SLOTS instead. Values should be ordered.
-KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" "4.5" )
+KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" "4.5" "4.6" )
 
 # @ECLASS-VARIABLE: KDE_LIVE_SLOTS
 # @DESCRIPTION:
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 1e54061e734..5e1558c82b0 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -24,7 +24,6 @@ case ${KMNAME} in
 		COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
 		;;
 	kdepim|kdepim-runtime)
-		! slot_is_at_least 4.4 ${SLOT} && COMMONDEPEND+=" $(add_kdebase_dep kdepimlibs)"
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
 				IUSE+=" +kontact"
@@ -204,12 +203,12 @@ kde4-meta_src_extract() {
 	else
 		local abort tarball tarfile f extractlist moduleprefix postfix
 		case ${PV} in
-			4.[34].8[05] | 4.[34].9[02568])
+			4.[45].8[05] | 4.[45].9[02568])
 				# block for normally packed upstream unstable snapshots
 				KMTARPARAMS+=" --bzip2" # bz2
 				postfix="bz2"
 				;;
-			4.[34].[6-9]*)
+			4.[45].[6-9]*)
 				# Not passing --xz, as it doesn't work with stable tar
 				KMTARPARAMS+=" --use-compress-program=xz" # xz
 				postfix="xz"
@@ -349,10 +348,6 @@ kde4-meta_create_extractlists() {
 			if has kontact ${IUSE//+} && use kontact; then
 				KMEXTRA+="
 					kontact/plugins/${PLUGINNAME:-${PN}}/"
-				if ! slot_is_at_least 4.4 ${SLOT}; then
-					KMEXTRACTONLY+="
-						kontactinterfaces/"
-				fi
 			fi
 			;;
 		kdeutils)