[gentoo-commits] gentoo-x86 commit in sys-apps/portage: ChangeLog portage-2.2_rc16.ebuild

[gentoo-commits] gentoo-x86 commit in sys-apps/portage: ChangeLog portage-2.2_rc16.ebuild

[Zac Medico (zmedico)]

zmedico     08/11/24 20:47:40

  Modified:             ChangeLog portage-2.2_rc16.ebuild
  Log:
  24 Nov 2008; Zac Medico <zmedico@gentoo.org> portage-2.2_rc16.ebuild:
  If portage-2.1.6 is installed and the preserved_libs_registry exists,
  assume that the NEEDED.ELF.2 files have already been generated.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.27-1111-x86-64 i686)

Revision  Changes    Path
1.555                sys-apps/portage/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.555&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.555&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.554&r2=1.555

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- ChangeLog	24 Nov 2008 18:03:57 -0000	1.554
+++ ChangeLog	24 Nov 2008 20:47:40 -0000	1.555
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.554 2008/11/24 18:03:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.555 2008/11/24 20:47:40 zmedico Exp $
+
+  24 Nov 2008; Zac Medico <zmedico@gentoo.org> portage-2.2_rc16.ebuild:
+  If portage-2.1.6 is installed and the preserved_libs_registry exists,
+  assume that the NEEDED.ELF.2 files have already been generated.
 
   24 Nov 2008; Zac Medico <zmedico@gentoo.org> portage-2.1.6_rc1.ebuild:
   Add an ewarn message for people downgrading from portage-2.2, reminding



1.2                  sys-apps/portage/portage-2.2_rc16.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc16.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc16.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc16.ebuild?r1=1.1&r2=1.2

Index: portage-2.2_rc16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc16.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portage-2.2_rc16.ebuild	24 Nov 2008 05:56:35 -0000	1.1
+++ portage-2.2_rc16.ebuild	24 Nov 2008 20:47:40 -0000	1.2
@@ -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/sys-apps/portage/portage-2.2_rc16.ebuild,v 1.1 2008/11/24 05:56:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc16.ebuild,v 1.2 2008/11/24 20:47:40 zmedico Exp $
 
 inherit eutils multilib python
 
@@ -226,8 +226,11 @@
 	has_version "<=${CATEGORY}/${PN}-2.2_pre5"
 	WORLD_MIGRATION_UPGRADE=$?
 
+	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
+	# assume that the NEEDED.ELF.2 files have already been generated.
 	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! has_version ">=${CATEGORY}/${PN}-2.1.6_rc"
+		! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
 	NEEDED_REBUILD_UPGRADE=$?
 
 	has_version "<${CATEGORY}/${PN}-2.2_alpha"