diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-06-04 23:04:14 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-06-04 23:04:14 +0000 |
commit | 4273e6426f467c9dedca7de24e5391aad1175239 (patch) | |
tree | 8970cc9ed85c5c0b02ed82b1c28f9bed9c1a248d /sys-apps | |
parent | 2.1.10.65 version bump. This fixes an AttributeError exception triggered by (diff) | |
download | gentoo-2-4273e6426f467c9dedca7de24e5391aad1175239.tar.gz gentoo-2-4273e6426f467c9dedca7de24e5391aad1175239.tar.bz2 gentoo-2-4273e6426f467c9dedca7de24e5391aad1175239.zip |
Support bash <4.1 again.
(Portage version: 2.2.0_alpha110/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index e46812ea2a70..5103e844ec75 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1029 2012/06/04 23:02:34 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1030 2012/06/04 23:04:14 zmedico Exp $ + + 04 Jun 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild: + Support bash <4.1 again. *portage-2.1.10.65 (04 Jun 2012) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 4692845f0534..ea6006032042 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.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-apps/portage/portage-9999.ebuild,v 1.47 2012/06/02 19:32:06 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.48 2012/06/04 23:04:14 zmedico Exp $ EAPI=3 inherit git-2 eutils multilib python @@ -33,7 +33,7 @@ DEPEND="${python_dep} # for now, don't pull in xattr deps for other kernels. RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-4.1 + >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) @@ -41,7 +41,7 @@ RDEPEND="${python_dep} >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) - !<app-shells/bash-4.1 + !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0" PDEPEND=" !build? ( |