Install usb-load-ehci-first.conf from sys-apps/kmod instead of shipping duplicate copy here wrt #442384

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 31 insertions, 25 deletions

diff --git a/sys-kernel/mkinitcpio/ChangeLog b/sys-kernel/mkinitcpio/ChangeLog
index 3582d9d0d300..bf0e63155ab0 100644
--- a/sys-kernel/mkinitcpio/ChangeLog
+++ b/sys-kernel/mkinitcpio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/mkinitcpio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.9 2012/12/03 02:13:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.10 2012/12/19 11:19:38 ssuominen Exp $
+
+  19 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  mkinitcpio-0.9.2-r1.ebuild, files/mkinitcpio-base-install.patch:
+  Install usb-load-ehci-first.conf from sys-apps/kmod instead of shipping
+  duplicate copy here wrt #442384
 
   03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   mkinitcpio-0.9.2-r1.ebuild:
diff --git a/sys-kernel/mkinitcpio/Manifest b/sys-kernel/mkinitcpio/Manifest
index ee52b0b95fb6..5a132e0e2d0e 100644
--- a/sys-kernel/mkinitcpio/Manifest
+++ b/sys-kernel/mkinitcpio/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX gentoo.preset 389 SHA256 cdfd5cc8ff300e52eece5d6203291a2ded3f5dad273d3e5b3d45cbbe26f77d86 SHA512 8a3004bbc7de719017ca58d7b4d4819c2c1de6d2fff44e0c78dfbcb5373aaae8d788c0674b26e49996c9cc5f2cd464d1a178fbffaf0b3623a6de0a42f2809d6a WHIRLPOOL 4c6f186c35219ffdb548f41ed2b043da53daad231f0a59b5700c9e7041babba585c9260378c7a44afdae60557f14b8856935fe3804c3fc3ef92ab7be17ddf5af
-AUX mkinitcpio-base-install.patch 406 SHA256 6b973fe37e38d9dce6eef37e4c88ddea4393d396f59ef011bd8faed824d84171 SHA512 65e2e6f75baea7170a56f8b05443099dbf60afba90edf37fbef0469b568a7163c0e3f8ca79a7a758e70f1855c092242ed60b6bde19fa3fb409cc3a992b7ad977 WHIRLPOOL 92e72c77dbc999a439c3265fd9f7ab45411317e306b2bf271f400f54afe65ecb8302cd3dc27657fdecc143937e0b8494b4cc52b1b44508395535f4dff296f215
+AUX mkinitcpio-base-install.patch 667 SHA256 51f064329f02019035e16e484c84185b39b01df19e8cf44e8bcf95f48a913e4b SHA512 660806c11a4f00b5c67b8309c71ea753562cb7fe3b30e9f54c7cc0ab70d63bd29903589b50bbf10394007ea7ba1b1c59826be6a2b6a61749d4158007fd6d67d1 WHIRLPOOL 18fd157b8630d593d3d3ecd95ab14cb4ad178d54a14deae914684e349e4b055a76fd1ad85139fabbf862068d1b843f9ea47a74a3dfeff3dc57f64289a69ae79e
 AUX mkinitcpio-consolefont-install.patch 1296 SHA256 20231bf7e18c88744307f3e7bedd1cfee864ff9bb34a66e7f7c266e997837a54 SHA512 6040df26fc7ded7a88e17b02ab4ae0729565a2746e372f52b0c3fd01439c0c8ed1632037969cd1c59f2a4eb8e497c767e613c5d241265bbb99d8b8528af2ba71 WHIRLPOOL 620cbf3dae1a084596fd8611c042b3b68ce8d687b022d1e700e0aa6e6cf7db7e2a835486c640df72d26cdf6439e0dbdfb8b4d8fe6e93fe6e9ed5aeb4e50c1360
 AUX mkinitcpio-dmraid-install.patch 505 SHA256 8954fb1b2f2bedcc79b7b3f177c2d98db6ca9534354689908b935820c3267c1e SHA512 812923214da96c798d92d1660b87a93bc01364421be999a58008b37775a0b3e46b0cedea64ffa64b0f5102bc8cbdc861619050052f0e4f3dfc556842f8521011 WHIRLPOOL 66303c2a16298465c81e0e0034b961526fef1d150d4ad3d8a889be99f137c2f323733dd890093d1453cc73232192532ffc235c653121a3be52350d98f93a0d43
 AUX mkinitcpio-encrypt-install.patch 617 SHA256 909e829140fc044fe7293469f6fd425cdeb9e49e25db5b9ff490646000434fec SHA512 da50219e980df2e3d7400dd19c077651a9e6efe0a0ef7a61d3192c9f893fecb4aa550054b6c91b44d0e96cb660f9613328f35de4c5b2b1eed22327d38c640052 WHIRLPOOL 84590e883cd0500b2a0a40425561e18302a77c05ed81c099614f412ae0ccb3044521c5319a1460b8adb57b6626d88597c94199ec5552fd901faeec3d95356649
@@ -12,19 +12,19 @@ AUX mkinitcpio-mdadm_udev-install.patch 281 SHA256 e74e164a987469c230d224ed3c8d2
 AUX mkinitcpio-pcmcia-install.patch 494 SHA256 18ee023e17ff5c6a6b0d10f475fff75d00e6b609897babbe670b086507191927 SHA512 56ba865bdfd3ba73cbbfd8c5102caa525da775ce60924749ab5f1f404fa7adca8ac971051ec46bf8cc14b4e03278737511021f057f8698d6e6b742a91b7bfdcd WHIRLPOOL b14c6427972b6eb78c425e54e5d621cf8fc319593cd5f8d110aa60855c472783d2660ab577673059d09ce85547453623c0571978f46c8f8f65c3f8f7c3d87696
 AUX mkinitcpio-udev-install.patch 654 SHA256 fee84482479748230df80db5aba9cc0804d2477dea448318a940ab005a53f9f7 SHA512 356d8179ad08c1fd28232ac2ea0765a94107d8d607142d95192740ca81c76df1eb2b94fc004dcc61e898a50c6121e81efdf7164ade30e1146d355fbcc5baa457 WHIRLPOOL 5fb54f0f53c08739d65695b6a2b3988a6a7f20ad45693d7342c6473d0559cffbfd5f952bc883f2889d26c0321f761335e0b7b12e82eb339a7d8df04563a46168
 AUX usb-load-ehci-first.conf 62 SHA256 90fb123aa8c0176bc144322b585bb889181c437542ddbe546af43e11b95be6ab SHA512 c4ca8336ecc441c9250278d92a1d4503e28720fdf6f5e5f64d2c94fae6a3f3da0b3c02cb973373b5041ea71f50eb73444ade09e0cdf16ad803dac847b0f4d330 WHIRLPOOL dced05160d7d132d12c3ce411f06aef0b526477f84fc6a4f7b7740b76bc77e49be95a57404b90afc9a8c19c6452bc9689b018650637caee21cc9cea42f4c0588
-DIST mkinitcpio-0.9.2.tar.gz 38462 SHA256 1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28
-DIST mkinitcpio-modules-0_p20120704.tar.bz2 4815 SHA256 3cf6c59de41c8c6ad2d8579c67c0c39c8364549083e8967b37f6003382e463f9
-EBUILD mkinitcpio-0.9.2-r1.ebuild 3599 SHA256 23367f5bdaad1cdf9d7bfa0629c71d0fd40d5c57aa809121c85ab7d0738010e2 SHA512 ca3872194f1af39e82d4babe6e64987c816474e9e22465b911145c485ef2044544d2d56e63675d05f43c3896aefeb0fb8dcccf052b2a5df8bfc7107686292209 WHIRLPOOL 39d7931464be129ea06f62e8be58d29d539dea270e4edbeb2087ad282e6d62dd8096ee0b2c80eb8da4a344ebd1f11a7d830d3ded18b4ee5a190d2cfeebf93dde
-MISC ChangeLog 2473 SHA256 9df5ba63ee8d3525968c79f7135137fdd88bc3304e141331b98674268c35ebe5 SHA512 d53a018e00f692dc4c533da46ef930fe6f6cfc5b5e91f7ed83d4ba575b2c3ceee63425e9b91e686ebc628c9caf7ad242cdaa321d17c6e471103976fb68f5cbea WHIRLPOOL 8172dcbbc27c1c584486b96fcbd11f5ab2f4a0a8abcc1ff1a4b550cb33faac6643ac138b81032ed905c3d084be3f4367f240e431909199bb2315e0bf430976dd
+DIST mkinitcpio-0.9.2.tar.gz 38462 SHA256 1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28 SHA512 333abf477d6e32ef65d59c1801f0faefa5476a5f0035c29d3869c4d8e7f3f3a05bd4953ff9826b438ff39444a6c52c7baa2e020ea8b7a909d7b8cfc179b89ff2 WHIRLPOOL af3daac489d2e163d2ccccd68e0a9c74ef0ec9c7563f1dc7990f09246ea02f3ffca0f7d80031f447dd30f3f0127ba9e5f8a4bbdd3085affbd65f8791fcd423df
+DIST mkinitcpio-modules-0_p20120704.tar.bz2 4815 SHA256 3cf6c59de41c8c6ad2d8579c67c0c39c8364549083e8967b37f6003382e463f9 SHA512 5858a210efb78bc7e55d05bb8f4cffaac98ed13417de6e856b56e375fb3a7759f995e3a4a80305dd0bd10eecfc54476b091c5093f8209cabf60c1c4cabb374ca WHIRLPOOL 9284cebe521c65a08a60bbe2c65c14512ffe4472d2f960cef0a8291987cc99a27d5e49bf644705472ec6c0a990e7ea9cdb3af6822ee8b7f3073b333f8a0ee240
+EBUILD mkinitcpio-0.9.2-r1.ebuild 3196 SHA256 06e1822f4f9a90a9ef0b84b9f54d0841561d792cf137c2e7bd103a31674b64be SHA512 de3aed7461ae85db66a4920ae62ad396d727168925426d20252692e195a41fbf63d6e27b892bfa7e7243a8047b70410ea4b32d7040d7a23ca96513124cddbf1f WHIRLPOOL b6fa925f8dab3399cf81bf65838edc72319b09e948fca2cb7712c3734ebe2a0d24fccdbcc3b6fd05e7247960ab6b53484dc57f47609beb0e809ca5e5f59c9fb5
+MISC ChangeLog 2704 SHA256 bf5ff771006c7474170238dbb83779f2299edea8884af3466609b96b02ed549d SHA512 27ff1b83d8111b3dfee1c6e6309fd903307bfd84782484a1024db638b5695d0a26c0534c866d0f0911ab929528e6cd27213d1b9278726e9802cc8f62c59fca71 WHIRLPOOL 519e4a23b80a89da58b34f5ee49825bd65a8714d1eeb882e4d4a4166e9e4a93548d011fa9bc44fba6fdb1a8eebf8229eed43a095b782266578cbef05d169220f
 MISC metadata.xml 445 SHA256 b9333bfdb81d7a2d1b108b6cd368ae1a8cdd58247822e3f4b7de6d23a16c70e4 SHA512 64359ce363d752ab5325c4f4643f0e3d2207c77fe9a3fb12206ae9aada8cb37ee4e3eb667a227488a713b029a72ce1d62c4cfd948daa06bf39fba0e84709f24f WHIRLPOOL 31d34e5b69572fb1f1bdf62cf9b91d507d4cf064e9e4301b9aef290202c915bb2039048888b5346b484b8819fd4c4e28d985757cf2112f0ca268eb04e9bae1ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQvAreAAoJEEdUh39IaPFNwXUH/i9sBy2/6P/Y6B0+MvCpS2nu
-St+IfFbFz2rb4QHAnXm2k606/34a09kO6GQdb9oFrBXU1rz6SB7DhxDz3eB1WSv/
-uj9WjXEpsOE1+hjH5T12G+yJ1gbA0CGEUVL72LOZt2Ub/aCI/OBMcSc8ucMI8EmU
-S7VPbdbh38FDDtT9/Gh419KvvR8M7burmaWXTkttCuFpR/hDLJGxuQ/1Dtg/RosV
-yuH1M3zsxcmDKXtlpRUWJ4daEp8C/I+mA3mYRQROiH5xJelwEvDlTYaoatYfdvrj
-0QweuL/k+g5H/CbMwoGGm1LAKe2U+FcWq24PiTar/EDD5mDqFltA/BNQqePdMQA=
-=Nhnp
+iQEcBAEBCAAGBQJQ0aLBAAoJEEdUh39IaPFNymwIAIkiz1kPr0v13IllNIz2e/77
+bLSA6b07N+a7JQ0PNHhgJWVQjglDal3Rh8b3mDb93dLZLF6jD7HSXRv6J0x56AdK
+I6d1eTQYY0HyA9v3Ki46dPViqp7OhLi0iT/qp9xhDq7GlMeE5eZr6Ft2VaVX8kqC
+AthxMyZ0N4oB3XXLF6qNrjCfa6l1+Io35xfjcddGMs7lvBkZyuhP62gAFHyHSkTg
+FcVvFF6iLZoeONzoo3hZnYNQBzhebofTLdT0Q/3p6PqqmWNPRb/3Z1pHk88sBfGM
+UsKET8evobq8ruzWH1NuvVLh0yCNk5vSB+HgZPmSAqoUJMoPFoTqXsdjwCHH0Do=
+=lCcf
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch
index 35459f65980b..9e7edda9e2a0 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch
@@ -1,5 +1,5 @@
---- mkinitcpio-0.9.2-r1/install/base
-+++ mkinitcpio-0.9.2-r1/install/base
+--- mkinitcpio-0.9.2/install/base
++++ mkinitcpio-0.9.2/install/base
 @@ -12,9 +12,9 @@
      add_symlink /bin usr/bin
      add_symlink /usr/sbin bin
@@ -12,3 +12,12 @@
          add_symlink "/usr/bin/$applet" busybox
      done
  
+@@ -35,7 +35,7 @@
+ 
+     add_file "/usr/lib/initcpio/init_functions" "/init_functions"
+     add_file "/usr/lib/initcpio/init" "/init"
+-    add_file "/usr/lib/modprobe.d/usb-load-ehci-first.conf"
++    add_file "/lib/modprobe.d/usb-load-ehci-first.conf"
+ }
+ 
+ help() {
diff --git a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
index f17bce6929ee..5b214b4800c6 100644
--- a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
+++ b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.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-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.6 2012/12/03 02:13:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.7 2012/12/19 11:19:38 ssuominen Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ RDEPEND="app-arch/cpio
 	sys-apps/file
 	sys-apps/findutils
 	sys-apps/grep
-	>=sys-apps/kmod-7
+	>=sys-apps/kmod-12-r1
 	>=sys-apps/util-linux-2.21
 	udev? ( >virtual/udev-171 )
 	device-mapper? ( sys-fs/lvm2[static] )
@@ -97,14 +97,6 @@ src_install() {
 	sed -e "s/KV/${KV_FULL}/g" \
 		"${FILESDIR}"/gentoo.preset \
 		> "${D}"/etc/mkinitcpio.d/${KV_FULL}.preset || die
-
-	# This file doesn't belong to this package because it's already
-	# being installed by the module loader packages kmod and m-i-t.
-	# If this needs to be copied into the initramfs itself, the version
-	# from kmod or m-i-t can be used'so this should never be useful here.
-	# Comment out for now wrt bug #442384, -ssuominen 2012/12
-	#insinto /usr/lib/modprobe.d
-	#doins "${FILESDIR}/usb-load-ehci-first.conf"
 }
 
 pkg_postinst() {