[gentoo-commits] repo/gentoo:master commit in: sys-apps/modutils/files/, sys-apps/modutils/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/modutils/files/, sys-apps/modutils/

[Mikle Kolyada]

commit:     bff33c51712c70e9ba0a44c6137219d5b6a8bcb8
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 19:26:37 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 19:28:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff33c51

sys-apps/modutils: port to EAPI=7

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../modutils/files/modutils-2.4.27-alias.patch     |  4 +-
 sys-apps/modutils/files/modutils-2.4.27-gcc.patch  | 44 +++++++++++-----------
 ...-2.4.27-r1.ebuild => modutils-2.4.27-r2.ebuild} | 16 +++-----
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/sys-apps/modutils/files/modutils-2.4.27-alias.patch b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
index 1fefffb62f8..3ca73398440 100644
--- a/sys-apps/modutils/files/modutils-2.4.27-alias.patch
+++ b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
@@ -2,8 +2,8 @@ Taken from Debian.
 
 Update misc alias cruft.
 
---- util/alias.h
-+++ util/alias.h
+--- a/util/alias.h
++++ b/util/alias.h
 @@ -52,7 +52,11 @@
  	"binfmt--310 binfmt_java",
  

diff --git a/sys-apps/modutils/files/modutils-2.4.27-gcc.patch b/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
index 3f90a9b2b2d..e2d5a37e89f 100644
--- a/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
+++ b/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
@@ -2,8 +2,8 @@ Fix building with newer gcc versions.
 
 Most changes taken from Debian.
 
---- obj/obj_ia64.c
-+++ obj/obj_ia64.c
+--- a/obj/obj_ia64.c
++++ b/obj/obj_ia64.c
 @@ -127,6 +127,7 @@
  	return (*(bundle + 1) >> 23) & 0x1ffffffffff;
  
@@ -12,8 +12,8 @@ Most changes taken from Debian.
      }
      return (-1);
  }
---- depmod/depmod.c
-+++ depmod/depmod.c
+--- a/depmod/depmod.c
++++ b/depmod/depmod.c
 @@ -1133,7 +1133,7 @@
  
  		for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
@@ -49,8 +49,8 @@ Most changes taken from Debian.
 +	return depmod_main(argc, argv) || error_count;
  }
  #endif	/* defined(COMMON_3264) && defined(ONLY_32) */
---- genksyms/genksyms.c
-+++ genksyms/genksyms.c
+--- a/genksyms/genksyms.c
++++ b/genksyms/genksyms.c
 @@ -45,7 +45,7 @@
  int flag_debug, flag_dump_defs, flag_warnings;
  int checksum_version = 1, kernel_version = version(2,0,0);
@@ -85,8 +85,8 @@ Most changes taken from Debian.
 -  return errors != 0;
 +  return num_errors != 0;
  }
---- include/util.h
-+++ include/util.h
+--- a/include/util.h
++++ b/include/util.h
 @@ -39,8 +39,8 @@
  extern int xftw(const char *directory, xftw_func_t);
  
@@ -98,8 +98,8 @@ Most changes taken from Debian.
  extern const char *error_file;
  
  extern int flag_verbose;
---- insmod/insmod.c
-+++ insmod/insmod.c
+--- a/insmod/insmod.c
++++ b/insmod/insmod.c
 @@ -275,7 +275,7 @@
  		if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
  			gplonly_seen = 1;
@@ -149,8 +149,8 @@ Most changes taken from Debian.
  		if (!noload)
  			delete_module(m_name);
  		goto out;
---- insmod/kallsyms.c
-+++ insmod/kallsyms.c
+--- a/insmod/kallsyms.c
++++ b/insmod/kallsyms.c
 @@ -80,7 +80,7 @@
      error_file = "kallsyms";
  
@@ -160,8 +160,8 @@ Most changes taken from Debian.
  
      /* Process the command line.  */
      while ((c = getopt_long(argc, argv, "Vh",
---- insmod/modprobe.c
-+++ insmod/modprobe.c
+--- a/insmod/modprobe.c
++++ b/insmod/modprobe.c
 @@ -1023,7 +1023,7 @@
  		if (quiet)
  			my_argv[my_argc++] = "-q";
@@ -171,8 +171,8 @@ Most changes taken from Debian.
  			my_argv[my_argc++] = "-s";
  
  		if (insmod_opt) {
---- insmod/rmmod.c
-+++ insmod/rmmod.c
+--- a/insmod/rmmod.c
++++ b/insmod/rmmod.c
 @@ -261,9 +261,9 @@
  	read_parm.m.read_start = mp->sym->value;
  	read_parm.m.read_end = read_parm.m.read_start + datasize;
@@ -185,8 +185,8 @@ Most changes taken from Debian.
  		return(0);
  	}
  
---- util/logger.c
-+++ util/logger.c
+--- a/util/logger.c
++++ b/util/logger.c
 @@ -31,10 +31,10 @@
  
  /*======================================================================*/
@@ -234,8 +234,8 @@ Most changes taken from Debian.
 -	log = 1;
 +	logging = 1;
  }
---- obj/obj_kallsyms.c
-+++ obj/obj_kallsyms.c
+--- a/obj/obj_kallsyms.c
++++ b/obj/obj_kallsyms.c
 @@ -200,8 +200,8 @@
  
      /* Initial contents, header + one entry per input section.  No strings. */
@@ -258,8 +258,8 @@ Most changes taken from Debian.
      p = (char *)a_hdr + a_hdr->symbol_off;
      memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
      free(symbols);
---- obj/obj_ppc.c
-+++ obj/obj_ppc.c
+--- a/obj/obj_ppc.c
++++ b/obj/obj_ppc.c
 @@ -25,6 +25,7 @@
  #include <obj.h>
  #include <util.h>

diff --git a/sys-apps/modutils/modutils-2.4.27-r1.ebuild b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
similarity index 76%
rename from sys-apps/modutils/modutils-2.4.27-r1.ebuild
rename to sys-apps/modutils/modutils-2.4.27-r2.ebuild
index 2786427b0ea..a693294a408 100644
--- a/sys-apps/modutils/modutils-2.4.27-r1.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Standard kernel module utilities for linux-2.4 and older"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/kernel/modutils/"
@@ -12,17 +10,15 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE=""
 
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/kmod"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-alias.patch
-	epatch "${FILESDIR}"/${P}-gcc.patch
-	epatch "${FILESDIR}"/${P}-flex.patch
-	epatch "${FILESDIR}"/${P}-no-nested-function.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc.patch
+	"${FILESDIR}"/${P}-flex.patch
+	"${FILESDIR}"/${P}-no-nested-function.patch
+)
 
 src_configure() {
 	econf \