Forward /etc/modprobe.d/usb-load-ehci-first.conf from module-init-tools to kmod wrt #260139

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 114 insertions, 11 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index e64905460662..f288668b2ce6 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,12 @@
 # ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.51 2012/09/20 12:18:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.52 2012/10/20 07:12:46 ssuominen Exp $
+
+*kmod-10-r1 (20 Oct 2012)
+
+  20 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-10-r1.ebuild,
+  kmod-9999.ebuild:
+  Forward /etc/modprobe.d/usb-load-ehci-first.conf from module-init-tools to
+  kmod wrt #260139
 
   20 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove extraneous character from email address.
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 9cc31ea312ef..6234aada4e53 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -4,19 +4,20 @@ Hash: SHA256
 AUX kmod-8-gc-sections.patch 3167 SHA256 d0f9a28f01b3ab7a00f53a97f8d1596977c945f9125e884e9eaa850e1f433281 SHA512 da6f05d784028536e5861c84add81b54f4e6338672aa576c92b95555dc75d18bdd5d6d689d7cc9ba0526866c23913e9bfbbccf3888e376fbaabd9053021e6a36 WHIRLPOOL ef143dd901a8b2dd46cbd45bfd030fb44ae67b7c333ae10dd7761ec5b12e3c7e93cc4e343c9c9642b410eef67051fe2a6542bab20418c805f526e9465ee5dfcf
 DIST kmod-10.tar.xz 1125436 SHA256 deb80df9e6aa34f965ecf329fd07db462b57ce515b9077eae5cdfac5197a7bff SHA512 eb3a875db0ee6882a5b91f0202060a7589048eba0a6ba6627c7640dfde3e74b8bfa631f32cabf9b9c690358e3d61930300d0893ad29ea9a69a22ec609aefdb2e WHIRLPOOL d4ccd0ad341c65cdbb608e93b0bff576d049321258beaac55b285c4ee1c4b6b32dd7aaf0121920a38a0412cfefbb091b98e288fb4239692135c2cad1bf53eefc
 DIST kmod-9.tar.xz 1122668 SHA256 0607267cb62dbc9009d0719f442a56f97f64d9983e20dbcaedfff9073abdcecf SHA512 912404830d46ab27f9472a4ce0272c03b16b36291069f9cf1a51bc533429fe8f46d7a749edc399fb1631a435dea4077728d0a5b16961603fdde339d3e2b14f1f WHIRLPOOL 1f769b640b97aa248dcf8b0360f6733ce498bdac571b8710154c455d9971367c1d16204fd4acf1d898d4e0af93892c0f4c6e23ff62d50d96b75b69d5668ffb9b
+EBUILD kmod-10-r1.ebuild 2289 SHA256 201a5db33cdaac82378c5dbc05d20be2aa8f5046df3137f3afaeed2c7cbe3890 SHA512 93b65b638145ac7022f7e0ab1cf9571991d46430f670caf761c4bc8a05056a4252332d22e57d7a11102207fba2b962060ea6a8208b07d6ed67c5342a766090cc WHIRLPOOL b583e02ae70906dd5fdeceae5853df6d1212bcc3f2aac4387a4fc2b04187e9894a44174299a11c650a08f08c4eb99bf724e67658c0d7e9b337a99a9f5258db9f
 EBUILD kmod-10.ebuild 1948 SHA256 cca29e4aa15607d318a98fb19be52bff07d9ddd9ce05ed750f787a42940f8f2e SHA512 e3d9d21f3704fb33ccfe9cebb60f7da87970095f707e4653c4182b9fbe8df011e3f53c8a902cc317b50772b865f4dceeb440e192a4007fb31914829370de215e WHIRLPOOL 2d104e0ade86c355729390b33ef4d072c3ff782b3dd2b72bf21901fab4780dde6c1ef816388eae948d62ed282c897383ee906f6273bc12aac6f373d4911312cb
 EBUILD kmod-9-r3.ebuild 2081 SHA256 12c580ecd3d18f264e1529d71d00be986239f6b47fdf2c03eaaebba843c965b1 SHA512 2b3f6a95e16dbd43bab3c221157384ebecd55be2572f1eb45f2ec91c45d067c95b6d81cbb49519e68387549ec5728342ee3dee80f109a0f32a6540e18ce616d5 WHIRLPOOL e03c95cf0983b47c1353e8b10fda9f97b1a28e98429ab2172fbf7f9aa7da64fe392246b64335c89eacb21294ced38887bbf688a3d585acfd4ae5694f5155d0e4
-EBUILD kmod-9999.ebuild 1951 SHA256 ab1cdc91a24d7fb696d69e0e4e825e496bc59a6eb1b9f107a9ee091bc797f44d SHA512 2bea27fccad38e96380b9c0aa3c3c280c1ca9ed280147d8d88f81d3919ed277d5387ac4dbf0a4216bc933833f9d587a11c07fef00e3a1fdf487d34d60e6bf770 WHIRLPOOL 0bea5ff51861dace35923005dad956cd743277fd41860e57e3c4c587aa86f770159740a1a25f4f74e645f691fe5d68a93811cf147430413d20e3454cf438c713
-MISC ChangeLog 7335 SHA256 315ade2106d571f4963e731a0e45ad230924c006131d38a1cc0be027543a4b57 SHA512 ddba00b1f1fb0e849e7ddcefc4a8b40f28096826310ffe3fb38ec610eca13424eb22c203468efe4c28cb21da01d628f4b2a0a46205bf8005b6c61d5b2f600cb8 WHIRLPOOL 550dd4f6d710f241011a1ccc3f821caebcce58d2861193d55ae606aad9ad2292c3e5c0506da59200a1e474b20689f1c14f99be6bbedd78c823f41bb304b8f5af
+EBUILD kmod-9999.ebuild 2289 SHA256 1e47036cf77b6bdbd06e930d5f1c889b43cc0aeec1ff5ad0d46aa97f97697143 SHA512 4fa48593b15036fc4e0e53464da739f474f0f906faa7169680b4b26feda9cdde1b20953e496705cff5601599ca5b8ef2a6c123b6bc1233caaa308704f534d629 WHIRLPOOL eb293837d032ac20c239dbe2c06d49861af8cd79164d8a0b5805c85eccd779f6069ec65b1de1db9bbb16833c6fd16c18c625aa928967dcbac9eaa7f275ccb988
+MISC ChangeLog 7553 SHA256 00244ac03caf0ef7e4b2caf7a3d0acb758c51c43cb0be1b2ccd21d45273f146a SHA512 2a9883655c1b5f13148f21b1def916491a16a0d14016006dcca113c09643bbb3a370ce1d755cf4c35421f5c7b5980b3e7b3ae12ec4f083d7c02dc8dd38556daf WHIRLPOOL 80799ae28bde4d3ba544aca57813691482950ec2963369842d92028e5c4bd3e0d4b2024859b89f81be1a4713458fc1064d4122496fc62109cfaaefadcd0da9ed
 MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQWwm1AAoJEEqz6FtPBkyjy+YH/1FdgprPgQ2KVwkYjiyUhxo/
-+f1lArF+K4//e8ygJLN16xSVomF8+RgMkO9yexITyJISUO1NRrAYOjjrFiqlLmYd
-Fxv9WCdilNJVN2oSwbDCxtPNVOEZngcfjbGoflAMONyAqXQkTrHqnrko2l0tt7uY
-FCZomDVRLFjLpxIX1o1zTYhIXZa/6/xlt5e/bLUHkkOGMagglHcrYWGuSxpfjoDT
-YC6/KEipT08n73Qr3gvPT6q/f3NTZCm3SgSN4UihLnlGIHfw5dGeK9SEWcAXFhdD
-WB8vmmaTKsFz4DxG30Xm3oB5gjkdD4f/iw2GyiV8iV21AWoJK2W0zY/8deiQWHQ=
-=YihJ
+iQEcBAEBCAAGBQJQgk4NAAoJEEdUh39IaPFN3q4H/jALwB0g5+HxGpwF4GNr5Y7g
+8mXbapmHH1laUBjURwlgjUycsMOn++uriUQh16O3MYOSoIKS8y0GEShcM46KVDN8
+flcgb78IKSfiSUig1bGnCQT8okpsiPTqneVkE74RUo8J1feaL4zLXQu+VOc5H/WP
+ar9Rr4vwW+0ajIQ5E7i8RYg4kQBohQn3fr/uVHJ4qxZy8HwTBYa76O5N2kvVWZsk
+6/A7h157e9T1ZX0lf47N74uQ6jx8aDfIEqnJ252WonXDtLiyJuj7W5SZ85g+0cw9
+uxEDH9iZ0Qcw27dcr+gbOSl8hvV4agsEGJMdqSakCykldRSn6iLLR+qMB4L4TCk=
+=4G/6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-10-r1.ebuild b/sys-apps/kmod/kmod-10-r1.ebuild
new file mode 100644
index 000000000000..4699b1d3b527
--- /dev/null
+++ b/sys-apps/kmod/kmod-10-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-10-r1.ebuild,v 1.1 2012/10/20 07:12:46 ssuominen 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
+	install ohci_hcd /usr/bin/modprobe ehci_hcd ; /usr/bin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS
+	install uhci_hcd /usr/bin/modprobe ehci_hcd ; /usr/bin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS
+	EOF
+
+	insinto /etc/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 1f6fbdbec248..334c8a13ced0 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.33 2012/09/09 17:38:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.34 2012/10/20 07:12:46 ssuominen Exp $
 
 EAPI=4
 
@@ -76,4 +76,12 @@ src_install()
 		dosym /usr/bin/kmod /sbin/depmod
 		dosym /usr/bin/kmod /sbin/modprobe
 	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	install ohci_hcd /usr/bin/modprobe ehci_hcd ; /usr/bin/modprobe	--ignore-install ohci_hcd \$CMDLINE_OPTS
+	install uhci_hcd /usr/bin/modprobe ehci_hcd ; /usr/bin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS
+	EOF
+
+	insinto /etc/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
 }