diff options
author | Jeremy Olexa <darkside@gentoo.org> | 2011-01-05 15:55:13 +0000 |
---|---|---|
committer | Jeremy Olexa <darkside@gentoo.org> | 2011-01-05 15:55:13 +0000 |
commit | c388b01ca58e9bded6ad4d46abf0dda16d4e6770 (patch) | |
tree | d0009623c9686e27e868a6ce7d0e98d46a341b1c /app-portage | |
parent | Some Clean up (diff) | |
download | gentoo-2-c388b01ca58e9bded6ad4d46abf0dda16d4e6770.tar.gz gentoo-2-c388b01ca58e9bded6ad4d46abf0dda16d4e6770.tar.bz2 gentoo-2-c388b01ca58e9bded6ad4d46abf0dda16d4e6770.zip |
try to fix zsh-completion deps again with a blocker this time, bug 350129
(Portage version: 2.1.9.27/cvs/Linux x86_64)
Diffstat (limited to 'app-portage')
-rw-r--r-- | app-portage/eix/ChangeLog | 5 | ||||
-rw-r--r-- | app-portage/eix/eix-0.22.6.ebuild | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog index 9d4157911ba7..a8ae24519690 100644 --- a/app-portage/eix/ChangeLog +++ b/app-portage/eix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-portage/eix # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.358 2011/01/05 03:06:22 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.359 2011/01/05 15:55:13 darkside Exp $ + + 05 Jan 2011; Jeremy Olexa <darkside@gentoo.org> eix-0.22.6.ebuild: + try to fix zsh-completion deps again with a blocker this time, bug 350129 05 Jan 2011; Jeremy Olexa <darkside@gentoo.org> eix-0.22.6.ebuild: specify zsh-completion version needed for upgrade path, bug 350129 diff --git a/app-portage/eix/eix-0.22.6.ebuild b/app-portage/eix/eix-0.22.6.ebuild index 7b900aa729a8..4526d835ccd6 100644 --- a/app-portage/eix/eix-0.22.6.ebuild +++ b/app-portage/eix/eix-0.22.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.22.6.ebuild,v 1.2 2011/01/05 03:06:22 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.22.6.ebuild,v 1.3 2011/01/05 15:55:13 darkside Exp $ EAPI=3 @@ -15,13 +15,11 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="bzip2 debug doc hardened nls optimization strong-optimization sqlite tools zsh-completion" -# Drop CDEPEND when appropriate zsh-completion is marked stable -CDEPEND="sqlite? ( >=dev-db/sqlite-3 ) +RDEPEND="sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) - bzip2? ( app-arch/bzip2 )" -RDEPEND="${CDEPEND} - zsh-completion? ( >=app-shells/zsh-completion-20091203-r1 )" -DEPEND="${CDEPEND} + bzip2? ( app-arch/bzip2 ) + zsh-completion? ( !<app-shells/zsh-completion-20091203-r1 )" +DEPEND="${RDEPEND} app-arch/xz-utils doc? ( dev-python/docutils ) nls? ( sys-devel/gettext )" |