Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Sun, 01 Dec 2019 10:53:33
Message-Id: 1575113170.5b7c41d563393a928db126ac7136af72210f7550.asturm@gentoo
1 commit: 5b7c41d563393a928db126ac7136af72210f7550
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 30 11:26:10 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 30 11:26:10 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5b7c41d5
7
8 qmake-utils.eclass: Drop obsolete EAPI-5 support
9
10 Last consumer in Gentoo ebuild repository was dropped.
11
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 eclass/qmake-utils.eclass | 7 +++----
15 1 file changed, 3 insertions(+), 4 deletions(-)
16
17 diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
18 index f8981c75..394c8422 100644
19 --- a/eclass/qmake-utils.eclass
20 +++ b/eclass/qmake-utils.eclass
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 1999-2019 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 # @ECLASS: qmake-utils.eclass
27 @@ -6,7 +6,7 @@
28 # qt@g.o
29 # @AUTHOR:
30 # Davide Pesavento <pesa@g.o>
31 -# @SUPPORTED_EAPIS: 5 6 7
32 +# @SUPPORTED_EAPIS: 6 7
33 # @BLURB: Common functions for qmake-based packages.
34 # @DESCRIPTION:
35 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
36 @@ -17,9 +17,8 @@
37 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
38 _QMAKE_UTILS_ECLASS=1
39
40 -[[ ${EAPI:-0} == [01234] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}"
41 +[[ ${EAPI:-0} == [012345] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}"
42
43 -[[ ${EAPI:-0} == 5 ]] && inherit eutils multilib
44 inherit estack toolchain-funcs
45
46 # @FUNCTION: qt4_get_bindir