Upstream recommended to me that we install the kmod binary in /bin. Also I have put the syminks there except for the compatibility symlinks for the kernel.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 117 insertions, 17 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 8e88aae7f754..324eeb3e4f32 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.60 2012/11/25 09:42:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.61 2012/12/04 04:16:52 williamh Exp $
+
+*kmod-11-r4 (04 Dec 2012)
+
+  04 Dec 2012; William Hubbs <williamh@gentoo.org> +kmod-11-r4.ebuild,
+  kmod-9999.ebuild:
+  Upstream recommended to me that we install the kmod binary in /bin. Also I
+  have put the syminks there except for the compatibility symlinks for the
+  kernel.
 
 *kmod-11-r3 (25 Nov 2012)
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 185385d4ca13..bf425ab9bebb 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -5,17 +5,14 @@ DIST kmod-11.tar.xz 1274992 SHA256 28604e153833571ff6ebf34ad1722d3aca4d3d1760ad0
 EBUILD kmod-11-r1.ebuild 2158 SHA256 ffa70230e93f5749cb846c2630ac7bef66fc8f50717c1c1bf2985e3de0679ee6 SHA512 53cffc56408e707cac0239e311b0ec6e90bac1851fdfb21bfc12c5626041541e14eae505172b17bb8d2caff8e0e8f4ff8d8036d69519d98b2b4be7502141a98c WHIRLPOOL 7507f630d1f0f27b0c8f39a5cabc876acd82d1fb08ea799a1e09bbefa7d290934369a4d73006ed6d452d5c5e19b060be58dc175340fcf2118feda9861b9a5cb4
 EBUILD kmod-11-r2.ebuild 2063 SHA256 0d5fcd06d9c494d20b32f2689e28f69141c4fe0a64f23e4b18d84039150cdede SHA512 b3189420cd6758bcfa460aa48c75a18a45df32c59d6f5b034dad17610c7636a26da07f31ede80bc247f5ca59315be5c0cb79a9aea47a2d99e30dd7fa8b14ea6e WHIRLPOOL ab3a4f18f88ef3f23aa45f02b0db5e0ce376e94eb551b0c147c311c55ade5d185be38d1b60f58949d316bc34dd6b778ebab36c496fc4ef0d658a26c2522a4a86
 EBUILD kmod-11-r3.ebuild 2067 SHA256 6957c0ec971a780ed4865ce5d98f579f1b767f9c3d6d5de95dc9937fdd980ab9 SHA512 aff872230345db9d596dda6b70fa296fcc8cf3ad9d09877a0d8f316f1601c021e9ed92d6d8fc945901b768eb74f017b8b3d6dabba25a85545079f15cb43a1097 WHIRLPOOL 4705b53dec3421513c7d8511c2f60d731680d97ca2703e89c820eda2f6391f4ac1b3e4e42bc02de7dc592a4759a87e9378de1b479bfe16ce9935359ca18572da
-EBUILD kmod-9999.ebuild 2067 SHA256 38e45fc358127f2c5a909d0d9f7b409a2635cda56be8f9bc760c8f859ddcc665 SHA512 6bf99e6fe3fa9c1604d45ef39eb71e326a5c2165e59d57c6cf079501cd48a88e712643901baa24b8cb5443aa3abf10e934a2ba06713ec5a474616e1ff7137b9b WHIRLPOOL 2d5cd1ff22462469e237f3a51005948d915c2f501fa35a7e86b17298de3641bcd91d86a8851f20a74165cd0c2dbfca74b1246a040cd77508505a95ef86a1f575
-MISC ChangeLog 8822 SHA256 ff9311eb91705d558fae42d44ae729330f0b24457b4e08c9a8f9495fafeeaf5b SHA512 542926373ab36350a768172c895e3d26ab72f58c3703717e6d2bf684be84b8f40e8ad728d12959f4452b6e8251b27b6e6cb4af4b9f3ed1e61bd90e96c908a21e WHIRLPOOL 7e4af2a0973eb6847f21c2d9ad38bec4d23fc09fcee74a839f6c734126c4d67a6c4652bfe2f5b2c07d5ca87535c7438c9b4095c9f24def9432952bded22fdd5f
+EBUILD kmod-11-r4.ebuild 2235 SHA256 5d0341719db9dea61c4a886a70d0fa1f6c90916ffdd9c885f3e71023e543c766 SHA512 e529a401e11cd71d81171a37503de4ff8c20c489f7b049c8311d6b100c661c6a4f125db05d55fbeffc76c3f204dac39de097768ccc78d979e795c3b7db43349a WHIRLPOOL 0ea13b4da7793c1fe357034e9ff5b7d8427a0d4ea320114996d89f95aa6ade3d90d02d1bb93312973083378542f5442b807959c56774fb92cf1b710266ced936
+EBUILD kmod-9999.ebuild 2235 SHA256 bfa4dc4ab20938ad3227eac2751a8265957604fc551bc89288969cd0cf512039 SHA512 676e5baab5bc959eb9a335f76c5fba88f202d3e5aa931ac96daaf296f3048207cc6ff503134e3eb347413417ed455e69d3e8b15baca2779a099d434fe344fffe WHIRLPOOL 52a3da7f8a031c640450cf1780a9812a74a5a52fd41fc6f94f4a2e6122909ab889650dcb8ad7613d8ecbb3fdc9646cc5856fe859fbacbfed41c6f47ee2eb492b
+MISC ChangeLog 9102 SHA256 2a80a2c5f85a4fbdc3b90c1f54bea29b8ff154f0dd683711dd8c157ce608bd32 SHA512 7c94c8d882ac51b65df1201fa02feff7d3d6f688cf8563eff951e038937999747472111359421dec38f961a9af3631aab3fbac7e6643255ba17a3f2209bf7c20 WHIRLPOOL f515537e23f740a99b2be02d5f5983e94a68a4e61f575d916f817f922efb1d2dc8730ff32bf7a21e3df584fd5b25aa4695da3a3a8fff723cd64a42e5b5767b44
 MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQsef9AAoJEEdUh39IaPFN86gIAKKle1eCfKEjzbBlPYa6rXj/
-Es6wq9VnxASsf2nGdAloZtemj85Xgjv2BbXr1tDSaa9DslS5/xog8erqlWyLDO/C
-zIt7vK1g27rV0GO0zdAOJt/nwRcX3KFAO1bHHsvOzS1ihNQbRK+yCXw2H1YMJTSl
-4pODyOfsLFh1h4t71JMWhneiE9obN97gbsqe9u7mXEQi2P2x211cbiWjp4G0t0BG
-Y7d+BFsclf8aThD/Ks2JCGT08IncU0R8er/YENKayX7yh25XWdnwjT2Y4IsoEKAn
-HySDD34pYPrD62rdXCMwUb8Bx+LydcslO2eT4/kmzI9eYv74Nn7wr9KxdnUcusI=
-=zY1T
+iEYEAREIAAYFAlC9eUYACgkQblQW9DDEZThNlACgvAj/F8YZN6pjDDdQdsmmc2k5
+ENMAn11ix2/lyBmRBcSPMfbcuvoUkiEL
+=AjbL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-11-r4.ebuild b/sys-apps/kmod/kmod-11-r4.ebuild
new file mode 100644
index 000000000000..9be4aab4280d
--- /dev/null
+++ b/sys-apps/kmod/kmod-11-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-11-r4.ebuild,v 1.1 2012/12/04 04:16:52 williamh Exp $
+
+EAPI=4
+
+inherit autotools eutils libtool multilib
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc lzma static-libs +tools zlib"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	zlib? ( virtual/pkgconfig )"
+
+src_prepare()
+{
+	if [ ! -e configure ]; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	econf \
+		--bindir=/bin \
+		--libdir=/$(get_libdir) \
+		--with-rootlibdir=/$(get_libdir) \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_with zlib)
+}
+
+src_install()
+{
+	default
+	prune_libtool_files
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym kmod /bin/${cmd}
+		done
+		# Compatibility symlink(s):
+		# These are both hardcoded in the Linux kernel source tree wrt #426698
+		dosym /bin/kmod /sbin/depmod
+		dosym /bin/kmod /sbin/modprobe
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index fc5764446f72..95d16394f88c 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.40 2012/11/25 09:42:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.41 2012/12/04 04:16:52 williamh Exp $
 
 EAPI=4
 
@@ -54,14 +54,15 @@ src_prepare()
 src_configure()
 {
 	econf \
-		--bindir=/sbin \
+		--bindir=/bin \
+		--libdir=/$(get_libdir) \
+		--with-rootlibdir=/$(get_libdir) \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
 		$(use_with lzma xz) \
-		$(use_with zlib) \
-		--with-rootlibdir=/$(get_libdir)
+		$(use_with zlib)
 }
 
 src_install()
@@ -71,10 +72,13 @@ src_install()
 
 	if use tools; then
 		local cmd
-		for cmd in depmod insmod modinfo modprobe rmmod; do
-			dosym kmod /sbin/${cmd}
+		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym kmod /bin/${cmd}
 		done
-		dosym /sbin/kmod /bin/lsmod
+		# Compatibility symlink(s):
+		# These are both hardcoded in the Linux kernel source tree wrt #426698
+		dosym /bin/kmod /sbin/depmod
+		dosym /bin/kmod /sbin/modprobe
 	fi
 
 	cat <<-EOF > "${T}"/usb-load-ehci-first.conf