kmod reads from /lib/modprobe.d not /usr/lib/modprobe.d

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

4 files changed, 102 insertions, 8 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index bde6f35b34f1..87992e4a30df 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,11 @@
 # ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.54 2012/11/08 06:41:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.55 2012/11/08 22:20:51 williamh Exp $
+
+*kmod-11-r1 (08 Nov 2012)
+
+  08 Nov 2012; William Hubbs <williamh@gentoo.org> +kmod-11-r1.ebuild,
+  kmod-9999.ebuild:
+  kmod reads from /lib/modprobe.d not /usr/lib/modprobe.d
 
 *kmod-11 (08 Nov 2012)
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index ac550e656824..e49accdd4251 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -8,15 +8,16 @@ DIST kmod-9.tar.xz 1122668 SHA256 0607267cb62dbc9009d0719f442a56f97f64d9983e20db
 EBUILD kmod-10-r1.ebuild 2289 SHA256 201a5db33cdaac82378c5dbc05d20be2aa8f5046df3137f3afaeed2c7cbe3890 SHA512 93b65b638145ac7022f7e0ab1cf9571991d46430f670caf761c4bc8a05056a4252332d22e57d7a11102207fba2b962060ea6a8208b07d6ed67c5342a766090cc WHIRLPOOL b583e02ae70906dd5fdeceae5853df6d1212bcc3f2aac4387a4fc2b04187e9894a44174299a11c650a08f08c4eb99bf724e67658c0d7e9b337a99a9f5258db9f
 EBUILD kmod-10-r2.ebuild 2141 SHA256 c6a4d968367d74830801696567695bef7e05bc76b4be15c28c0aa6833f2b7d1d SHA512 797f2b7226d7b31e9d36abc30f5c390fa863e4208d54bb7c3c26617659fdb5a3e2040cfe0d605ebc7c3fa418aa055c8a577a96fa9b382c69165c150df6c82d90 WHIRLPOOL f5ce1a0fba08b09a7ebcbd7eadffe4cc58a1d31cd382fbb5a484264b5c8c9ed222f6d90331de3214252e441ab804e2f2ffc027454861df2391d01ff7ba0ab723
 EBUILD kmod-10.ebuild 1948 SHA256 cca29e4aa15607d318a98fb19be52bff07d9ddd9ce05ed750f787a42940f8f2e SHA512 e3d9d21f3704fb33ccfe9cebb60f7da87970095f707e4653c4182b9fbe8df011e3f53c8a902cc317b50772b865f4dceeb440e192a4007fb31914829370de215e WHIRLPOOL 2d104e0ade86c355729390b33ef4d072c3ff782b3dd2b72bf21901fab4780dde6c1ef816388eae948d62ed282c897383ee906f6273bc12aac6f373d4911312cb
+EBUILD kmod-11-r1.ebuild 2140 SHA256 f3288d1be5a0ad418188325a3142266f15bd774713f1ecc1b69adaa546e32a2a SHA512 b34043032a4836f06243c34120b5488ccb4b96a59614db0be98fb31cb259952c3c92d4fac095df6b3047fa748a2910c723e661cb8d82211e6eca51a7f6c66494 WHIRLPOOL bf3c592f6fd62aea237f37d3338e4e9c93f05064af91b88691bf2e92714c6ee4c383ffbcaf33c7e9167d26d71debc4fce3e2f22253f10c329469c0b5162a2cf8
 EBUILD kmod-11.ebuild 2141 SHA256 6fdb278edad14980275af88ba3f0432c96dbae16fba5853807cc16aeff784e56 SHA512 69f5a75bee9aeb6169b0933fc3a8d0650395c1cb19850e32d9f2a6667fff82cd62ba4f0d2527aded3cfccc59e2d23f76630fbd6ee1ce514ced3525d306626f72 WHIRLPOOL cfd72a1c9c3608203c45b1b1e0117bf00adc0cdca9ba7b44eb9e5f293a2c81d67dc5320dd0eb5028b3912cef7ea543ef521ccaa047b23cf818d89ad8135e8b0b
 EBUILD kmod-9-r3.ebuild 2081 SHA256 12c580ecd3d18f264e1529d71d00be986239f6b47fdf2c03eaaebba843c965b1 SHA512 2b3f6a95e16dbd43bab3c221157384ebecd55be2572f1eb45f2ec91c45d067c95b6d81cbb49519e68387549ec5728342ee3dee80f109a0f32a6540e18ce616d5 WHIRLPOOL e03c95cf0983b47c1353e8b10fda9f97b1a28e98429ab2172fbf7f9aa7da64fe392246b64335c89eacb21294ced38887bbf688a3d585acfd4ae5694f5155d0e4
-EBUILD kmod-9999.ebuild 2144 SHA256 2494960af81fdb4aebe0b256aee5904b5d55f3b389c89d810144852adda80437 SHA512 a519461193ff079851e4bee93ca4b01ee9e0f5284a039b093883dc8b05b1fc670e9eef41bf84e2dc603e8b363ee058141b71844cf2a57db97bbd8068259af17c WHIRLPOOL e0e6b7bd19b5dc2c93320c856cb7c33f588ee766fd0bc6d40b1f9f36305c12db5985565b74f0693e76455c44b824086d76db595c8a1013ff2d55b78709f27f7c
-MISC ChangeLog 7908 SHA256 f12d7a3e3ad6e483cbc7e1892acdba3fb69275303912709337e39844bbd7fe7f SHA512 8b22d1d81ac24ce1c34fcb04d8537d72a9120b399154ad593605d769ec3149cc94673e12c1af645fce8d8b1fe15e279705c71d986aa4c1f86ec407ec0867e3bf WHIRLPOOL 6ac876eb4afb8819a1ce998663a752ab07a2a1b18e6f0bcd84dc691017e84069816a29ddf1813b2c3845230e9ac1cadab2275cbbb1425aa85d4fa40d6900f2b0
+EBUILD kmod-9999.ebuild 2140 SHA256 e287ae563eca67ef9ce84d9946e0709ea7f1da5c1447ddf0448409b52f5ceb73 SHA512 3facb1ab4a23ebe08f1dfa8612e4f1a8276b773dc19bdbba885d9fcbd3a6b516b58c8049f17ff9eab624ea36c539347878139e63157354f85a867ab8eb173894 WHIRLPOOL a2a9d9e4b36e8eace8707fcc44fa3acfcb6dd50527c0635e8f128605351bac016142d7820e942782c2d6fd90686defee7d315d1389d9e9d03eae27881aeb7bd9
+MISC ChangeLog 8085 SHA256 ac7ee3e5c1e1f0e9075c444db7601857194eda22c9bbbc675673aebe71ddde07 SHA512 cd1b43dab849e7564d4bfc4f8e2adcc9929dcd3e5a91fcd95cdf8fccb6ab118e4cd88507e84c4c0642c1ee3f3ff6c63bb48898830fa43bb2ed5abc40ffa0e449 WHIRLPOOL 4f236fc0f44f7510b62eda6c7a651b32ffb8daadb7ecab467d43eb9da6956ef4299485a4cb947cabe610371b8e30c6ae7b8fd8339476a2abe5629c6f33f21240
 MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCbVAgACgkQblQW9DDEZTihkgCguT4Ovoj0PEOdKV2nNW4Z8YIr
-1dgAn2/BUh8R11A7ZwIv+KroDrDlf/r1
-=Gm8j
+iEYEAREIAAYFAlCcMEQACgkQblQW9DDEZTgKiACdHnnk0Nk7JcT7i0kaJs/+wO/3
+d64AoJz7ofj09gq6XEf/OaKunsfS5Qqz
+=RH9i
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-11-r1.ebuild b/sys-apps/kmod/kmod-11-r1.ebuild
new file mode 100644
index 000000000000..0cebeefa221c
--- /dev/null
+++ b/sys-apps/kmod/kmod-11-r1.ebuild
@@ -0,0 +1,87 @@
+# 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-r1.ebuild,v 1.1 2012/11/08 22:20:51 williamh Exp $
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs libtool
+
+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 )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	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 \
+		$(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 /usr/bin/${cmd}
+		done
+		# Compability symlink(s):
+		# These are both hardcoded in the Linux kernel source tree wrt #426698
+		dosym /usr/bin/kmod /sbin/depmod
+		dosym /usr/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 bbbc746a1385..423d0902c5c4 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.36 2012/11/08 06:41:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.37 2012/11/08 22:20:51 williamh Exp $
 
 EAPI=4
 
@@ -82,6 +82,6 @@ src_install()
 	softdep ohci_hcd pre: ehci_hcd
 	EOF
 
-	insinto /usr/lib/modprobe.d
+	insinto /lib/modprobe.d
 	doins "${T}"/usb-load-ehci-first.conf #260139
 }