summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-11-01 10:14:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-11-01 10:14:43 +0000
commit9ce5ac688192a386311c954a03a0062b6e8013b1 (patch)
tree589138ca546c532530cf67dbc03ef50dd7b76e03 /sys-kernel
parentSpecify LICENSE more precisely, MIT according to LICENSE.TXT in zipball. (diff)
downloadgentoo-2-9ce5ac688192a386311c954a03a0062b6e8013b1.tar.gz
gentoo-2-9ce5ac688192a386311c954a03a0062b6e8013b1.tar.bz2
gentoo-2-9ce5ac688192a386311c954a03a0062b6e8013b1.zip
Fix sys-apps/pcmciautils dependency because USE="static" was removed from >018 since the libsysfs dependency was removed and it only links to -lc now.
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/mkinitcpio/ChangeLog7
-rw-r--r--sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-kernel/mkinitcpio/ChangeLog b/sys-kernel/mkinitcpio/ChangeLog
index e7e6b665dc04..c597ed681299 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.6 2012/10/21 13:42:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/ChangeLog,v 1.7 2012/11/01 10:14:43 ssuominen Exp $
+
+ 01 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+ mkinitcpio-0.9.2-r1.ebuild:
+ Fix sys-apps/pcmciautils dependency because USE="static" was removed from
+ >018 since the libsysfs dependency was removed and it only links to -lc now.
21 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
Remove description of unused USE flag "plymouth"
diff --git a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
index e30301fea8e7..57bfee7b6ba6 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.3 2012/10/21 13:34:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.4 2012/11/01 10:14:43 ssuominen Exp $
EAPI=4
@@ -34,7 +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] )"
+ pcmcia? ( || ( >sys-apps/pcmciautils-018 <sys-apps/pcmciautils-018[static] ) )"
pkg_setup() {
if kernel_is -lt 2 6 32 ; then