Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 12 Aug 2017 13:02:09
Message-Id: 1502542890.8a0d1a8bb3fe9992f2d0aa407b71a766534c2df0.asturm@gentoo
1 commit: 8a0d1a8bb3fe9992f2d0aa407b71a766534c2df0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 23 22:14:00 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 12 13:01:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0d1a8b
7
8 kde4-base.eclass: Drop obsolete minimum GCC check
9
10 eclass/kde4-base.eclass | 12 +-----------
11 1 file changed, 1 insertion(+), 11 deletions(-)
12
13 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
14 index bbdcf8db20f..6e64a9be146 100644
15 --- a/eclass/kde4-base.eclass
16 +++ b/eclass/kde4-base.eclass
17 @@ -637,7 +637,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
18 kde4-base_pkg_setup() {
19 debug-print-function ${FUNCNAME} "$@"
20
21 - if has handbook ${IUSE} || has "+handbook" ${IUSE} && [ "${KDE_HANDBOOK}" != optional ] ; then
22 + if has handbook ${IUSE} || has "+handbook" ${IUSE} && [[ "${KDE_HANDBOOK}" != optional ]] ; then
23 eqawarn "Handbook support is enabled via KDE_HANDBOOK=optional in the ebuild."
24 eqawarn "Please do not just set IUSE=handbook, as this leads to dependency errors."
25 fi
26 @@ -645,16 +645,6 @@ kde4-base_pkg_setup() {
27 # Don't set KDEHOME during compilation, it will cause access violations
28 unset KDEHOME
29
30 - # Check if gcc compiler is fresh enough.
31 - # In theory should be in pkg_pretend but we check it only for kdelibs there
32 - # and for others we do just quick scan in pkg_setup because pkg_pretend
33 - # executions consume quite some time (ie. when merging 300 packages at once will cause 300 checks)
34 - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
35 - [[ $(gcc-major-version) -lt 4 ]] || \
36 - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 6 ]] ) \
37 - && die "Sorry, but gcc-4.6 and earlier wont work for some KDE packages."
38 - fi
39 -
40 KDEDIR=/usr
41 : ${PREFIX:=/usr}
42 EKDEDIR=${EPREFIX}/usr