gentoo resync : 10.02.2020

6 files changed, 29 insertions, 35 deletions

diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
index 481c015d4acc..d965885403bf 100644
--- a/dev-util/colorgcc/Manifest
+++ b/dev-util/colorgcc/Manifest
@@ -1,7 +1,7 @@
-AUX colorgcc-1.3.2-gentoo-one.patch 6576 BLAKE2B ef07061997435ff2807f15e2192a11effb8e527f1c179de333a183447b423ea2c5c070fc1693fb24aef17ab6bfe99863fafc5025b2ab8d0f463b37173df96af1 SHA512 c69817277bd8fa63a4cb54abc2b6300d3f31becd189a01605b06b828a11a4b0ea5edf78048bcbf6f271693149376bc625770605d6bb157251c77f7a4608dae91
-AUX colorgcc-1.3.2-gentoo-two.patch 1953 BLAKE2B d5f7c061674ac993c2228fe435b38c0bc06e1b0f9a403219d96e358427e6cadc66ee3532a893d131265d448edc9e79b6c089963c635003ff05f279b84fb2cce4 SHA512 ede1391446346e5701ddb5fb1ee34c87d1d9877b2ec221f07923b6a17e199caa93f3183d4d8f7349955d425a3094a9ce8e2d2ace71a3c5030f811eb0895a834d
-AUX colorgcc-1.3.2-nohang.patch 1752 BLAKE2B 244d7e7480b148849516ac672a7d164c58c4b4dc500d13e03b0fa2626eeb7bd776eb31f3e982cb1255611057bc26810d468ff247f08a7f9d1aeab7dd7ac46e42 SHA512 4c345e7e21e6a53f16197ea64594ddef646045de2d3d4f1ad500f24c081d06490babc7b375d6e5b0968da73d8332da2590e7f6924d81c20fe8ca9d59949d0b22
-AUX colorgcc-1.3.2-note.patch 1922 BLAKE2B 79c2950839c25870bea70a8cb9636a6525283773d8a180a93491d1a93a7d90c2f80814f6f98c75a497eea9b008d10c65b7e872afab47a38484c021aad53c08c2 SHA512 8b9dfd8a3790178a245ffc40bd5631397b9d1acdb5fd06e7c768d9679414174f06036ed09d29b61fc349b9155f95a2505e2dda88736ca899f038b3ca17207a72
+AUX colorgcc-1.3.2-gentoo-one.patch 6357 BLAKE2B f30388de2a406d93e7f19e5b27d35328eef57317751915b63c7ff5ec6199661e679bfba2187e85ed43074bb07c9449e194ebdbd77ce4912880136606f7ebdb7a SHA512 cbc33cd69e554aeca757744a84cd6c5c9dad04b9d449ce797f3b1b3799dcf12dd6919a1934743154b96c7cee6d5c5c17a3813a73ecd73a7a7f935094c4f92585
+AUX colorgcc-1.3.2-gentoo-two.patch 1882 BLAKE2B 5b8b02733b59e90de12eaf5fcd1df7735eb56864c00cd8d1ba3494b51036487eb5c9ddf2f56814fe29eff28f4a22250957139e412463fc84da479e177790ae70 SHA512 89d7a6b23db893d65b940090deaa0d553e1ee66cbbcd495c6570510b0139227a81f7ac9ef8c2665e367155e6fde90d91d8181781f7c131ca57371bce649d7bfd
+AUX colorgcc-1.3.2-nohang.patch 1675 BLAKE2B c31b8a3b64df47f4015d1ccff2e852993791197bd3076596c3f29b154c8f7e256e77278744306cafa9651ce3b253da21358fcee306c61dd6e8384705c594fbc6 SHA512 5842700ec869b1f066035b8facfce056a207e4a7aeb020c1ec3fa277be56f8c513dc5f86df79f73e00c6cde93cccfd1173c5572d3e02233fa2b0e86c2f17b249
+AUX colorgcc-1.3.2-note.patch 1845 BLAKE2B 0a33bf926eacd9b3ade3da542078d7b7738bf7086b7026873fc4e66dbeccbcd6d10f071e8e9c35cb20d7eb4f1752a6c87cbb3361d4714e401f9408fc9dfa9b2a SHA512 8d0a1a64a235c43b66c2813c3d7316f650c3160700d61acc2e1d6deff678da31832259fbc08da05108e42d780ba769b404881b65d0b68bc6c2ec6ebd25b78ae3
 DIST colorgcc-1.3.2.tar.gz 11076 BLAKE2B 80843c200157fea52cc9f0f7f3008a52860ab8e1256490126d499b34f6821957de92755cbda835806e2df83866ef11096d6d80a0739fb87ef7c348ccf58d76af SHA512 1f6031bcc0f6eb6bdaf0359debe13d1a6579c4f5bfb8dfeef79904a2ffcc94322f2c7f9948439c2975bd4ffed1ebaa085bd7ce338289bdf9c170cd40e1c1a448
-EBUILD colorgcc-1.3.2-r7.ebuild 2110 BLAKE2B 41185695aeea6f0fe03b95072c925be02fa03afb91fec5e07ca133dc97e6f909cb598d7c40f0bdc11812f912f00a89f6bc93f39515408d5ff5c76164940968f5 SHA512 52e28974e3c67f4083b979c6cf000d74c3eaa1e46b44541593ef06255acd2aaf4b4c73781a831fe8ebb69747b9e73fe981bb11e4b4b2baab44814dc004264345
+EBUILD colorgcc-1.3.2-r7.ebuild 1985 BLAKE2B 824980286bbc3e7b64959b03711f3ab76a67f05ae4735e4df01b3bea9f0537f1da2f191e134ae5e4cbf96553336745576100b1cadca1a7e0f439b11241391b7b SHA512 4f202286145f3ea53c2e988c462e82d6b3f5683c05cef2f24b8500d9867800417e088acaa93a72b8dde18edd80371ca17bee1471e033939c3da93be35843e389
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
index 60880cdc1e34..899387414cc4 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Perl script to colorise the gcc output."
 HOMEPAGE="http://schlueters.de/colorgcc.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
@@ -24,24 +21,21 @@ PATCHES=(
 	"${FILESDIR}"/${P}-nohang.patch
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 src_install() {
-	dobin "${PN}"
-	dodir "/etc/${PN}" "/usr/lib/${PN}/bin"
-	insinto "/etc/${PN}"
-	doins "${PN}rc"
+	dobin ${PN}
+
+	insinto /etc/${PN}
+	doins ${PN}rc
+
 	einfo "Scanning for compiler front-ends"
-	into "/usr/lib/${PN}/bin"
-	local COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ )
+	dodir /usr/lib/${PN}/bin
+	local c COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ )
 	for c in "${COMPILERS[@]}"; do
 		[[ -n "$(type -p ${c})" ]] && \
-			dosym "/usr/bin/${PN}" "/usr/lib/${PN}/bin/${c}"
+			dosym ../../../bin/${PN} /usr/lib/${PN}/bin/${c}
 	done
 
-	dodoc CREDITS ChangeLog
+	einstalldocs
 }
 
 pkg_postinst() {
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
index 68a177ba75c7..13199715c9fa 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
@@ -1,5 +1,5 @@
---- colorgcc.orig	1999-04-29 10:16:08.000000000 -0700
-+++ colorgcc	2003-04-11 16:38:52.000000000 -0700
+--- a/colorgcc
++++ b/colorgcc
 @@ -88,16 +88,16 @@
  #
  # 1.0.0 Initial Version
@@ -188,8 +188,8 @@
 +   waitpid($compiler_pid, 0);
 +   exit ($? >> 8);
 +}
---- colorgccrc.orig	1999-04-29 10:16:08.000000000 -0700
-+++ colorgccrc	2003-02-12 17:38:38.000000000 -0800
+--- a/colorgccrc
++++ b/colorgccrc
 @@ -20,12 +20,14 @@
  # For example, srcColor: bold cyan on_yellow
  #
@@ -225,8 +225,8 @@
  errorMessageColor:  bold red
 -
 -
---- INSTALL.orig	1999-04-29 10:16:08.000000000 -0700
-+++ INSTALL	2003-04-07 17:12:25.000000000 -0700
+--- a/INSTALL
++++ b/INSTALL
 @@ -27,9 +27,9 @@
  When "g++" is invoked, colorgcc is run instead.  colorgcc looks at the
  program name to figure out which compiler to use. 
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
index 911a31b21bf3..6cc033255a2a 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
@@ -1,5 +1,5 @@
---- colorgcc.r9	2003-09-21 12:14:48.000000000 -0700
-+++ colorgcc	2003-09-21 13:11:22.000000000 -0700
+--- a/colorgcc
++++ b/colorgcc
 @@ -95,6 +95,7 @@
  use Cwd 'abs_path';
  
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
index 9602146b0af9..b14a92b59a63 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
@@ -1,5 +1,5 @@
---- /usr/bin/colorgcc	2010-12-13 00:08:37.000000000 -0200
-+++ colorgcc	2011-10-05 15:26:53.000000000 -0300
+--- a/colorgcc
++++ b/colorgcc
 @@ -221,17 +221,16 @@
  # Figure out which compiler to invoke based on our program name.
  $0 =~ m%.*/(.*)$%;
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
index 026503e8f2c9..52cdb165cdda 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
@@ -1,5 +1,5 @@
---- /usr/bin/colorgcc	2009-10-29 20:24:46.717190000 +0100
-+++ colorgcc	2009-10-29 20:27:42.614162888 +0100
+--- a/colorgcc
++++ b/colorgcc
 @@ -102,7 +102,8 @@
     $nocolor{"dumb"} = "true";