[gentoo-commits] gentoo-x86 commit in app-shells/bash: ChangeLog bash-3.2_p39.ebuild

["Zac Medico (zmedico)" <zmedico@gentoo.org>]

zmedico     08/06/13 04:29:23

  Modified:             ChangeLog bash-3.2_p39.ebuild
  Log:
  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)

Revision  Changes    Path
1.180                app-shells/bash/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.180&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.180&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?r1=1.179&r2=1.180

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- ChangeLog	12 Jun 2008 17:38:35 -0000	1.179
+++ ChangeLog	13 Jun 2008 04:29:22 -0000	1.180
@@ -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.



1.6                  app-shells/bash/bash-3.2_p39.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?r1=1.5&r2=1.6

Index: bash-3.2_p39.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bash-3.2_p39.ebuild	12 Jun 2008 17:38:35 -0000	1.5
+++ bash-3.2_p39.ebuild	13 Jun 2008 04:29:22 -0000	1.6
@@ -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 @@
 
 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 @@
 		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() {



-- 
gentoo-commits@lists.gentoo.org mailing list