6 files changed, 30 insertions, 24 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8fe4a0bf5d4..a1700d93fab 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -642,6 +642,14 @@ 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.
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+		&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
+
 	if [[ ${KDEBASE} = kde-base ]]; then
 		if use kdeprefix; then
 			KDEDIR=/usr/kde/${SLOT}
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index d59e4fdaae1..6dcd13d6ca0 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -16,14 +16,7 @@
 
 inherit kde4-base toolchain-funcs versionator
 
-case ${EAPI:-0} in
-	3)
-		KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
-		;;
-	*)
-		KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
-		;;
-esac
+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.
@@ -137,17 +130,6 @@ fi
 # Specify extra parameters to pass to tar, in kde4-meta_src_extract.
 # '-xpf -j' are passed to tar by default.
 
-# @FUNCTION: kde4-meta_pkg_pretend
-# @DESCRIPTION:
-# Currently only checks the gcc version.
-kde4-meta_pkg_pretend() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	slot_is_at_least 4.6 ${SLOT} && ( [[ $(gcc-major-version) -lt 4 ]] || \
-		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) ) \
-		&& die "Sorry, but gcc-4.3 and earlier wont work for KDE SC 4.6 (see bug 354837)."
-}
-
 # @FUNCTION: kde4-meta_pkg_setup
 # @DESCRIPTION:
 # Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version.
@@ -155,8 +137,6 @@ kde4-meta_pkg_pretend() {
 kde4-meta_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	has pkg_pretend ${KDEMETA_EXPF} || kde4-meta_pkg_pretend
-
 	kde4-base_pkg_setup
 }
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index d7c7de3c1bf..fc24f9984a1 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -24,7 +24,7 @@ AUX kdelibs-4.6.0-kateacc.patch 1639 RMD160 239e2fb92dc2efa1e66b669a6e6cf29f9937
 AUX kdelibs-4.6.2-armlinking.patch 1129 RMD160 48174cfa4af1a871f4d05a880beded4a16b0408e SHA1 6fa4163e94990ed574caf3b9f0026b18b30c86df SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6
 AUX kdelibs-4.6.2-nonepomuk.patch 736 RMD160 3f6ab4acd649d47f045e2445544df3b84e7a700e SHA1 1f5af0271c6a5135bf0bc0acbd6f11abf256c81b SHA256 f27ec69f92e197bff33ecd6f25e3e47303e7599cdc28302477bca52ebe94b2a4
 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
-EBUILD kdelibs-4.6.3.ebuild 9835 RMD160 5778930873abe5983c44f09e42fd8c5da6a71b23 SHA1 e2e0e56b3b7be60db83a3a134e6f81b94b7769ff SHA256 c66cc59dd2e340273e630cd2eb2ed4822deb4c442c052583778d04d8dc695754
-EBUILD kdelibs-4.6.9999.ebuild 9773 RMD160 a5965f167008e53ad9e11d12c0c511fd2aed8d5f SHA1 64d8870081c1611097f542f92dff932276c79bea SHA256 2e99deb3b44c3072e9615420ae7d7a776c93f6fbc66d4e5949d0e80a02a32a0c
-EBUILD kdelibs-9999.ebuild 9834 RMD160 98f6285e6e6851d3681d066ec4744350a6f799ee SHA1 3b9d0a5db9fb9683ac4b84ac11751cf528c87afd SHA256 002906f14fc6a9afd3e0a0024f04eb13289835d23f1c57ab900dad2ed14a1b21
+EBUILD kdelibs-4.6.3.ebuild 10052 RMD160 6d8ae92736d882d60769813d850f08806258eefd SHA1 00ffafbe8bf7282d4ba5b5176d573cbeed4d2bb9 SHA256 ec528720a1c99ecebdb3f3f31a52495e5515f12dfa79ff15ac613d41febab85e
+EBUILD kdelibs-4.6.9999.ebuild 9990 RMD160 f65371802620f671f9aaf0d1f1978959b15ae0ef SHA1 eac3cfdf3ec7ff1d3beee0dd002a8e68a6a69faf SHA256 838cfaccfcadaf1c9ec154b907b720154dda359513ae12c71927fcfb133841c7
+EBUILD kdelibs-9999.ebuild 10051 RMD160 1e846d11d15e9271cbc9eda855c924b10878e966 SHA1 48c7718f4050b09bb5d6a1ec9cd94b0e1ca9f4c7 SHA256 aebdd664ab6fa7a73cab1482204ebfd263d34545ec4cead498ec890520c63f36
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
diff --git a/kde-base/kdelibs/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
index acfe509b544..9e28adadd95 100644
--- a/kde-base/kdelibs/kdelibs-4.6.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
@@ -139,6 +139,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )
 
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+}
+
 src_prepare() {
 	kde4-base_src_prepare
 	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
index 85d94229c00..97fe65f87d9 100644
--- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
@@ -139,6 +139,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )
 
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+}
+
 src_prepare() {
 	kde4-base_src_prepare
 	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 200f0ccd816..5f121ea8f14 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -139,6 +139,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )
 
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+}
+
 src_prepare() {
 	kde4-base_src_prepare
 	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"