6 files changed, 18 insertions, 29 deletions
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index acf3d0b3bb6f..86e7ae3f32bc 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -1,7 +1,7 @@
-AUX 1.0.16-collision.patch 1367 BLAKE2B b36dc61f1a898c08e13e527adf219b47a15cad8a9f9f11a9e80adb289cff592349f16189f4e8f776bcf462f6488ef4be24b77fb70bf0f8f2cdff6517786ae16c SHA512 2f5e2dc0eb6af383207cd514a5e42bd1cd03f8748a8c1c66d0d83b7a5abd2fafc108a2207ff96bef5b74b9044c21fbe185e3b47a090d11387c7d1bb8f7684e76
-AUX 1.0.16-format-security.patch 412 BLAKE2B 07465169761141e6bfd415ac78366df1a27e8bb38d3ffe2091653235cf790f72b25e80b6ab744eeebd16b4ac57acfad20089d052ee76c728212d0a60ffcc6287 SHA512 604a22a47e36933d4b2788c1acfe1930e2935dac14dbad5a717ce69b26463bdffcc54aa74bf5dfc22631b3a587ca56bda359d86cebf9fa1ad7c7a235fb71a5db
-AUX 1.0.16-ldflags.patch 486 BLAKE2B 350b72daa7c419ff4b8de846d33921450d55d94d26714438f93d197bb620e9d1a6d70c681f4547b3b72fe7c3ee31fb0700d3bd1f8ee8e2dc8820c63b7be4c461 SHA512 75883411ef18c739e6f86ba53a5b515e8081ac10d1b3e894de9bee4dd0040620f0fe09786085acd325669475d0d1e99b4d46554a68ebffcad18e50cb281cabfe
-AUX 1.0.16-path.patch 550 BLAKE2B d14ac37b4dc3a951da4f472598e1a3a8863d9c61cb3994a3da97c31aed9b31f1aa1e1aa1a39f764be79aaeb4e53655983eddff5bcccb876605ed662b50bf04fe SHA512 2d8c1cf55e0d2d725aae4c3bd4f8300402b036e934218135ac840f9f891424458a79a9c2432bd4fa47255c30f096c3752a1a5897854f82da438398d5c671af23
+AUX 1.0.16-collision.patch 1239 BLAKE2B 39567192acb63116de0c9ae34eeb05619cf25d8640494222eea66a899c9f8b9f0859586443ef531031100247274184c0f55cf28382f1be48d50fb4d258694c4b SHA512 a6ed944efd2e1cb88a6b3d2ae4063c6b043880b1810441fcb67b4655d793da8cdba8c76005ad1cab6fd19263c928c41775bde24ade425e49902eff97e3181cbf
+AUX 1.0.16-format-security.patch 284 BLAKE2B 79945a54bf591e7b78475276b1f51e5c613f9992580de92fa7ebed90201b955fdf4b151283e5f3ae84174233598b9f0687bf48b60f91f02b76e2518dec4b8492 SHA512 0f6b701e0d7925dcc5ec125db4efcd967fc17d5d1e4d3b5b73786639d0c017c9125c800d948843f4746c2762a0f7bf35eab183e9edb2a2f1088aa01f59021ec5
+AUX 1.0.16-ldflags.patch 417 BLAKE2B ec4399063c9b082ea2b51cc33ba684f5b583392e350cc859e5b133fe324dff83c9d7efd3e0bd26b19534d760271b367088d05660c036eb58f870411b7ca4c0c7 SHA512 190d5fe9e583a5db62bb34ff228ee77e1f8bbb89c41943759d007f73571bb739ace842e7eda36b6eb50a63b212f8a73a4552a51e035f50aa4c9ab3414bccab4a
+AUX 1.0.16-path.patch 479 BLAKE2B 17108f1ff61d1ff3e4625f86589b6cc372cef6e849851df193093bef8f9fd43706f70eaec98544c3a2e4da20298b21c597d87dc56354e6317859f05b12bc9c38 SHA512 6ecc5cc11e65db11617b1ba902a414900e7e4f0ac319c60e4d5131769560b07a1dac3496b33dd07d44cf9ea6d95924114fb9361ef7b15235604a53b2b517bb53
 DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
-EBUILD cw-1.0.16-r3.ebuild 1552 BLAKE2B 879d4516147ee9632c02bef1b8e00191eec2014cecd94b66b9c3a2dd3a75ac8745d300c40c87e14e3db87174ccc36732177f386b51c860b0442980a8de6ae0c7 SHA512 d298a475374013aad061c6555c14ec9b819ca34f24f2eb511951ea5ac4baf14a248e8235bcf5ee7904244f8fa6ef5b5211da16aaca0a305d8644ea51f0a87378
+EBUILD cw-1.0.16-r3.ebuild 1536 BLAKE2B 48af35f48ed2693c7ce6307dc7eb1f178d5d039a4a34abb6811943be3a8cd31392ddf5ff847097a3b1f14ffbb35acb8107ecf06cf246774c1449d94ff2b87263 SHA512 c537ae708fb5ab3439edb76b525f8dfa8c406ddc3e2777c3c2b1a84b605dee34a0a513d1f2bfe4d48e2582b5f94eb533cfa44f263a517e2a256e5e704455cc13
 MISC metadata.xml 343 BLAKE2B 809bbff73b5e90cb0c958b05b619ff6e6e00a72fb6c174a7d010e29a4f28a4c7a6d26cf2aca92b8b3cfc3604d6dca7fc592f857618a1b2e6c6cf038c30b55e66 SHA512 d0aa39ed1e7fe08244130357fe59579405e1f2d08675bf3979fc1d3944033da32f58926a5857e3a526417709af1351fb443f91657ce4e7b3da0aa8405a60b3a1
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
index 5a667b143f95..3a0b86621c4a 100644
--- a/app-misc/cw/cw-1.0.16-r3.ebuild
+++ b/app-misc/cw/cw-1.0.16-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
 HOMEPAGE="http://cwrapper.sourceforge.net/"
@@ -12,15 +12,17 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-path.patch \
-		"${FILESDIR}"/${PV}-collision.patch \
-		"${FILESDIR}"/${PV}-format-security.patch
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-path.patch
+	"${FILESDIR}"/${PV}-collision.patch
+	"${FILESDIR}"/${PV}-format-security.patch
+)
+
+src_configure() {
 	tc-export CC
+	econf
 }
 
 src_compile() {
diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch
index 52bb8cab8f3b..78ca0f99e395 100644
--- a/app-misc/cw/files/1.0.16-collision.patch
+++ b/app-misc/cw/files/1.0.16-collision.patch
@@ -1,5 +1,3 @@
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..a7811d8 100644
 --- a/src/cw.c
 +++ b/src/cw.c
 @@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
@@ -11,8 +9,6 @@ index d7b4875..a7811d8 100644
   return(0);
  }
  /* sets left and right borders. */
-diff --git a/src/cwu.c b/src/cwu.c
-index 823618d..63f566b 100644
 --- a/src/cwu.c
 +++ b/src/cwu.c
 @@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch
index 20f0b1d06b1e..ceb92c69a096 100644
--- a/app-misc/cw/files/1.0.16-format-security.patch
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@@ -1,8 +1,3 @@
- src/cw.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..3ec1ac1 100644
 --- a/src/cw.c
 +++ b/src/cw.c
 @@ -643,7 +643,7 @@ void sighandler(signed int sig){
diff --git a/app-misc/cw/files/1.0.16-ldflags.patch b/app-misc/cw/files/1.0.16-ldflags.patch
index 46037312c6c3..4063de48d7f3 100644
--- a/app-misc/cw/files/1.0.16-ldflags.patch
+++ b/app-misc/cw/files/1.0.16-ldflags.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9a6e4ec..e510493 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -19,11 +19,11 @@ all:
diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch
index f62b5bd994d4..76c3fbf1d673 100644
--- a/app-misc/cw/files/1.0.16-path.patch
+++ b/app-misc/cw/files/1.0.16-path.patch
@@ -1,5 +1,3 @@
-diff --git a/bin/colorcfg b/bin/colorcfg
-index cf73b50..3e78c73 100755
 --- a/bin/colorcfg
 +++ b/bin/colorcfg
 @@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"