[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/, app-misc/cw/files/

[gentoo-commits] repo/gentoo:master commit in: app-misc/cw/, app-misc/cw/files/

[Sam James]

commit:     b1fa39d563324775ecdd4dfb606750381cdfd954
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 21:32:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 21:32:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fa39d5

app-misc/cw: port to EAPI 7 (for now)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/cw/cw-1.0.16-r3.ebuild                | 24 +++++++++++++-----------
 app-misc/cw/files/1.0.16-collision.patch       |  4 ----
 app-misc/cw/files/1.0.16-format-security.patch |  5 -----
 app-misc/cw/files/1.0.16-ldflags.patch         |  2 --
 app-misc/cw/files/1.0.16-path.patch            |  2 --
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
index 5a667b143f9..3a0b86621c4 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 52bb8cab8f3..78ca0f99e39 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 20f0b1d06b1..ceb92c69a09 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 46037312c6c..4063de48d7f 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 f62b5bd994d..76c3fbf1d67 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. ]"