Revbump to use hook/install tarball instead of arch binary packages.

Package-Manager: portage-2.1.11.4/cvs/Linux x86_64

9 files changed, 65 insertions, 72 deletions

diff --git a/sys-kernel/mkinitcpio/ChangeLog b/sys-kernel/mkinitcpio/ChangeLog
index 1de3e0e9690d..03478d07eb8b 100644
--- a/sys-kernel/mkinitcpio/ChangeLog
+++ b/sys-kernel/mkinitcpio/ChangeLog
@@ -1,6 +1,16 @@
 # 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.2 2012/07/02 12:58:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.3 2012/07/04 18:09:09 xmw Exp $
+
+*mkinitcpio-0.9.2-r1 (04 Jul 2012)
+
+  04 Jul 2012; Michael Weber <xmw@gentoo.org> -mkinitcpio-0.9.2.ebuild,
+  files/mkinitcpio-lvm2-install.patch, +mkinitcpio-0.9.2-r1.ebuild,
+  files/mkinitcpio-dmraid-install.patch,
+  files/mkinitcpio-encrypt-install.patch,
+  files/mkinitcpio-mdadm_udev-install.patch,
+  files/mkinitcpio-pcmcia-install.patch, files/mkinitcpio-udev-install.patch:
+  Revbump to use hook/install tarball instead of arch binary packages.
 
   02 Jul 2012; Michael Weber <xmw@gentoo.org> mkinitcpio-0.9.2.ebuild:
   Fix conditional patching
diff --git a/sys-kernel/mkinitcpio/Manifest b/sys-kernel/mkinitcpio/Manifest
index f33c84b259c6..46734c1acb2b 100644
--- a/sys-kernel/mkinitcpio/Manifest
+++ b/sys-kernel/mkinitcpio/Manifest
@@ -4,30 +4,23 @@ Hash: SHA256
 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-dmraid-install.patch 505 RMD160 31684424b65ebf5b637530b063c1ca073d33d326 SHA1 aa2962419b743ad838d64aee71f8dd1ba3f70441 SHA256 8954fb1b2f2bedcc79b7b3f177c2d98db6ca9534354689908b935820c3267c1e
+AUX mkinitcpio-encrypt-install.patch 617 RMD160 761f914c35f48720a45e4c98b8fb98173c3addd5 SHA1 9f5b0e17b75f5de232d0e20df7d46d4030a4fd18 SHA256 909e829140fc044fe7293469f6fd425cdeb9e49e25db5b9ff490646000434fec
 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 mkinitcpio-lvm2-install.patch 720 RMD160 0cc135b1e12c55eeaa1594487c1849420f653f0a SHA1 e8557c2ca80e91af4a1e6655f07c2be2c1999cc4 SHA256 42941abba20bc695a340d03dfc84f5ccc11339394e6b559bf9f62637a09c67a4
+AUX mkinitcpio-mdadm_udev-install.patch 281 RMD160 c01139da4b6afa504fbd0681cbe3389354113c5d SHA1 b6554ce0cdcdbbc61d07468ee6f23c6cbfb1e360 SHA256 e74e164a987469c230d224ed3c8d24e075675b94932a5cbfb0b34d58968f7733
+AUX mkinitcpio-pcmcia-install.patch 494 RMD160 6c1e761d67925a6ea325f1a16388eb44c1814c0d SHA1 4c872fe8d80701d5e4c159980f67ff62f1dceadb SHA256 18ee023e17ff5c6a6b0d10f475fff75d00e6b609897babbe670b086507191927
+AUX mkinitcpio-udev-install.patch 654 RMD160 3cba0d4ce3b2be3a3d017648ba1f1fbe6434a499 SHA1 c38aaede7421f069116b81af7d12df06f4e8d31d SHA256 fee84482479748230df80db5aba9cc0804d2477dea448318a940ab005a53f9f7
 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 4027 RMD160 df43c3356ba604d475e1ed76912e5d768636030f SHA1 f55994b8d1d1aabadcc27651c5ab5af829d64d0b SHA256 a317ac7022511bff1dd5dad97b6d4debdc483be3f8e46551b6dd25e64aee6c87
-MISC ChangeLog 963 RMD160 4415a37eeee6656f5a9062c10f579687f3bbb797 SHA1 550f8332ba2ea0cdd5d7e636c13cc96120286ec5 SHA256 d00ae4196ccc73f8e3b11913047fd0b741005c57fa6aed4ba48f4d6158e6442e
+DIST mkinitcpio-modules-0_p20120704.tar.bz2 4815 RMD160 8c0cf233c526982d4e25c2b2a64c4ab4b1f25344 SHA1 67dee8387d22dc3ceb24f09a1e9c4d6a5dc2af64 SHA256 3cf6c59de41c8c6ad2d8579c67c0c39c8364549083e8967b37f6003382e463f9
+EBUILD mkinitcpio-0.9.2-r1.ebuild 3201 RMD160 8c2d2f4c7d0874999cdd2e0bad034942ec2002f3 SHA1 d256269e822d3f84c44b08f87d2059000e983c90 SHA256 cf85235304f8b330e09e23c8538abe10b91a50615e9482961cddf208b7c799e8
+MISC ChangeLog 1417 RMD160 db87515db32db8135d40512d19854d129c1a457f SHA1 38762d893d1b63d1c6c2f4b51485090f82080934 SHA256 7c778f0f756b7f317d29c38d971cfa1163eaa2ec15be7673100779d760191e08
 MISC metadata.xml 496 RMD160 22dc5ebc9c869c84e548a19b0df25e47481d0395 SHA1 241e798c58fb98a20f8c5dbf9096b1fd7781a47f SHA256 a941b5b2f32172eb8b595f13017813f5438386e3dc156d7af2bfec17fbed0ca6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/xmtAACgkQknrdDGLu8JANhQD/X1TqpTVYFK9LOeWafDhhVWJq
-TqOX9MUsK46u3vvS/GsA/jStMroVojfSK4VhPudBuVZWlUzs1RiwaLikRGdVbwBw
-=OvLg
+iF4EAREIAAYFAk/0hu8ACgkQknrdDGLu8JCpPgEAiawfa6A6a3vTEKzNVgOjAcxS
+m9upm6N0XXkrMWau4bwA/jG9kkeKCOcbX35TZ4chVKmJ0odj2RdQnKAc9k7m5BPe
+=WmZU
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch
index ca1e1f381932..54617a723ab1 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-dmraid-install.patch
@@ -1,5 +1,5 @@
---- dmraid-1.0.0.rc16.3-7/usr/lib/initcpio/install/dmraid
-+++ dmraid-1.0.0.rc16.3-7/usr/lib/initcpio/install/dmraid
+--- mkinitcpio-modules-0_p20120704/install/dmraid
++++ mkinitcpio-modules-0_p20120704/install/dmraid
 @@ -6,9 +6,9 @@
  
      add_binary 'dmraid'
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch
index c22afc25b0d8..b7a9a8072eb6 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-encrypt-install.patch
@@ -1,5 +1,5 @@
---- cryptsetup-1.4.3-1/usr/lib/initcpio/install/encrypt
-+++ cryptsetup-1.4.3-1/usr/lib/initcpio/install/encrypt
+--- mkinitcpio-modules-0_p20120704/install/encrypt
++++ mkinitcpio-modules-0_p20120704/install/encrypt
 @@ -14,9 +14,9 @@
  
      add_binary "cryptsetup"
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch
index 098701fa7b53..8c0aeedaa0c7 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-lvm2-install.patch
@@ -1,5 +1,5 @@
---- lvm2-2.02.96-2/usr/lib/initcpio/install/lvm2
-+++ lvm2-2.02.96-2/usr/lib/initcpio/install/lvm2
+--- mkinitcpio-modules-0_p20120704/install/lvm2
++++ mkinitcpio-modules-0_p20120704/install/lvm2
 @@ -8,10 +8,10 @@
  
      add_binary "/sbin/lvm"
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch
index f1dba7450b18..838b13e60208 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-mdadm_udev-install.patch
@@ -1,5 +1,5 @@
---- mdadm-3.2.5-2/usr/lib/initcpio/install/mdadm_udev
-+++ mdadm-3.2.5-2/usr/lib/initcpio/install/mdadm_udev
+--- mkinitcpio-modules-0_p20120704/install/mdadm_udev
++++ mkinitcpio-modules-0_p20120704/install/mdadm_udev
 @@ -10,7 +10,7 @@
      fi
  
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch
index 11c0880fd2d8..b539cd07f904 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-pcmcia-install.patch
@@ -1,5 +1,5 @@
---- pcmciautils-018-4/usr/lib/initcpio/install/pcmcia
-+++ pcmciautils-018-4/usr/lib/initcpio/install/pcmcia
+--- mkinitcpio-modules-0_p20120704/install/pcmcia
++++ mkinitcpio-modules-0_p20120704/install/pcmcia
 @@ -6,9 +6,9 @@
  
      [[ $MODULES ]] && MODULES+=" sd_mod?"
diff --git a/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch b/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch
index 1263e78e77e5..6730adf3a09e 100644
--- a/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch
+++ b/sys-kernel/mkinitcpio/files/mkinitcpio-udev-install.patch
@@ -1,5 +1,5 @@
---- systemd-tools-185/usr/lib/initcpio/install/udev
-+++ systemd-tools-185/usr/lib/initcpio/install/udev
+--- mkinitcpio-modules-0_p20120704/install/udev
++++ mkinitcpio-modules-0_p20120704/install/udev
 @@ -4,14 +4,14 @@
      local rules tool
  
diff --git a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
index 5a6acac1adaa..24b777286b3a 100644
--- a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild
+++ b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
@@ -1,27 +1,21 @@
 # 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.2 2012/07/02 12:58:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.1 2012/07/04 18:09:08 xmw Exp $
+
+EAPI=4
 
-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"
+MY_MODULES_VER="0_p20120704"
 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 )"
+	http://xmw.de/mirror/mkinitcpio-modules/mkinitcpio-modules-${MY_MODULES_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cryptsetup device-mapper dmraid mdadm pcmcia plymouth udev"
+IUSE="cryptsetup device-mapper dmraid mdadm pcmcia udev"
 
 DEPEND="sys-apps/sed"
 RDEPEND="app-arch/cpio
@@ -40,8 +34,7 @@ RDEPEND="app-arch/cpio
 	cryptsetup? ( sys-fs/cryptsetup[static] )
 	mdadm? ( sys-fs/mdadm[static] )
 	dmraid? ( sys-fs/dmraid[static] )
-	pcmcia? ( sys-apps/pcmciautils[static] )
-	plymouth? ( sys-boot/plymouth )"
+	pcmcia? ( sys-apps/pcmciautils[static] )"
 
 pkg_setup() {
 	if kernel_is -lt 2 6 32 ; then
@@ -62,51 +55,48 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-consolefont-install.patch
 	epatch "${FILESDIR}"/${PN}-keymap-install.patch
 	cd "${WORKDIR}"
-	use udev && epatch "${FILESDIR}"/${PN}-udev-install.patch
-	use device-mapper && epatch "${FILESDIR}"/${PN}-lvm2-install.patch
-	use mdadm epatch "${FILESDIR}"/${PN}-mdadm_udev-install.patch
-	use dmraid && epatch "${FILESDIR}"/${PN}-dmraid-install.patch
-	use pcmcia && epatch "${FILESDIR}"/${PN}-pcmcia-install.patch
-	use cryptsetup && epatch "${FILESDIR}"/${PN}-encrypt-install.patch
+	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
+	cd "${WORKDIR}/${PN}-modules-${MY_MODULES_VER}"
+
+	insinto /usr/lib/initcpio/hooks
+	use udev && doins hooks/udev
+	use device-mapper && doins hooks/lvm2
 	if use mdadm ; then
-		doins mdadm
+		doins hooks/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
+	use dmraid && doins hooks/dmraid
+	use cryptsetup && doins hooks/encrypt
 
-	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
+	use udev && doins install/udev
+	use device-mapper && doins install/lvm2
+	use mdadm && doins install/{mdadm{,_udev}}
+	use dmraid && doins install/dmraid
+	use cryptsetup && doins install/encrypt
+	use pcmcia && doins install/pcmcia
 
 	if use device-mapper; then
 		if use udev; then
 			insinto /usr/lib/initcpio/udev/
-			doins "${WORKDIR}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+			doins udev/11-dm-initramfs.rules
 		fi
 	fi
 
 	dodir /etc/mkinitcpio.d
-	newins "${FILESDIR}"/gentoo.preset ${KV}.preset
-	sed -e "s/KV/${KV}/g" \
+	sed -e "s/KV/${KV_FULL}/g" \
 		"${FILESDIR}"/gentoo.preset \
-		> "${D}"/etc/mkinitcpio.d/${KV}.preset || die
+		> "${D}"/etc/mkinitcpio.d/${KV_FULL}.preset || die
 
 	insinto /usr/lib/modprobe.d
 	doins "${FILESDIR}/usb-load-ehci-first.conf"