Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/scite/
Date: Tue, 17 May 2022 05:34:55
Message-Id: 1652765630.542edce19adc5c8d219224f56d861fa5a08ff9d7.sam@gentoo
1 commit: 542edce19adc5c8d219224f56d861fa5a08ff9d7
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 17 01:48:22 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 17 05:33:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542edce1
7
8 app-editors/scite: [QA] drop (very) stale GCC version checks
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 app-editors/scite/scite-5.1.1.ebuild | 20 +-------------------
13 app-editors/scite/scite-5.1.3.ebuild | 20 +-------------------
14 app-editors/scite/scite-5.1.6.ebuild | 20 +-------------------
15 3 files changed, 3 insertions(+), 57 deletions(-)
16
17 diff --git a/app-editors/scite/scite-5.1.1.ebuild b/app-editors/scite/scite-5.1.1.ebuild
18 index c3e280ecf802..55863b5a601e 100644
19 --- a/app-editors/scite/scite-5.1.1.ebuild
20 +++ b/app-editors/scite/scite-5.1.1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 +# Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=8
27 @@ -36,24 +36,6 @@ DOCS=("../README")
28
29 S="${WORKDIR}/${PN}/gtk"
30
31 -pkg_pretend() {
32 - if tc-is-clang ; then
33 - # need c++17 features
34 - [[ "${MERGE_TYPE}" != "binary" &&
35 - $(clang-major-version) -lt 5 ]] &&
36 - die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
37 - ($(clang-major-version))."
38 -
39 - elif tc-is-gcc; then
40 - # older gcc is not supported
41 - [[ "${MERGE_TYPE}" != "binary" &&
42 - $(gcc-major-version) -lt 7 ]] &&
43 - die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
44 - else
45 - die "Either gcc or clang should be configured for building scite"
46 - fi
47 -}
48 -
49 pkg_setup() {
50 use lua && lua-single_pkg_setup
51 }
52
53 diff --git a/app-editors/scite/scite-5.1.3.ebuild b/app-editors/scite/scite-5.1.3.ebuild
54 index 3defc2beced6..56eaa7f3c945 100644
55 --- a/app-editors/scite/scite-5.1.3.ebuild
56 +++ b/app-editors/scite/scite-5.1.3.ebuild
57 @@ -1,4 +1,4 @@
58 -# Copyright 1999-2021 Gentoo Authors
59 +# Copyright 1999-2022 Gentoo Authors
60 # Distributed under the terms of the GNU General Public License v2
61
62 EAPI=8
63 @@ -36,24 +36,6 @@ DOCS=("../README")
64
65 S="${WORKDIR}/${PN}/gtk"
66
67 -pkg_pretend() {
68 - if tc-is-clang ; then
69 - # need c++17 features
70 - [[ "${MERGE_TYPE}" != "binary" &&
71 - $(clang-major-version) -lt 5 ]] &&
72 - die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
73 - ($(clang-major-version))."
74 -
75 - elif tc-is-gcc; then
76 - # older gcc is not supported
77 - [[ "${MERGE_TYPE}" != "binary" &&
78 - $(gcc-major-version) -lt 7 ]] &&
79 - die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
80 - else
81 - die "Either gcc or clang should be configured for building scite"
82 - fi
83 -}
84 -
85 pkg_setup() {
86 use lua && lua-single_pkg_setup
87 }
88
89 diff --git a/app-editors/scite/scite-5.1.6.ebuild b/app-editors/scite/scite-5.1.6.ebuild
90 index f04689f90329..f2887e4b0f91 100644
91 --- a/app-editors/scite/scite-5.1.6.ebuild
92 +++ b/app-editors/scite/scite-5.1.6.ebuild
93 @@ -1,4 +1,4 @@
94 -# Copyright 1999-2021 Gentoo Authors
95 +# Copyright 1999-2022 Gentoo Authors
96 # Distributed under the terms of the GNU General Public License v2
97
98 EAPI=8
99 @@ -36,24 +36,6 @@ DOCS=("../README")
100
101 S="${WORKDIR}/${PN}/gtk"
102
103 -pkg_pretend() {
104 - if tc-is-clang ; then
105 - # need c++17 features
106 - [[ "${MERGE_TYPE}" != "binary" &&
107 - $(clang-major-version) -lt 5 ]] &&
108 - die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
109 - ($(clang-major-version))."
110 -
111 - elif tc-is-gcc; then
112 - # older gcc is not supported
113 - [[ "${MERGE_TYPE}" != "binary" &&
114 - $(gcc-major-version) -lt 7 ]] &&
115 - die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
116 - else
117 - die "Either gcc or clang should be configured for building scite"
118 - fi
119 -}
120 -
121 pkg_setup() {
122 use lua && lua-single_pkg_setup
123 }