1 |
commit: 869fdaa5823c8d06bb8698e9adf924098205ee5a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 13:12:55 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 13:12:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869fdaa5 |
7 |
|
8 |
dev-util/colorgcc: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild | 30 +++++++++------------- |
14 |
.../colorgcc/files/colorgcc-1.3.2-gentoo-one.patch | 12 ++++----- |
15 |
.../colorgcc/files/colorgcc-1.3.2-gentoo-two.patch | 4 +-- |
16 |
.../colorgcc/files/colorgcc-1.3.2-nohang.patch | 4 +-- |
17 |
dev-util/colorgcc/files/colorgcc-1.3.2-note.patch | 4 +-- |
18 |
5 files changed, 24 insertions(+), 30 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild |
21 |
index 60880cdc1e3..899387414cc 100644 |
22 |
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild |
23 |
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild |
24 |
@@ -1,18 +1,15 @@ |
25 |
-# Copyright 1999-2017 Gentoo Foundation |
26 |
+# Copyright 1999-2020 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI=5 |
30 |
- |
31 |
-inherit eutils |
32 |
+EAPI=7 |
33 |
|
34 |
DESCRIPTION="Perl script to colorise the gcc output." |
35 |
HOMEPAGE="http://schlueters.de/colorgcc.html" |
36 |
SRC_URI="mirror://gentoo/${P}.tar.gz" |
37 |
|
38 |
-SLOT="0" |
39 |
LICENSE="GPL-2" |
40 |
+SLOT="0" |
41 |
KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
42 |
-IUSE="" |
43 |
|
44 |
DEPEND="dev-lang/perl" |
45 |
RDEPEND="${DEPEND}" |
46 |
@@ -24,24 +21,21 @@ PATCHES=( |
47 |
"${FILESDIR}"/${P}-nohang.patch |
48 |
) |
49 |
|
50 |
-src_prepare() { |
51 |
- epatch "${PATCHES[@]}" |
52 |
-} |
53 |
- |
54 |
src_install() { |
55 |
- dobin "${PN}" |
56 |
- dodir "/etc/${PN}" "/usr/lib/${PN}/bin" |
57 |
- insinto "/etc/${PN}" |
58 |
- doins "${PN}rc" |
59 |
+ dobin ${PN} |
60 |
+ |
61 |
+ insinto /etc/${PN} |
62 |
+ doins ${PN}rc |
63 |
+ |
64 |
einfo "Scanning for compiler front-ends" |
65 |
- into "/usr/lib/${PN}/bin" |
66 |
- local COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ ) |
67 |
+ dodir /usr/lib/${PN}/bin |
68 |
+ local c COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ ) |
69 |
for c in "${COMPILERS[@]}"; do |
70 |
[[ -n "$(type -p ${c})" ]] && \ |
71 |
- dosym "/usr/bin/${PN}" "/usr/lib/${PN}/bin/${c}" |
72 |
+ dosym ../../../bin/${PN} /usr/lib/${PN}/bin/${c} |
73 |
done |
74 |
|
75 |
- dodoc CREDITS ChangeLog |
76 |
+ einstalldocs |
77 |
} |
78 |
|
79 |
pkg_postinst() { |
80 |
|
81 |
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch |
82 |
index 68a177ba75c..13199715c9f 100644 |
83 |
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch |
84 |
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch |
85 |
@@ -1,5 +1,5 @@ |
86 |
---- colorgcc.orig 1999-04-29 10:16:08.000000000 -0700 |
87 |
-+++ colorgcc 2003-04-11 16:38:52.000000000 -0700 |
88 |
+--- a/colorgcc |
89 |
++++ b/colorgcc |
90 |
@@ -88,16 +88,16 @@ |
91 |
# |
92 |
# 1.0.0 Initial Version |
93 |
@@ -188,8 +188,8 @@ |
94 |
+ waitpid($compiler_pid, 0); |
95 |
+ exit ($? >> 8); |
96 |
+} |
97 |
---- colorgccrc.orig 1999-04-29 10:16:08.000000000 -0700 |
98 |
-+++ colorgccrc 2003-02-12 17:38:38.000000000 -0800 |
99 |
+--- a/colorgccrc |
100 |
++++ b/colorgccrc |
101 |
@@ -20,12 +20,14 @@ |
102 |
# For example, srcColor: bold cyan on_yellow |
103 |
# |
104 |
@@ -225,8 +225,8 @@ |
105 |
errorMessageColor: bold red |
106 |
- |
107 |
- |
108 |
---- INSTALL.orig 1999-04-29 10:16:08.000000000 -0700 |
109 |
-+++ INSTALL 2003-04-07 17:12:25.000000000 -0700 |
110 |
+--- a/INSTALL |
111 |
++++ b/INSTALL |
112 |
@@ -27,9 +27,9 @@ |
113 |
When "g++" is invoked, colorgcc is run instead. colorgcc looks at the |
114 |
program name to figure out which compiler to use. |
115 |
|
116 |
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch |
117 |
index 911a31b21bf..6cc033255a2 100644 |
118 |
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch |
119 |
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch |
120 |
@@ -1,5 +1,5 @@ |
121 |
---- colorgcc.r9 2003-09-21 12:14:48.000000000 -0700 |
122 |
-+++ colorgcc 2003-09-21 13:11:22.000000000 -0700 |
123 |
+--- a/colorgcc |
124 |
++++ b/colorgcc |
125 |
@@ -95,6 +95,7 @@ |
126 |
use Cwd 'abs_path'; |
127 |
|
128 |
|
129 |
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch |
130 |
index 9602146b0af..b14a92b59a6 100644 |
131 |
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch |
132 |
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch |
133 |
@@ -1,5 +1,5 @@ |
134 |
---- /usr/bin/colorgcc 2010-12-13 00:08:37.000000000 -0200 |
135 |
-+++ colorgcc 2011-10-05 15:26:53.000000000 -0300 |
136 |
+--- a/colorgcc |
137 |
++++ b/colorgcc |
138 |
@@ -221,17 +221,16 @@ |
139 |
# Figure out which compiler to invoke based on our program name. |
140 |
$0 =~ m%.*/(.*)$%; |
141 |
|
142 |
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch |
143 |
index 026503e8f2c..52cdb165cdd 100644 |
144 |
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch |
145 |
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch |
146 |
@@ -1,5 +1,5 @@ |
147 |
---- /usr/bin/colorgcc 2009-10-29 20:24:46.717190000 +0100 |
148 |
-+++ colorgcc 2009-10-29 20:27:42.614162888 +0100 |
149 |
+--- a/colorgcc |
150 |
++++ b/colorgcc |
151 |
@@ -102,7 +102,8 @@ |
152 |
$nocolor{"dumb"} = "true"; |