summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2012-07-02 10:43:03 +0000
committerMichael Weber <xmw@gentoo.org>2012-07-02 10:43:03 +0000
commit3da425d1f13237182282d4716e90eacce6a4f2be (patch)
tree68b9b5a5260d6e8b88ee0fda8077b5bee7ec82bd /sys-kernel/mkinitcpio
parentRemove nsplugin support as it does not work at all. (diff)
downloadgentoo-2-3da425d1f13237182282d4716e90eacce6a4f2be.tar.gz
gentoo-2-3da425d1f13237182282d4716e90eacce6a4f2be.tar.bz2
gentoo-2-3da425d1f13237182282d4716e90eacce6a4f2be.zip
Initial import from bug 424449, thanks brainbug75@gmx.net, udeved and all forum contributors
(Portage version: 2.1.11.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/mkinitcpio')
-rw-r--r--sys-kernel/mkinitcpio/ChangeLog18
-rw-r--r--sys-kernel/mkinitcpio/Manifest23
-rw-r--r--sys-kernel/mkinitcpio/files/gentoo.preset16
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch14
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch37
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch15
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch15
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch37
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch17
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch11
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch15
-rw-r--r--sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch20
-rw-r--r--sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf2
-rw-r--r--sys-kernel/mkinitcpio/metadata.xml16
-rw-r--r--sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild120
15 files changed, 376 insertions, 0 deletions
diff --git a/sys-kernel/mkinitcpio/ChangeLog b/sys-kernel/mkinitcpio/ChangeLog
new file mode 100644
index 000000000000..0fa95ee6b392
--- /dev/null
+++ b/sys-kernel/mkinitcpio/ChangeLog
@@ -0,0 +1,18 @@
+# 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.1 2012/07/02 10:43:03 xmw Exp $
+
+*mkinitcpio-0.9.2 (02 Jul 2012)
+
+ 02 Jul 2012; Michael Weber <xmw@gentoo.org> +mkinitcpio-0.9.2.ebuild,
+ +files/gentoo.preset, +files/mkinitcpio-base-install.patch,
+ +files/mkinitcpio-consolefont-install.patch,
+ +files/mkinitcpio-dmraid-install.patch,
+ +files/mkinitcpio-encrypt-install.patch,
+ +files/mkinitcpio-keymap-install.patch, +files/mkinitcpio-lvm2-install.patch,
+ +files/mkinitcpio-mdadm_udev-install.patch,
+ +files/mkinitcpio-pcmcia-install.patch, +files/mkinitcpio-udev-install.patch,
+ +files/usb-load-ehci-first.conf, +metadata.xml:
+ Initial import from bug 424449, thanks brainbug75@gmx.net, udeved and all
+ forum contributors
+
diff --git a/sys-kernel/mkinitcpio/Manifest b/sys-kernel/mkinitcpio/Manifest
new file mode 100644
index 000000000000..afd155e0e436
--- /dev/null
+++ b/sys-kernel/mkinitcpio/Manifest
@@ -0,0 +1,23 @@
+AUX gentoo.preset 389 RMD160 5a830671f28e0bc416e48d9d734ade79aa7f444b SHA1 5580a8084e25ccb2c986d99d36b3752fa1ea852c SHA256 cdfd5cc8ff300e52eece5d6203291a2ded3f5dad273d3e5b3d45cbbe26f77d86
+AUX mkinitcpio-base-install.patch 406 RMD160 b4d71a164d8a5a577d53b084be6517ad2639f4ec SHA1 9420ec8f0e957fc9321f6b015b8ff3b0b448356e SHA256 6b973fe37e38d9dce6eef37e4c88ddea4393d396f59ef011bd8faed824d84171
+AUX mkinitcpio-consolefont-install.patch 1296 RMD160 e4c67b8a2ceceadcbc23d1663b283f3a8716e5f4 SHA1 3968138d9be24e3ea7c8c6e88e7718fc7b93d340 SHA256 20231bf7e18c88744307f3e7bedd1cfee864ff9bb34a66e7f7c266e997837a54
+AUX mkinitcpio-dmraid-install.patch 521 RMD160 ff73c06a396fde72e51a05651a3ebde87aaf6db7 SHA1 069d58bd73315a0993e51654b1ecd7aac7115372 SHA256 c3d874c465be5177aa3469ea0f290c7c23bed5afa4726b1310b2598f50935f79
+AUX mkinitcpio-encrypt-install.patch 627 RMD160 42d40ad8be6929f7f205a03f29fd8965ef0fbf8f SHA1 23c2d4cec4359672b6cb1df43690e6d7bc9d7784 SHA256 ff196b01b0a0c38cddf17c3d1377e458289bff826aae31e4f7a99f36574de022
+AUX mkinitcpio-keymap-install.patch 1137 RMD160 815e9faf53075a781b2bf9e81099cb9a4e5de90e SHA1 151633c8b5bf0097a1b85bb2b6129e3fa2c3698b SHA256 646d7e79366274e04edb625e74c5f8f9a1713e25ab6d4c39cc41181438738621
+AUX mkinitcpio-lvm2-install.patch 722 RMD160 9ae88cc1fbedef3814093d36b641050201cd1d56 SHA1 222228440cb8563bbb00570e6d66a9aa73120168 SHA256 3a1ea03c50fd30e72f850c2584c311931b4ca30fb7d295714ed491b45752faeb
+AUX mkinitcpio-mdadm_udev-install.patch 281 RMD160 ff6f7c7a7c09a089eb8803580dcd1ab1ad8cd213 SHA1 d7315ae7152859d7662e3468a8f9d0099752b078 SHA256 0ef9dd6850dc995fcb2ad25550897a883ccc959eeafc9951dd062027f4208e3a
+AUX mkinitcpio-pcmcia-install.patch 502 RMD160 27624f235d99fd611525d6413f3d98285577a40f SHA1 e06ad7c6d4ffdaa148ebc37a301ace68ce431b4c SHA256 4ab3942257b89af9181f055e15a42e4e6756a25fa3d23c9c871a1f6153f1d9c0
+AUX mkinitcpio-udev-install.patch 662 RMD160 1da6fb0ca7fc37bce3301b155914fc59708cd589 SHA1 9f0c5d82874f5a7d6aa07b5831ed3724c029a8fb SHA256 2d81245ea2dafd29bbb87e85cabdb3ec5f4c29abac763b9db17fd8e720c8554d
+AUX usb-load-ehci-first.conf 62 RMD160 17f237f38786167179803f8551e175ef11f67cdb SHA1 d410164cb71c8b0e1184e36bf6040ff9e41d1992 SHA256 90fb123aa8c0176bc144322b585bb889181c437542ddbe546af43e11b95be6ab
+DIST cryptsetup-1.4.3-1-x86_64.pkg.tar.xz 122080 RMD160 895995f8d3111e300bfcfd2dbd86894637465a31 SHA1 037d2445565e621f53f53b23ccf9b8d54f16d795 SHA256 76f120caaa34031017d37dd4402fa715d9d9f245e13adcdd5480f6bb307c861e
+DIST device-mapper-2.02.96-2-x86_64.pkg.tar.xz 156928 RMD160 d58834bb96392472997c77f2b4da7312d3231475 SHA1 96ff8b002d60bca87121ac9683b54a8d51280d51 SHA256 e7a61b8d61b44bcc3b335b4f73adb024e257276cc6e3cc85e9ff144865288a54
+DIST dmraid-1.0.0.rc16.3-7-x86_64.pkg.tar.xz 148336 RMD160 2f659f1e11dbc4a81675348aefb9f259016070d9 SHA1 cbfc3a8f1e4c5ceeba95d564015a8a4726322d47 SHA256 fdc300962b43f091f474bde762cdec7275ff9650842163c684967672ad49e4d8
+DIST lvm2-2.02.96-2-x86_64.pkg.tar.xz 633756 RMD160 c3ed688c601cc909ad7f0c5cb6ea7d40bf8cca00 SHA1 9feed53b2af4e1159fea7d2586322584c667b0fc SHA256 ce982df7212ce969b1bf9dfb302add6be182ae7599078d7a502acae9269587ed
+DIST mdadm-3.2.5-2-x86_64.pkg.tar.xz 279060 RMD160 ddc0f53b32161bea360e803c6cf4a6cfbfacf98e SHA1 3c575e91d485e4241eac6f70b9d7f104bd830560 SHA256 41f084c81bb65779964718dc66231a988671b8dd54130fc121d2a5a7baedd004
+DIST mkinitcpio-0.9.2.tar.gz 38462 RMD160 6281f23efaa41110e06988e786a0de0c6c747b19 SHA1 08444c30a43769913fead9fdc873836d2b581841 SHA256 1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28
+DIST pcmciautils-018-4-x86_64.pkg.tar.xz 19772 RMD160 c8cb99a9f3f961ce156c082f779f2afab765e866 SHA1 d646d6d0cbe0f97af61639762d0c032eb573519e SHA256 636480d4fbe7bfca474c89c450c7926e14954d616e247df0785e52ab54171743
+DIST plymouth-git.tar.gz 54752 RMD160 df42c5e00eeb7573369f25b4b3ca6f54d6e751fd SHA1 ecb13192abf2e550c705881a9f70b6cd05bbce07 SHA256 083282c9f25eca2eab712fc5cb92fb812e961216da8e16d3f73d76aac2d5d391
+DIST systemd-tools-185-4-x86_64.pkg.tar.xz 416368 RMD160 d813f43d457a23ad9872a63bf3825cf63267c151 SHA1 994d96b5d0dbbad18b9297fe3f0f217d07274cb8 SHA256 f93b322ea111d0fdba139e59368715fe51e355aa5358dfa53655ff1ae000f4a3
+EBUILD mkinitcpio-0.9.2.ebuild 3846 RMD160 8c952e22277f586f933f5c633727f6d654a2e3c6 SHA1 5057f8c21830c8150d6e22429f97e318b40c004f SHA256 ac06fdeb5ed01e21e3090bdc59c80ab40e63195ffd6b7a25bb95822adade53f9
+MISC ChangeLog 775 RMD160 20a5cf8db93e07f9e31b5d1e9294c35026721bc6 SHA1 151fa5647ca7e9951705a29b1f5da9792694b9c8 SHA256 042df7e7d9f5504653563afcce0f7d3df2595c8e1b8fdab2acd4f0f7c6a97de6
+MISC metadata.xml 496 RMD160 22dc5ebc9c869c84e548a19b0df25e47481d0395 SHA1 241e798c58fb98a20f8c5dbf9096b1fd7781a47f SHA256 a941b5b2f32172eb8b595f13017813f5438386e3dc156d7af2bfec17fbed0ca6
diff --git a/sys-kernel/mkinitcpio/files/gentoo.preset b/sys-kernel/mkinitcpio/files/gentoo.preset
new file mode 100644
index 000000000000..43d48be6a107
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/gentoo.preset
@@ -0,0 +1,16 @@
+#PRESETS=('default' 'fallback')
+PRESETS=('default')
+
+presetname_kver="KV"
+presetname_config="gentoo"
+presetname_image="kernel-KV"
+
+default_kver="KV"
+default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-KV.img"
+default_options=""
+
+#fallback_kver="KV"
+#fallback_config="/etc/mkinitcpio.conf"
+#fallback_image="/boot/initramfs-KV-fallback.img"
+#fallback_options="-S autodetect" \ No newline at end of file
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch
new file mode 100644
index 000000000000..35459f65980b
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-base-install.patch
@@ -0,0 +1,14 @@
+--- mkinitcpio-0.9.2-r1/install/base
++++ mkinitcpio-0.9.2-r1/install/base
+@@ -12,9 +12,9 @@
+ add_symlink /bin usr/bin
+ add_symlink /usr/sbin bin
+
+- add_binary /usr/lib/initcpio/busybox /bin/busybox
++ add_binary /bin/busybox
+
+- for applet in $(/usr/lib/initcpio/busybox --list); do
++ for applet in $(/bin/busybox --list); do
+ add_symlink "/usr/bin/$applet" busybox
+ done
+
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch
new file mode 100644
index 000000000000..082140f2d8d0
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-consolefont-install.patch
@@ -0,0 +1,37 @@
+--- mkinitcpio-0.9.2-r1/install/consolefont
++++ mkinitcpio-0.9.2-r1/install/consolefont
+@@ -3,14 +3,14 @@
+ build() {
+ # subshell to avoid namespace pollution
+ (
+- for cfg in /etc/{rc,vconsole}.conf; do
++ for cfg in /etc/conf.d/consolefont; do
+ [[ -s $cfg ]] && . "$cfg"
+ done
+
+- [[ $FONT ]] && CONSOLEFONT=$FONT
++ [[ $FONT ]] && consolefont=$FONT
+
+- if [[ $CONSOLEFONT ]]; then
+- for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".psf?(u)?(.gz); do
++ if [[ $consolefont ]]; then
++ for file in "/usr/share/consolefonts/$consolefont".psf?(u)?(.gz); do
+ if [[ -e $file ]]; then
+ [[ $file =~ \.(psfu?)(\.gz)?$ ]] && ext=${BASH_REMATCH[1]}
+ if [[ $file = *.gz ]]; then
+@@ -21,7 +21,7 @@
+ exit 0
+ fi
+ done
+- error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT"
++ error "consolefont: requested font not found: \`%s'" "$consolefont"
+ exit 1
+ else
+ warning "consolefont: no font found in configuration"
+@@ -37,4 +37,4 @@
+ HELPEOF
+ }
+
+-# vim: set ft=sh ts=4 sw=4 et:
++# vim: set ft=sh ts=4 sw=4 et:
+\ Kein Zeilenumbruch am Dateiende.
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch
new file mode 100644
index 000000000000..ca1e1f381932
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch
@@ -0,0 +1,15 @@
+--- dmraid-1.0.0.rc16.3-7/usr/lib/initcpio/install/dmraid
++++ dmraid-1.0.0.rc16.3-7/usr/lib/initcpio/install/dmraid
+@@ -6,9 +6,9 @@
+
+ add_binary 'dmraid'
+ add_binary 'dmsetup'
+- add_file "/usr/lib/udev/rules.d/10-dm.rules"
+- add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+- add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
++ add_file "/lib/udev/rules.d/10-dm.rules"
++ add_file "/lib/udev/rules.d/13-dm-disk.rules"
++ add_file "/lib/udev/rules.d/95-dm-notify.rules"
+
+ add_runscript
+ }
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch
new file mode 100644
index 000000000000..c22afc25b0d8
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch
@@ -0,0 +1,15 @@
+--- cryptsetup-1.4.3-1/usr/lib/initcpio/install/encrypt
++++ cryptsetup-1.4.3-1/usr/lib/initcpio/install/encrypt
+@@ -14,9 +14,9 @@
+
+ add_binary "cryptsetup"
+ add_binary "dmsetup"
+- add_file "/usr/lib/udev/rules.d/10-dm.rules"
+- add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+- add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
++ add_file "/lib/udev/rules.d/10-dm.rules"
++ add_file "/lib/udev/rules.d/13-dm-disk.rules"
++ add_file "/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+ add_runscript
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch
new file mode 100644
index 000000000000..9b3e7be89aad
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-keymap-install.patch
@@ -0,0 +1,37 @@
+--- mkinitcpio-0.9.2-r1/install/keymap
++++ mkinitcpio-0.9.2-r1/install/keymap
+@@ -7,21 +7,21 @@
+ l=$LANG
+ unset LANG
+
+- for cfg in /etc/{rc,vconsole,locale}.conf; do
++ for cfg in /etc/conf.d/keymaps; do
+ [[ -s $cfg ]] && . "$cfg"
+ done
+
+ [[ $LANG ]] && LOCALE=$LANG
+ LANG=$l
+
+- if [[ $KEYMAP ]]; then
++ if [[ $keymap ]]; then
+ if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then
+ touch "$BUILDROOT/keymap.utf8"
+ uc=-u
+ fi
+- loadkeys -q $uc $KEYMAP -b > "$BUILDROOT/keymap.bin"
++ loadkeys -q $uc $keymap -b > "$BUILDROOT/keymap.bin"
+ else
+- warning "keymap: hook specified, but no KEYMAP found in configuration"
++ warning "keymap: hook specified, but no keymap found in configuration"
+ return 1
+ fi
+ ) && add_runscript
+@@ -29,7 +29,7 @@
+
+ help() {
+ cat <<HELPEOF
+-This hook loads keymap(s) specified in vconsole.conf or rc.conf during early
++This hook loads keymap(s) specified in keymaps during early
+ userspace.
+ HELPEOF
+ }
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch
new file mode 100644
index 000000000000..098701fa7b53
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch
@@ -0,0 +1,17 @@
+--- lvm2-2.02.96-2/usr/lib/initcpio/install/lvm2
++++ lvm2-2.02.96-2/usr/lib/initcpio/install/lvm2
+@@ -8,10 +8,10 @@
+
+ add_binary "/sbin/lvm"
+ add_binary "/sbin/dmsetup"
+- add_file "/usr/lib/udev/rules.d/10-dm.rules"
+- add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+- add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+- add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
++ add_file "/lib/udev/rules.d/10-dm.rules"
++ add_file "/lib/udev/rules.d/13-dm-disk.rules"
++ add_file "/lib/udev/rules.d/95-dm-notify.rules"
++ add_file "/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+ add_runscript
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch
new file mode 100644
index 000000000000..f1dba7450b18
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch
@@ -0,0 +1,11 @@
+--- mdadm-3.2.5-2/usr/lib/initcpio/install/mdadm_udev
++++ mdadm-3.2.5-2/usr/lib/initcpio/install/mdadm_udev
+@@ -10,7 +10,7 @@
+ fi
+
+ add_binary "mdadm"
+- add_file "/usr/lib/udev/rules.d/64-md-raid.rules"
++ add_file "/lib/udev/rules.d/64-md-raid.rules"
+ }
+
+ help() {
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch
new file mode 100644
index 000000000000..11c0880fd2d8
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch
@@ -0,0 +1,15 @@
+--- pcmciautils-018-4/usr/lib/initcpio/install/pcmcia
++++ pcmciautils-018-4/usr/lib/initcpio/install/pcmcia
+@@ -6,9 +6,9 @@
+
+ [[ $MODULES ]] && MODULES+=" sd_mod?"
+
+- add_binary "/usr/lib/udev/pcmcia-socket-startup"
+- add_binary "/usr/lib/udev/pcmcia-check-broken-cis"
+- add_file "/usr/lib/udev/rules.d/60-pcmcia.rules"
++ add_binary "/lib/udev/pcmcia-socket-startup"
++ add_binary "/lib/udev/pcmcia-check-broken-cis"
++ add_file "/lib/udev/rules.d/60-pcmcia.rules"
+ }
+
+ help() {
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch
new file mode 100644
index 000000000000..1263e78e77e5
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch
@@ -0,0 +1,20 @@
+--- systemd-tools-185/usr/lib/initcpio/install/udev
++++ systemd-tools-185/usr/lib/initcpio/install/udev
+@@ -4,14 +4,14 @@
+ local rules tool
+
+ add_file "/etc/udev/udev.conf"
+- add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
++ add_binary /lib/udev/udevd /usr/bin/udevd
+ add_binary /usr/bin/udevadm
+
+ for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+- add_file "/usr/lib/udev/rules.d/$rules"
++ add_file "/lib/udev/rules.d/$rules"
+ done
+ for tool in ata_id scsi_id; do
+- add_file "/usr/lib/udev/$tool"
++ add_file "/lib/udev/$tool"
+ done
+
+ add_runscript
diff --git a/sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf b/sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf
new file mode 100644
index 000000000000..947379411397
--- /dev/null
+++ b/sys-kernel/mkinitcpio/files/usb-load-ehci-first.conf
@@ -0,0 +1,2 @@
+softdep ohci_hcd pre: ehci_hcd
+softdep uhci_hcd pre: ehci_hcd
diff --git a/sys-kernel/mkinitcpio/metadata.xml b/sys-kernel/mkinitcpio/metadata.xml
new file mode 100644
index 000000000000..193fbcfdcdbc
--- /dev/null
+++ b/sys-kernel/mkinitcpio/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<use>
+ <flag name="cryptsetup">Add cryptsetup support</flag>
+ <flag name="device-mapper">Add device-mapper support</flag>
+ <flag name="dmraid">Add dmraid support</flag>
+ <flag name="mdadm">Add mdadm support</flag>
+ <flag name="plymouth">Add plymouth support</flag>
+</use>
+</pkgmetadata>
+
diff --git a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild
new file mode 100644
index 000000000000..dc5d15bb5b7f
--- /dev/null
+++ b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild
@@ -0,0 +1,120 @@
+# 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.ebuild,v 1.1 2012/07/02 10:43:03 xmw Exp $
+
+EAPI=3
+inherit eutils linux-info
+
+DESCRIPTION="Modular initramfs image creation utility ported from Arch Linux"
+HOMEPAGE="http://www.archlinux.org/"
+MY_SRC_URI_CORE="ftp://ftp.archlinux.org/core/os/x86_64"
+SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz
+ udev? ( ${MY_SRC_URI_CORE}/systemd-tools-185-4-x86_64.pkg.tar.xz )
+ device-mapper? ( ${MY_SRC_URI_CORE}/device-mapper-2.02.96-2-x86_64.pkg.tar.xz
+ ${MY_SRC_URI_CORE}/lvm2-2.02.96-2-x86_64.pkg.tar.xz )
+ cryptsetup? ( ${MY_SRC_URI_CORE}/cryptsetup-1.4.3-1-x86_64.pkg.tar.xz )
+ mdadm? ( ${MY_SRC_URI_CORE}/mdadm-3.2.5-2-x86_64.pkg.tar.xz )
+ dmraid? ( ${MY_SRC_URI_CORE}/dmraid-1.0.0.rc16.3-7-x86_64.pkg.tar.xz )
+ pcmcia? ( ${MY_SRC_URI_CORE}/pcmciautils-018-4-x86_64.pkg.tar.xz )
+ plymouth? ( http://aur.archlinux.org/packages/pl/plymouth-git/plymouth-git.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="cryptsetup device-mapper dmraid mdadm pcmcia plymouth udev"
+
+DEPEND="sys-apps/sed"
+RDEPEND="app-arch/cpio
+ app-arch/gzip
+ app-arch/libarchive
+ app-shells/bash
+ >=sys-apps/busybox-1.20[static]
+ sys-apps/coreutils
+ sys-apps/file
+ sys-apps/findutils
+ sys-apps/grep
+ >=sys-apps/kmod-7
+ >=sys-apps/util-linux-2.21
+ udev? ( sys-fs/udev )
+ device-mapper? ( sys-fs/lvm2[static] )
+ cryptsetup? ( sys-fs/cryptsetup[static] )
+ mdadm? ( sys-fs/mdadm[static] )
+ dmraid? ( sys-fs/dmraid[static] )
+ pcmcia? ( sys-apps/pcmciautils[static] )
+ plymouth? ( sys-boot/plymouth )"
+
+pkg_setup() {
+ if kernel_is -lt 2 6 32 ; then
+ eerror "Sorry, your kernel must be 2.6.32-r103 or newer!"
+ fi
+
+ use udev && CONFIG_CHECK+=" ~DEVTMPFS"
+ use mdadm && CONFIG_CHECK+=" ~MD ~MD_LINEAR ~MD_RAID0 ~MD_RAID1 ~MD_RAID10 ~MD_RAID456"
+ use dmraid && CONFIG_CHECK+=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MIRROR ~DM_RAID ~DM_UEVENT"
+ use device-mapper && CONFIG_CHECK+=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_UEVENT"
+ use cryptsetup && CONFIG_CHECK+=" ~DM_CRYPT"
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-base-install.patch
+ epatch "${FILESDIR}"/${PN}-consolefont-install.patch
+ epatch "${FILESDIR}"/${PN}-keymap-install.patch
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}"/${PN}-udev-install.patch
+ epatch "${FILESDIR}"/${PN}-lvm2-install.patch
+ epatch "${FILESDIR}"/${PN}-mdadm_udev-install.patch
+ epatch "${FILESDIR}"/${PN}-dmraid-install.patch
+ epatch "${FILESDIR}"/${PN}-pcmcia-install.patch
+ epatch "${FILESDIR}"/${PN}-encrypt-install.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ cd "${WORKDIR}/usr/lib/initcpio/hooks"
+ insinto /usr/lib/initcpio/hooks/
+ use udev && doins udev
+ use device-mapper && doins lvm2
+ if use mdadm ; then
+ doins mdadm
+ dosym mdadm /usr/lib/initcpio/hooks/raid
+ fi
+ use dmraid && doins dmraid
+ use cryptsetup && doins encrypt
+ use plymouth && newins "${WORKDIR}"/plymouth-git/plymouth.initcpio_hook pylmouth
+
+ cd "${WORKDIR}/usr/lib/initcpio/install"
+ insinto /usr/lib/initcpio/install
+ use udev && doins udev
+ use device-mapper && doins lvm2
+ use mdadm && doins mdadm mdadm_udev
+ use dmraid && doins dmraid
+ use cryptsetup && doins encrypt
+ use pcmcia && doins pcmcia
+ use plymouth && newins "${WORKDIR}"/plymouth-git/plymouth.initcpio_install pylmouth
+
+ if use device-mapper; then
+ if use udev; then
+ insinto /usr/lib/initcpio/udev/
+ doins "${WORKDIR}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+ fi
+ fi
+
+ dodir /etc/mkinitcpio.d
+ newins "${FILESDIR}"/gentoo.preset ${KV}.preset
+ sed -e "s/KV/${KV}/g" \
+ "${FILESDIR}"/gentoo.preset \
+ > "${D}"/etc/mkinitcpio.d/${KV}.preset || die
+
+ insinto /usr/lib/modprobe.d
+ doins "${FILESDIR}/usb-load-ehci-first.conf"
+}
+
+pkg_postinst() {
+ einfo
+ elog "Set your hooks in /etc/mkinitcpio.conf accordingly!"
+ elog "Missing hooks can lead to an unbootanle system!"
+ einfo
+}