Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-config/, sys-devel/gcc-config/files/
Date: Thu, 15 Aug 2019 23:00:47
Message-Id: 1565910011.98b755b5beb5eb359a7cd9b59733d9642f12a829.slyfox@gentoo
1 commit: 98b755b5beb5eb359a7cd9b59733d9642f12a829
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 15 23:00:11 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 15 23:00:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b755b5
7
8 sys-devel/gcc-config: drop old
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 sys-devel/gcc-config/Manifest | 3 --
14 ...8-dont_source_functions_sh_from_etc_initd.patch | 47 -------------------
15 sys-devel/gcc-config/gcc-config-1.8-r1.ebuild | 51 --------------------
16 sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild | 49 --------------------
17 sys-devel/gcc-config/gcc-config-1.9.1.ebuild | 54 ----------------------
18 5 files changed, 204 deletions(-)
19
20 diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
21 index 690dbe03214..e9a5d35b635 100644
22 --- a/sys-devel/gcc-config/Manifest
23 +++ b/sys-devel/gcc-config/Manifest
24 @@ -1,4 +1 @@
25 -DIST gcc-config-1.8.tar.xz 15020 BLAKE2B 97debbef946b0c14b4ecc0bc5b2217566b43f21318970b235b2919bd1e1ea41aff66aebb0ed73db2382f8312268327eb6844139bdeae7aba75771c699a5043df SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
26 -DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734 SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
27 -DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee SHA512 6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069
28 DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f74586742c1d37dcea9c7853cf4ebfef875fc2bfa273cfc1555a33b9f04a1e58c850133cddee765dd769bdb189 SHA512 67c8cfc7e031d4a88191c04495c97f46e90e2d3fce4cd1afc29f142fad9414218768d3c6de4bd8bb7d9baa39a20b17bb28a503b0d05d6db2003b767546317a30
29
30 diff --git a/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch b/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch
31 deleted file mode 100644
32 index a4b7de2ffc5..00000000000
33 --- a/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch
34 +++ /dev/null
35 @@ -1,47 +0,0 @@
36 ---- gcc-config-1.8/gcc-config
37 -+++ gcc-config-1.8/gcc-config
38 -@@ -15,8 +15,9 @@
39 - trap ":" INT QUIT TSTP
40 -
41 - argv0=${0##*/}
42 --source /etc/init.d/functions.sh || {
43 -- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
44 -+functions_script="/lib/gentoo/functions.sh"
45 -+source ${functions_script} || {
46 -+ echo "${argv0}: Could not source ${functions_script}!" 1>&2
47 - exit 1
48 - }
49 - esyslog() { :; }
50 -
51 -From d45de09450ffb63b138bbb7f78cae43e1101e2ec Mon Sep 17 00:00:00 2001
52 -From: Ryan Hill <rhill@g.o>
53 -Date: Tue, 12 May 2015 22:09:28 -0600
54 -Subject: [PATCH] Ignore whitespace when diffing test results.
55 -
56 -The amount of whitespace output by ebegin/eend from gentoo-functions
57 -is dynamic (seems to be dependent on terminal width). Since we can't
58 -predict this we have to ignore all whitespace differences.
59 -
60 -URL: https://bugs.gentoo.org/547586
61 -Reported-by: tka <tka@×××××.org>
62 -Signed-off-by: Ryan Hill <rhill@g.o>
63 ----
64 - tests/run_tests | 2 +-
65 - 1 file changed, 1 insertion(+), 1 deletion(-)
66 -
67 -diff --git a/tests/run_tests b/tests/run_tests
68 -index 2ff7d77..397d667 100755
69 ---- a/tests/run_tests
70 -+++ b/tests/run_tests
71 -@@ -44,7 +44,7 @@ cmp_log() {
72 - args+=( -e "s|: line [0-9]*: |: |g" )
73 - sed "${args[@]}" "${exp}" > "${exp}.tmp"
74 - sed "${args[@]}" "${log}" > "${log}.tmp"
75 -- diff -u "${exp}.tmp" "${log}.tmp" > "${log}.diff"
76 -+ diff -uw "${exp}.tmp" "${log}.tmp" > "${log}.diff"
77 - ret=$?
78 - rm "${exp}.tmp"
79 - return ${ret}
80 ---
81 -2.4.4
82 -
83
84 diff --git a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
85 deleted file mode 100644
86 index 49c4dd55844..00000000000
87 --- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
88 +++ /dev/null
89 @@ -1,51 +0,0 @@
90 -# Copyright 1999-2018 Gentoo Foundation
91 -# Distributed under the terms of the GNU General Public License v2
92 -
93 -EAPI=5
94 -
95 -inherit eutils unpacker toolchain-funcs multilib
96 -
97 -DESCRIPTION="utility to manage compilers"
98 -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
99 -SRC_URI="mirror://gentoo/${P}.tar.xz
100 - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
101 -
102 -LICENSE="GPL-2"
103 -SLOT="0"
104 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
105 -IUSE=""
106 -
107 -RDEPEND=">=sys-apps/gentoo-functions-0.10"
108 -
109 -src_prepare() {
110 - epatch "${FILESDIR}/${PN}-1.8-dont_source_functions_sh_from_etc_initd.patch" # 504118
111 -}
112 -
113 -src_compile() {
114 - emake CC="$(tc-getCC)"
115 -}
116 -
117 -src_install() {
118 - emake \
119 - DESTDIR="${D}" \
120 - PV="${PV}" \
121 - SUBLIBDIR="$(get_libdir)" \
122 - install
123 -}
124 -
125 -pkg_postinst() {
126 - # Scrub eselect-compiler remains
127 - rm -f "${ROOT}"/etc/env.d/05compiler &
128 -
129 - # We not longer use the /usr/include/g++-v3 hacks, as
130 - # it is not needed ...
131 - rm -f "${ROOT}"/usr/include/g++{,-v3} &
132 -
133 - # Do we have a valid multi ver setup ?
134 - local x
135 - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
136 - gcc-config ${x}
137 - done
138 -
139 - wait
140 -}
141
142 diff --git a/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
143 deleted file mode 100644
144 index 157d0feb2e0..00000000000
145 --- a/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
146 +++ /dev/null
147 @@ -1,49 +0,0 @@
148 -# Copyright 1999-2018 Gentoo Foundation
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -EAPI=6
152 -
153 -inherit eutils toolchain-funcs multilib
154 -
155 -DESCRIPTION="Utility to manage compilers"
156 -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
157 -SRC_URI="mirror://gentoo/${P}.tar.xz
158 - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
159 -
160 -LICENSE="GPL-2"
161 -SLOT="0"
162 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
163 -IUSE=""
164 -
165 -RDEPEND=">=sys-apps/gentoo-functions-0.10"
166 -
167 -src_compile() {
168 - emake CC="$(tc-getCC)" \
169 - PV="${PV}" \
170 - SUBLIBDIR="$(get_libdir)"
171 -}
172 -
173 -src_install() {
174 - emake \
175 - DESTDIR="${D}" \
176 - PV="${PV}" \
177 - SUBLIBDIR="$(get_libdir)" \
178 - install
179 -}
180 -
181 -pkg_postinst() {
182 - # Scrub eselect-compiler remains
183 - rm -f "${ROOT}"/etc/env.d/05compiler &
184 -
185 - # We not longer use the /usr/include/g++-v3 hacks, as
186 - # it is not needed ...
187 - rm -f "${ROOT}"/usr/include/g++{,-v3} &
188 -
189 - # Do we have a valid multi ver setup ?
190 - local x
191 - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
192 - gcc-config ${x}
193 - done
194 -
195 - wait
196 -}
197
198 diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
199 deleted file mode 100644
200 index de2993cbb37..00000000000
201 --- a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
202 +++ /dev/null
203 @@ -1,54 +0,0 @@
204 -# Copyright 1999-2018 Gentoo Foundation
205 -# Distributed under the terms of the GNU General Public License v2
206 -
207 -EAPI=6
208 -
209 -inherit toolchain-funcs
210 -
211 -if [[ ${PV} == 9999 ]]; then
212 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
213 - inherit git-r3
214 -else
215 - SRC_URI="mirror://gentoo/${P}.tar.xz
216 - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
217 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
218 -fi
219 -
220 -DESCRIPTION="Utility to manage compilers"
221 -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
222 -LICENSE="GPL-2"
223 -SLOT="0"
224 -IUSE=""
225 -
226 -RDEPEND=">=sys-apps/gentoo-functions-0.10"
227 -
228 -src_compile() {
229 - emake CC="$(tc-getCC)" \
230 - PV="${PV}" \
231 - SUBLIBDIR="$(get_libdir)"
232 -}
233 -
234 -src_install() {
235 - emake \
236 - DESTDIR="${D}" \
237 - PV="${PV}" \
238 - SUBLIBDIR="$(get_libdir)" \
239 - install
240 -}
241 -
242 -pkg_postinst() {
243 - # Scrub eselect-compiler remains
244 - rm -f "${ROOT}"/etc/env.d/05compiler &
245 -
246 - # We not longer use the /usr/include/g++-v3 hacks, as
247 - # it is not needed ...
248 - rm -f "${ROOT}"/usr/include/g++{,-v3} &
249 -
250 - # Do we have a valid multi ver setup ?
251 - local x
252 - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
253 - gcc-config ${x}
254 - done
255 -
256 - wait
257 -}