gentoo resync : 12.07.2021

5 files changed, 3 insertions, 75 deletions

diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index b4c95a1824b2..09dbeda01c14 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,11 +1,7 @@
-AUX ethtool-5.8-avoid_bashisms.patch 674 BLAKE2B 75b1fdd5980b91348eed8dbbfae00855e2c7f66e2ef4f95b2c8bc679b7d6759358c4d464825956bbb8ab01773d23af7cbe5bdc98eed856baa4589ac44b2cc172 SHA512 0755b7c05026935762b89ff58c083b4dbcc02227400285b0b64e5421f02c2c9c1fb373c8ba43eabe3d38110898fcdbbf664d6f1aff6e28d33759489339d1262b
-AUX ethtool-5.8-only-memset-non-NULL-link-settings.patch 703 BLAKE2B b5c2dca415555f1aa7411296abc3501a33018290772c14adc2ca5a73ad39e11a62d1033042ad0ab644b141c9438168edb995a2d2f877ce62ad834c26776a6739 SHA512 c6014e931ff2f96f26b5dde6b5ab99ac7592ff4077af15eb8612ded35186c09490ccbd6d4a00bff46e40da5d18a26c2b6d6e6664f581c7c111ff18e2dd6d049f
 DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b240ab3e3300fa11d42769b664b1b5740ad6577daf4ef1b1054432e2323429ee63774af5e0210c1ec1c7d6aa4ac SHA512 128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6
 DIST ethtool-5.12.tar.xz 311004 BLAKE2B 640d4a1576afea60c673a6060b649d10ccb2d2be64a817e4d74daeb6de4da2d30ccb059ff1113e05f9c44898f08beefd706be2ea6e323c42032c4d93926d380a SHA512 9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002
-DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
-DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
+DIST ethtool-5.13.tar.xz 318204 BLAKE2B 5e693368ce56fa155c5d371bc650e5fb7e8e1c8fd30982b45a674da63119e54f005484bea68c7b85e8d070efbf7aa15e92637e7a3b8b2010b4022851154a6809 SHA512 44426653aabd20707d2e597707113f4d30d12696b4f32c0ab0450af0dccece1b6a11e529a22d1299204f63c9e71ae41a1495d3d36b8f630f1734a72694d779be
 EBUILD ethtool-5.10.ebuild 584 BLAKE2B 60f911d7aeda794812f546fabb92eede1e079091882bc6e6263c12f0695b667065d1677314c84566978a89d7662786db45ddcc436c9603c35083ce169c563f4a SHA512 acb3529e9b7ed1e22d9ce910f7ad39121f4e5fb340b90edbfb58c046c8d3fe95e665b692f279bdbd210c34bba4cf04bcb5c67a3c60744d651b3b1affd49c7d9d
 EBUILD ethtool-5.12.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
-EBUILD ethtool-5.4.ebuild 459 BLAKE2B 10c7df1a3e8df3cc1d1d2eabb54fd33fb1d59bc99486aaf5b1545bf62c663e5f4544b24e8bf7776fc9f92aacff48f2a86b38f4de80d98d4d8702e63f4be2b939 SHA512 bee519fea3dd8981660009d6a40c004d168a0fe9c06a7f45ff9a9cb757fc44889741fcc8df6ba97feefdea5961a44ab338344d51cc3bf6e85fc71b080c19cbbe
-EBUILD ethtool-5.8-r1.ebuild 704 BLAKE2B 7d5dd8bc5702829eacf956bb324dc8002ea9caf9e4f7d62df11fbf47d60dadf15b1f99c0802b4364c54f6ac6a2e387928a0ed4da28252692984156516f877a0f SHA512 2ed3b6e06e2dfcc4d76c58f7b4db449298bb43fdaa3223efe38db27ddf630af690fe19886e4ac6a472b9e31d868d44940df3d268926edb9066e65baefcd32fb3
+EBUILD ethtool-5.13.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.8-r1.ebuild b/sys-apps/ethtool/ethtool-5.13.ebuild
index 8e1cf0073e37..4ddb6be7e3ff 100644
--- a/sys-apps/ethtool/ethtool-5.8-r1.ebuild
+++ b/sys-apps/ethtool/ethtool-5.13.ebuild
@@ -9,18 +9,13 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+netlink"
 
 BDEPEND="app-arch/xz-utils"
 RDEPEND="netlink? ( net-libs/libmnl )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.8-avoid_bashisms.patch"
-	"${FILESDIR}/${P}-only-memset-non-NULL-link-settings.patch"
-)
-
 src_configure() {
 	econf $(use_enable netlink)
 }
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
deleted file mode 100644
index 159377da21d0..000000000000
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-BDEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch b/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
deleted file mode 100644
index 9cd9fd86fb70..000000000000
--- a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Running this script with dash results in an endless loop spitting out this:
-
-  ./test-driver: 62: [: --test-name: unexpected operator
-  ./test-driver: 78: [[: not found
-
-This is caused by two bashisms which are being fixed by the below patch
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- ethtool-5.8/test-driver
-+++ ethtool-5.8/test-driver
-@@ -59,7 +59,7 @@
- while test $# -gt 1; do
-  arg=${1%=*}
-  val=${1#*=}
-- if [ $arg == $val ]; then
-+ if [ $arg = $val ]; then
-    val=$2
-    shift
-  fi
-@@ -75,7 +75,7 @@
-   --) break;;
-   -*) usage_error "invalid option: '$1'";;
-   esac
--  [[ $arg != $val ]] && shift
-+  [ $arg != $val ] && shift
- done
- 
- missing_opts=
diff --git a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch b/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
deleted file mode 100644
index 573ee645615b..000000000000
--- a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/740114
-https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=cf12872ebe7d8fac2088e7d2cd5e2a0a5f03499d
-
---- a/ethtool.c
-+++ b/ethtool.c
-@@ -3048,10 +3048,11 @@ static int do_sset(struct cmd_context *ctx)
- 		struct ethtool_link_usettings *link_usettings;
- 
- 		link_usettings = do_ioctl_glinksettings(ctx);
--		memset(&link_usettings->deprecated, 0,
--		       sizeof(link_usettings->deprecated));
- 		if (link_usettings == NULL)
- 			link_usettings = do_ioctl_gset(ctx);
-+		else
-+			memset(&link_usettings->deprecated, 0,
-+			       sizeof(link_usettings->deprecated));
- 		if (link_usettings == NULL) {
- 			perror("Cannot get current device settings");
- 			err = -1;
-