gentoo Easter resync : 12.04.2020

4 files changed, 34 insertions, 38 deletions

diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index a32923381db5..59d4f1bc80d7 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -1,7 +1,7 @@
-AUX modutils-2.4.27-alias.patch 2246 BLAKE2B 6d3af5179d74d0469f1fffabf31c85113de52c261d8c95e0361b9133d8985d58a483c7eb1d92ad0a3fadd197b3043c4f55c0873d9a9d0eb9ccad7d31621026a1 SHA512 e843cdcdca309646d8cb9db148db61bb6d9605068fbfc006be7c392d3349856c101899f26d39e3778a674bc9b64830bdc273484d1ccf37994eaca1cff594edc6
+AUX modutils-2.4.27-alias.patch 2250 BLAKE2B 623b62fa8aa70a2a28b7da0f60c92a4fd2178015c9de855b071df0fbe1a85b55d6d4604fb57ca518d22054288f16c8362483f15290714c2479596878a92c3cbd SHA512 06ffe92cab08411158324c0c9420185bc3726ff43ece6567f294a8c9d324ef588685462ce670bbc80661d5e3da6d55d856efed3ca71891e60e3b6ab5b66d7179
 AUX modutils-2.4.27-flex.patch 805 BLAKE2B 0efc0b03204181dc456667bdf2a15e2765c4ea50ef9213d090eacddcb72adf95e597547520df2694bb59e7c0c5f01cbb714d8290f71b6d7d5f45592e9cfc1c9a SHA512 2d427b2c9b5d45866a704caa3b564c986106aeb1c60898efa54c7272bcb536fa13a46df6970a8a0b6020bdbe4c86903503a2ec0e15092d0c254f9b5a940c2374
-AUX modutils-2.4.27-gcc.patch 6963 BLAKE2B 5748076f00175717b22cb27f5e580b99aa0630928afe0572bca707d2cf14949171f1d114fd2152cac01c0481d4c271e435892cc3fca1f9b48e777b9d1fc34e33 SHA512 1d2f0f2118ab40310cbd90d73da5300530c8b41bd5fc3832f8cc09914bfe9efba7161b80c1d29b216ba92bceb8b4f066eea1bf9bb2c6affdc9b35e12235a1008
+AUX modutils-2.4.27-gcc.patch 7007 BLAKE2B 2aade76f6aeee64a4ca25d2adccadbf5bfdaff25ebac4c317fd4d75339fdc8da5d723ffb54e6efe0fad805d5d4d279648de1ea7436df9dd89fd9c5470c2d7027 SHA512 44024ec0e6be1be4ab52a95726dad69670247665241bddcb11030735be58a4c78569dca8399ace467842f933b0fc15f4c3767a465ea433fdcea74c8c68a5d584
 AUX modutils-2.4.27-no-nested-function.patch 1422 BLAKE2B 3f1b2e95ef05815bee49666863f767e416cc67dfc4566011f59dc1ba49064c1810a31b4a91c5dcbbad0a5f47f33431644834dc872637532919cc0e2077f830d0 SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a
 DIST modutils-2.4.27.tar.bz2 234963 BLAKE2B bc5d91554906d15c258bf27f9b3f28bcc1fdc13413ebcece0f763d28d70f61cc27243fc20eb72e2f28d90cac8f19fccdfd633ea978a0f6c809d10eaea83c24d1 SHA512 5a638ea757f9d2cd7e91a8711eadfc6c723ca3b75757363620c8128772b9c00ddeb46af853711ce4c845096ad322a1dd2e8429be3d2e0a371ca93b1c81aa089d
-EBUILD modutils-2.4.27-r1.ebuild 942 BLAKE2B 3df5580e58b70f742460fea479ff2b527b8a9b33456ee012db8d9448cb6cd2380628cfd391bb351ea234f4a5898d32e6b9f8e6a44c7260f31d5174bbaee89a57 SHA512 4bb66f8116d85549bc2774629e1f1653c358340ed2fba8ea57574701dace1cb91e6175139a93f9861d58ca3adf36dbb331677bdc7cb6fdb1b6639e5e4d40ab03
+EBUILD modutils-2.4.27-r2.ebuild 848 BLAKE2B 9152e41da23fd58f64c4c0bc078d8b75596b54aafcca5ed0508eabb419fad4a34d0d3e53a6170814424543f51f361a62b20216661d1a2eaa3b6a6035b71ee5dd SHA512 46cee77d0423b80f6defc14ba16ea9a09fcbd64ddd8f06d64e1c719a7a87b00a24c564ea14fb241a8ced8c201a0339df89c33ecbf2dbe631678f0e9039bcc4a8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
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 1fefffb62f85..3ca733984402 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 3f90a9b2b2de..e2d5a37e89f5 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
index 2786427b0ea0..396d4691041e 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/"
@@ -11,18 +9,16 @@ 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=""
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 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 \