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

(Portage version: 2.1.11.4/cvs/Linux x86_64)

8 files changed, 53 insertions, 53 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/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"