From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 18 Aug 2019 16:24:08 +0000 (-0400)
Subject: sys-apps/kmod: drop duplicate symlinks for lsmod, modinfo
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=26f3758bf8f9d38e0961c94797b601307a54c5e7;p=gentoo.git

sys-apps/kmod: drop duplicate symlinks for lsmod, modinfo

Closes: https://bugs.gentoo.org/692328
Package-Manager: Portage-2.3.71_p6, Repoman-2.3.17_p5
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/sys-apps/kmod/kmod-26-r1.ebuild b/sys-apps/kmod/kmod-26-r2.ebuild
similarity index 96%
rename from sys-apps/kmod/kmod-26-r1.ebuild
rename to sys-apps/kmod/kmod-26-r2.ebuild
index a10a6cdda8d6..73c5f95d06b5 100644
--- a/sys-apps/kmod/kmod-26-r1.ebuild
+++ b/sys-apps/kmod/kmod-26-r2.ebuild
@@ -150,14 +150,14 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 
 	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${sbincmd}
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
 		done
 
 		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
 		done
 	fi
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 0e0722934952..1da1e59fb5c2 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -143,14 +143,14 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 
 	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${sbincmd}
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
 		done
 
 		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
 		done
 	fi