diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-06-13 04:29:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-13 04:29:22 +0000 |
| commit | 5badfaad6948a0b8d9a13243738cbe5b408c8c75 (patch) | |
| tree | 84875d9a20c67a2e17dea7ca06181aaa9e02c591 /app-shells/bash | |
| parent | whitespace (diff) | |
| download | gentoo-2-5badfaad6948a0b8d9a13243738cbe5b408c8c75.tar.gz gentoo-2-5badfaad6948a0b8d9a13243738cbe5b408c8c75.tar.bz2 gentoo-2-5badfaad6948a0b8d9a13243738cbe5b408c8c75.zip | |
Bug #222721 - Replace the !<sys-apps/portage-2.1.4_rc1 blocker
(from bug #190128) with !<sys-apps/portage-2.1.5 to ensure that
phase execution order is such that the /bin/sh symlink will be
created in the postinst phase when necessary. This eliminates the
need for an associated die call in pkg_setup(). The blocker will
be solved automatically by emerge since it can adjust install order
such that the upgrade from portage-2.1.4.x to portage-2.1.5.x occurs
before the upgrade to bash-3.2_p39.
(Portage version: 2.1.5.5)
Diffstat (limited to 'app-shells/bash')
| -rw-r--r-- | app-shells/bash/ChangeLog | 12 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.2_p39.ebuild | 12 |
2 files changed, 13 insertions, 11 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index b23412db7004..a13409c1d9f5 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-shells/bash # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.179 2008/06/12 17:38:35 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.180 2008/06/13 04:29:22 zmedico Exp $ + + 13 Jun 2008; Zac Medico <zmedico@gentoo.org> bash-3.2_p39.ebuild: + Bug #222721 - Replace the !<sys-apps/portage-2.1.4_rc1 blocker + (from bug #190128) with !<sys-apps/portage-2.1.5 to ensure that + phase execution order is such that the /bin/sh symlink will be + created in the postinst phase when necessary. This eliminates the + need for an associated die call in pkg_setup(). The blocker will + be solved automatically by emerge since it can adjust install order + such that the upgrade from portage-2.1.4.x to portage-2.1.5.x occurs + before the upgrade to bash-3.2_p39. 12 Jun 2008; Bo Ørsted Andresen <zlin@gentoo.org> bash-3.2_p39.ebuild: Ensure that portage < 2.1.5 upgrade bash with FEATURES=-unmerge-orphans. diff --git a/app-shells/bash/bash-3.2_p39.ebuild b/app-shells/bash/bash-3.2_p39.ebuild index e85150035608..f64fbc97e3fe 100644 --- a/app-shells/bash/bash-3.2_p39.ebuild +++ b/app-shells/bash/bash-3.2_p39.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.5 2008/06/12 17:38:35 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.6 2008/06/13 04:29:22 zmedico Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -36,7 +36,7 @@ IUSE="afs bashlogger examples nls plugins vanilla" DEPEND=">=sys-libs/ncurses-5.2-r2" RDEPEND="${DEPEND} - !<sys-apps/portage-2.1.4_rc1 + !<sys-apps/portage-2.1.5 !<sys-apps/paludis-0.26.0_alpha5" S=${WORKDIR}/${MY_P} @@ -47,14 +47,6 @@ pkg_setup() { eerror "as it breaks LFS (struct stat64) on x86." die "remove -malign-double from your CFLAGS mr ricer" fi - - if hasq unmerge-orphans ${FEATURES} && \ - has_version "<sys-apps/portage-2.1.5" && \ - has_version "<app-shells/bash-3.2_p39"; then - eerror "Please upgrade bash with FEATURES=-unmerge-orphans to prevent /bin/sh" - eerror "from being removed. See bug #222721 for further details." - die "Upgrade bash with FEATURES=-unmerge-orphans" - fi } src_unpack() { |