Gentoo Archives: gentoo-commits

From: "Andreas K. Huettel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 09 Mar 2011 01:15:17
Message-Id: e0617c038bfd3726018b5df71a5d66b8aea4c6b1.dilfridge@gentoo
1 commit: e0617c038bfd3726018b5df71a5d66b8aea4c6b1
2 Author: Andreas K. Huettel <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Wed Mar 9 01:14:47 2011 +0000
4 Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 9 01:14:47 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e0617c03
7
8 [eclass] gcc-4.3 wont work for >=kde-4.6 (see bug 354837)
9
10 ---
11 eclass/kde4-meta.eclass | 8 +++++---
12 1 files changed, 5 insertions(+), 3 deletions(-)
13
14 diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
15 index 05bfe75..ad7c1f1 100644
16 --- a/eclass/kde4-meta.eclass
17 +++ b/eclass/kde4-meta.eclass
18 @@ -14,7 +14,7 @@
19
20 [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
21
22 -inherit kde4-base versionator
23 +inherit kde4-base toolchain-funcs versionator
24
25 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
26
27 @@ -131,11 +131,13 @@ fi
28
29 # @FUNCTION: kde4-meta_pkg_setup
30 # @DESCRIPTION:
31 -# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in
32 -# split ebuilds.
33 +# Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version.
34 +# Use this one in split ebuilds.
35 kde4-meta_pkg_setup() {
36 debug-print-function ${FUNCNAME} "$@"
37
38 + [[ $(gcc-version) == "4.3" ]] && slot_is_at_least 4.6 && die "Sorry, but gcc-4.3 wont work for >=kde-4.6 (see bug 354837)."
39 +
40 kde4-base_pkg_setup
41 }