diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2012-12-11 06:27:45 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2012-12-11 06:27:45 +0000 |
| commit | 1b6df5bbc7865757f7cb00f8b46ce77dae470bec (patch) | |
| tree | 2c814a3411bd4d9db90b7ce446a3e49fa6ac6487 /virtual | |
| parent | Bump (diff) | |
| download | gentoo-2-1b6df5bbc7865757f7cb00f8b46ce77dae470bec.tar.gz gentoo-2-1b6df5bbc7865757f7cb00f8b46ce77dae470bec.tar.bz2 gentoo-2-1b6df5bbc7865757f7cb00f8b46ce77dae470bec.zip | |
Fixing virtual to be a choice and not both at the same time
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | virtual/udev/udev-171.ebuild | 6 | ||||
| -rw-r--r-- | virtual/udev/udev-196.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/virtual/udev/ChangeLog b/virtual/udev/ChangeLog index 5abda21ed7ff..969ffe2dde39 100644 --- a/virtual/udev/ChangeLog +++ b/virtual/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for virtual/udev # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/udev/ChangeLog,v 1.9 2012/12/11 04:25:33 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/udev/ChangeLog,v 1.10 2012/12/11 06:27:45 patrick Exp $ + + 11 Dec 2012; Patrick Lauer <patrick@gentoo.org> udev-171.ebuild, + udev-196.ebuild: + Fixing virtual to be a choice and not both at the same time 11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> udev-171.ebuild, udev-196.ebuild: diff --git a/virtual/udev/udev-171.ebuild b/virtual/udev/udev-171.ebuild index c921bdfaeeee..1361e5f2d919 100644 --- a/virtual/udev/udev-171.ebuild +++ b/virtual/udev/udev-171.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/virtual/udev/udev-171.ebuild,v 1.3 2012/12/11 04:25:33 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-171.ebuild,v 1.4 2012/12/11 06:27:44 patrick Exp $ EAPI=2 @@ -14,5 +14,5 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="acl gudev hwdb introspection keymap selinux static-libs" DEPEND="" -RDEPEND="~sys-fs/udev-171[gudev?,hwdb?,introspection?,keymap?,selinux?] - ~sys-fs/eudev-0[gudev?,hwdb?,introspection?,keymap?,selinux?]" +RDEPEND="|| ( ~sys-fs/udev-171[gudev?,hwdb?,introspection?,keymap?,selinux?] + ~sys-fs/eudev-0[gudev?,hwdb?,introspection?,keymap?,selinux?] )" diff --git a/virtual/udev/udev-196.ebuild b/virtual/udev/udev-196.ebuild index fbd37cb089cd..ef31e5448858 100644 --- a/virtual/udev/udev-196.ebuild +++ b/virtual/udev/udev-196.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/virtual/udev/udev-196.ebuild,v 1.3 2012/12/11 04:25:32 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-196.ebuild,v 1.4 2012/12/11 06:27:44 patrick Exp $ EAPI=2 @@ -14,5 +14,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="acl gudev hwdb introspection keymap selinux static-libs" DEPEND="" -RDEPEND=">=sys-fs/udev-196-r1[acl?,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] - >=sys-fs/eudev-1_beta1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]" +RDEPEND="|| ( >=sys-fs/udev-196-r1[acl?,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] + >=sys-fs/eudev-1_beta1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )" |