diff options
| -rw-r--r-- | sys-apps/portage/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc16.ebuild | 7 |
3 files changed, 15 insertions, 8 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index db26cde678f1..a1a66c6d3eb5 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -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 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 296c0b5e4a7a..399535928a19 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -20,13 +20,13 @@ EBUILD portage-2.1.4.5.ebuild 8040 RMD160 844d2958f6544f7411f052c4102b4ce2e0acab EBUILD portage-2.1.6_rc1.ebuild 7412 RMD160 19980302914e09e7054f55aed7e978cd176aeb94 SHA1 30d5666e97537ddb70461179ed47dce06037364f SHA256 12e90b2730ed5b38c92447476623f22d15018fd7c833ddae3ec5ece45b4f6a1f EBUILD portage-2.2_rc14.ebuild 8934 RMD160 5fd1ad72d3d218b9677b6ab1d3cb828839a9f485 SHA1 140a3562412f0e64d01f21dd5cde39291ad9c74e SHA256 c32d14d91d570f15b9c8508c5648431911b187a2dfb394faa10e211b855164bf EBUILD portage-2.2_rc15.ebuild 8930 RMD160 681ed308d389205252847e3c99b3604b31b3ff56 SHA1 4cc94241fa6c7c09ebde86b83260e6576b66c5d1 SHA256 67cda8c17254a45dacffdc5984a1e687cbc66f00566d5228f78b1502659fd17d -EBUILD portage-2.2_rc16.ebuild 8985 RMD160 49c35601ddf26a5ff8202783a8ee3688d8af6f3e SHA1 3ec42f11c48ba8956f022bbe5ccc268314a05b11 SHA256 9a2851b4a1299acf642bbd56c73cb5b1c0de6c5aabf956dd28b28c98bf1dd096 -MISC ChangeLog 12278 RMD160 dbe51617643530a58b4373b170c88c2ad5063966 SHA1 b5b99103a34811e8771fbd1ec2a8e0d638f7e94f SHA256 9a9d70bc10faaecd7057c0ecdc9fc86befea55ebdc1a876047bf21953f447fa3 +EBUILD portage-2.2_rc16.ebuild 9190 RMD160 2d142d2f64e7cc6e891d83b8918408280f187a45 SHA1 26f92538096e8245cc9533fba2fd9ccf863ee13b SHA256 b17767378b4540fe199e6d6432a56946aba06b4f1d7783061a7e4475461c53d2 +MISC ChangeLog 12489 RMD160 a5027c658d24858cb1a7b4fd16ac6458118c32c8 SHA1 e2c80a8e3e63b3a5d31f4573bd2a88b2fe31a2d1 SHA256 c7fa5a69fddea9374f0bbb82b5e51e1ebeb9abce346436e9721aa79cb8282225 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkq7KIACgkQ/ejvha5XGaM/JwCgwnWqjFgLsPPwwT0Z0ioXByrj -C2wAnROY42Jd8buGmpvA+BLVkP6QpkA4 -=67kV +iEYEARECAAYFAkkrEwIACgkQ/ejvha5XGaPxQQCgnuaLqd819/fwyAzWj/ZOWgqP +SsYAn0zqXnPwY64hh7/hY7WX83kpiblY +=o8xw -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2_rc16.ebuild b/sys-apps/portage/portage-2.2_rc16.ebuild index bf984111fed0..04acbd3d75f1 100644 --- a/sys-apps/portage/portage-2.2_rc16.ebuild +++ b/sys-apps/portage/portage-2.2_rc16.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/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 @@ pkg_preinst() { 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" |