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

[Tomas Chvatal]

commit:     60b48314421418f7f1bd2d04b51aa578027db246
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May  1 13:40:24 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May  1 13:40:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=60b48314

[eclasses/kdelibs] Rework the gcc checker to be little less resources consuming.

---
 eclass/kde4-base.eclass                  |    8 ++++++++
 eclass/kde4-meta.eclass                  |   22 +---------------------
 kde-base/kdelibs/kdelibs-4.6.3.ebuild    |    6 ++++++
 kde-base/kdelibs/kdelibs-4.6.9999.ebuild |    6 ++++++
 kde-base/kdelibs/kdelibs-9999.ebuild     |    6 ++++++
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8fe4a0b..a1700d9 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 d59e4fd..6dcd13d 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/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
index acfe509..9e28ada 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 85d9422..97fe65f 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 200f0cc..5f121ea 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"