diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-07-02 12:58:33 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-07-02 12:58:33 +0000 |
| commit | 91ed47d65a84c77e08b203acf8e33ed769b46d14 (patch) | |
| tree | 6589f25c4b32cc56c64903bde0d6d44b27dcf2ef /sys-kernel | |
| parent | Remove old ones using dev-java/servletapi. #398689 (diff) | |
| download | gentoo-2-91ed47d65a84c77e08b203acf8e33ed769b46d14.tar.gz gentoo-2-91ed47d65a84c77e08b203acf8e33ed769b46d14.tar.bz2 gentoo-2-91ed47d65a84c77e08b203acf8e33ed769b46d14.zip | |
Fix conditional patching
(Portage version: 2.1.11.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/mkinitcpio/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys-kernel/mkinitcpio/ChangeLog b/sys-kernel/mkinitcpio/ChangeLog index 0fa95ee6b392..1de3e0e9690d 100644 --- a/sys-kernel/mkinitcpio/ChangeLog +++ b/sys-kernel/mkinitcpio/ChangeLog @@ -1,6 +1,9 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.2 2012/07/02 12:58:33 xmw Exp $ + + 02 Jul 2012; Michael Weber <xmw@gentoo.org> mkinitcpio-0.9.2.ebuild: + Fix conditional patching *mkinitcpio-0.9.2 (02 Jul 2012) @@ -15,4 +18,3 @@ +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/mkinitcpio-0.9.2.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild index dc5d15bb5b7f..5a6acac1adaa 100644 --- a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild +++ b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.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.ebuild,v 1.1 2012/07/02 10:43:03 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2.ebuild,v 1.2 2012/07/02 12:58:33 xmw Exp $ EAPI=3 inherit eutils linux-info @@ -35,7 +35,7 @@ RDEPEND="app-arch/cpio sys-apps/grep >=sys-apps/kmod-7 >=sys-apps/util-linux-2.21 - udev? ( sys-fs/udev ) + udev? ( >sys-fs/udev-171-r6 ) device-mapper? ( sys-fs/lvm2[static] ) cryptsetup? ( sys-fs/cryptsetup[static] ) mdadm? ( sys-fs/mdadm[static] ) @@ -62,12 +62,12 @@ src_prepare() { 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 + 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 } src_install() { |