From 477cce0045c589495da9492ae920022470070af5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 15 Mar 2006 02:03:14 +0000 Subject: [PATCH] 2.1_pre6-r3 revbump for small bug fixes Package-Manager: portage-2.1_pre6-r3 --- sys-apps/portage/ChangeLog | 9 +- sys-apps/portage/Manifest | 30 ++++--- ...892_bug_126111_global_updates_stdout.patch | 83 +++++++++++++++++++ ...00_r2890_bug_126120_applied_useflags.patch | 39 +++++++++ ...2.1_pre6-r2 => digest-portage-2.1_pre6-r3} | 0 ...6-r2.ebuild => portage-2.1_pre6-r3.ebuild} | 13 +-- 6 files changed, 156 insertions(+), 18 deletions(-) create mode 100644 sys-apps/portage/files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch create mode 100644 sys-apps/portage/files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch rename sys-apps/portage/files/{digest-portage-2.1_pre6-r2 => digest-portage-2.1_pre6-r3} (100%) rename sys-apps/portage/{portage-2.1_pre6-r2.ebuild => portage-2.1_pre6-r3.ebuild} (92%) diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 6c49ff64569a..fabe81beab8b 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.91 2006/03/13 02:56:33 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.92 2006/03/15 02:03:13 zmedico Exp $ + +*portage-2.1_pre6-r3 (14 Mar 2006) + + 14 Mar 2006; Zac Medico +portage-2.1_pre6-r3.ebuild, + +files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch, + +files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch: + Revision bump for small bug fixes, including bugs #125942 and #126111. *portage-2.1_pre6-r2 (12 Mar 2006) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index aab2aa351182..8b72e49bfc3c 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 bf374c11bfe1121c9df4e8478b6ccec5 ChangeLog 8229 -RMD160 7818a3076c1f042f798d16d93684f18c81402cdb ChangeLog 8229 -SHA256 2db654acf295d1cf887cf91c969eb3b38a2344d3d516d6a9e338d094bbeea3c1 ChangeLog 8229 +MD5 6efb579760e99b4b7532f60792cbd1ec ChangeLog 8548 +RMD160 a5e8ed5c289467bd2ce805fdabe0aedbb1ae8d73 ChangeLog 8548 +SHA256 fe8219a4c40a52a2f54f4be67555c451b6e50704a6ae98ae6cd524284109e715 ChangeLog 8548 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34 @@ -61,6 +61,12 @@ SHA256 2c306ad9a725d174e94d392b6945b54acb2159c69e9de0e495e5419f37fca0ed files/2. MD5 f45766b0fb33d8818c2890038adddb89 files/2.1_pre6/1080_r2865_bug_125942_postinst_env.patch 1512 RMD160 fc5309ba1c444c3b4034c793fe68c3dbcfad94a0 files/2.1_pre6/1080_r2865_bug_125942_postinst_env.patch 1512 SHA256 51c08a8ae14dd3809253c11249725f970af72620f58f5eb235605108a255be5f files/2.1_pre6/1080_r2865_bug_125942_postinst_env.patch 1512 +MD5 d1ace07ef8f3378e039223aaa1e600ed files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch 3299 +RMD160 c2cd85bb848bc9a31ce4e62b120757350fb21738 files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch 3299 +SHA256 707612e10075b47f55c027f8bbbe279e50d729fce3ae16f5f7312b445e176322 files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch 3299 +MD5 8f20f3a31262d7b9031712dfe27957ef files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch 1176 +RMD160 325b1d62e4be030e33a9a709ed0431053b6ca930 files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch 1176 +SHA256 717d931f7ac75476dfa802681e7dc934d8d47207b72abc298dd5a6486674679c files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch 1176 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137 @@ -79,9 +85,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r4 253 RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r4 253 SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r4 253 -MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r2 253 -RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r2 253 -SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r2 253 +MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r3 253 +RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r3 253 +SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r3 253 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115 @@ -103,13 +109,13 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage- MD5 f1758097241d74ff2fbfecea1e831732 portage-2.1_pre5-r4.ebuild 5072 RMD160 381f37b7fc7c2fd218fff4375f9f7672e4c69d10 portage-2.1_pre5-r4.ebuild 5072 SHA256 f21564ed3d7f7ac1822464e8bc21d1f69cefe418582fba1ba6f146841899e99c portage-2.1_pre5-r4.ebuild 5072 -MD5 38d6ce4b0fef393e8e1faf24d6b82810 portage-2.1_pre6-r2.ebuild 5353 -RMD160 3d927a78bdc006a8296f91621eb95284a7fdd695 portage-2.1_pre6-r2.ebuild 5353 -SHA256 2d9173f640240f8958c535dfdd336e918d41a9bb5b3cd2585b79c045fe82c973 portage-2.1_pre6-r2.ebuild 5353 +MD5 c4dd2a511da12cd26a0a89c09f17c667 portage-2.1_pre6-r3.ebuild 5497 +RMD160 dfe45741d14b725f3cfc06c62e87caecf1d75bbf portage-2.1_pre6-r3.ebuild 5497 +SHA256 845a5c3b34c4ee78b022ed57c04b9a599ade70de9ede35dfd9122cc9ad856395 portage-2.1_pre6-r3.ebuild 5497 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEFjgz2+ySkm8kpY0RAscoAJ9XXUSo2DzACT5Qfpeq9ZeeqdpXFQCgt5ea -rHYNJHQSrW4+gmik6FBQdoI= -=3RmC +iD8DBQFEF3Xu/ejvha5XGaMRAt9BAKDBRZxgukytqq9u7CHC/V4vP5uFnwCeNkUx +XTl5hXNeSmqckRgHEc0UnKw= +=K6RI -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch b/sys-apps/portage/files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch new file mode 100644 index 000000000000..bc1d2f12efee --- /dev/null +++ b/sys-apps/portage/files/2.1_pre6/1090_r2892_bug_126111_global_updates_stdout.patch @@ -0,0 +1,83 @@ +=== modified file 'pym/portage.py' +--- pym/portage.py ++++ pym/portage.py +@@ -4326,7 +4326,7 @@ + origpath=self.root+VDB_PATH+"/"+mycpv + if not os.path.exists(origpath): + continue +- writemsg("@") ++ writemsg_stdout("@") + if not os.path.exists(self.root+VDB_PATH+"/"+mynewcat): + #create the directory + os.makedirs(self.root+VDB_PATH+"/"+mynewcat) +@@ -4385,7 +4385,7 @@ + if (slot[0]!=origslot): + continue + +- writemsg("s") ++ writemsg_stdout("s") + write_atomic(os.path.join(origpath, "SLOT"), newslot+"\n") + + def cp_list(self,mycp,use_cache=1): +@@ -5285,8 +5285,7 @@ + continue + + #print ">>> Updating data in:",mycpv +- sys.stdout.write("%") +- sys.stdout.flush() ++ writemsg_stdout("%") + + mytbz2 = xpak.tbz2(tbz2path) + mydata = mytbz2.get_data() +@@ -5336,8 +5335,7 @@ + if (slot[0]!=origslot): + continue + +- sys.stdout.write("S") +- sys.stdout.flush() ++ writemsg_stdout("S") + mydata["SLOT"] = newslot+"\n" + mytbz2.recompose_mem(xpak.xpak_mem(mydata)) + return 1 +@@ -5354,7 +5352,7 @@ + writemsg("!!! Cannot update readonly binary: "+mycpv+"\n") + continue + #print ">>> Updating binary data:",mycpv +- writemsg("*") ++ writemsg_stdout("*") + mytbz2 = xpak.tbz2(tbz2path) + mydata = mytbz2.get_data() + updated_items = update_dbentries(update_iter, mydata) +@@ -6892,13 +6890,13 @@ + myupd = [] + timestamps = {} + for mykey, mystat, mycontent in update_data: +- writemsg("\n\n") +- writemsg(green("Performing Global Updates: ")+bold(mykey)+"\n") +- writemsg("(Could take a couple of minutes if you have a lot of binary packages.)\n") +- writemsg(" "+bold(".")+"='update pass' "+bold("*")+"='binary update' "+bold("@")+"='/var/db move'\n"+" "+bold("s")+"='/var/db SLOT move' "+bold("S")+"='binary SLOT move' "+bold("p")+"='update /etc/portage/package.*'\n") ++ writemsg_stdout("\n\n") ++ writemsg_stdout(green("Performing Global Updates: ")+bold(mykey)+"\n") ++ writemsg_stdout("(Could take a couple of minutes if you have a lot of binary packages.)\n") ++ writemsg_stdout(" "+bold(".")+"='update pass' "+bold("*")+"='binary update' "+bold("@")+"='/var/db move'\n"+" "+bold("s")+"='/var/db SLOT move' "+bold("S")+"='binary SLOT move' "+bold("p")+"='update /etc/portage/package.*'\n") + valid_updates, errors = parse_updates(mycontent) + myupd.extend(valid_updates) +- print len(valid_updates) * "." ++ writemsg_stdout(len(valid_updates) * "." + "\n") + if len(errors) == 0: + # Update our internal mtime since we + # processed all of our directives. +@@ -6945,9 +6943,9 @@ + do_vartree(settings) + if do_upgrade_packagesmessage and \ + listdir(os.path.join(settings["PKGDIR"], "All"), EmptyOnError=1): +- writemsg(" ** Skipping packages. Run 'fixpackages' or set it in FEATURES to fix the") +- writemsg("\n tbz2's in the packages directory. "+bold("Note: This can take a very long time.")) +- writemsg("\n") ++ writemsg_stdout(" ** Skipping packages. Run 'fixpackages' or set it in FEATURES to fix the") ++ writemsg_stdout("\n tbz2's in the packages directory. "+bold("Note: This can take a very long time.")) ++ writemsg_stdout("\n") + + if (secpass==2) and (not os.environ.has_key("SANDBOX_ACTIVE")): + if settings["PORTAGE_CALLER"] in ["emerge","fixpackages"]: + diff --git a/sys-apps/portage/files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch b/sys-apps/portage/files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch new file mode 100644 index 000000000000..85c1be56dae2 --- /dev/null +++ b/sys-apps/portage/files/2.1_pre6/1100_r2890_bug_126120_applied_useflags.patch @@ -0,0 +1,39 @@ +=== modified file 'bin/emerge' +--- bin/emerge ++++ bin/emerge +@@ -400,9 +400,6 @@ + portage.settings.lock() + + if ("--resume" in myopts): +- if "--verbose" in myopts: +- print "* --verbose is currently broken with --resume. Disabling..." +- myopts.remove("--verbose") + if "--tree" in myopts: + print "* --tree is currently broken with --resume. Disabling..." + myopts.remove("--tree") +@@ -1519,6 +1516,15 @@ + # in size display (verbose mode) + myfetchlist=[] + for x in mylist: ++ pkg_type = x[0] ++ pkg_key = x[2] ++ if pkg_key not in self.applied_useflags: ++ if "binary" == pkg_type: ++ self.applied_useflags[pkg_key] = portage.db["/"]["bintree"].dbapi.aux_get(pkg_key, ["USE"])[0].split() ++ elif "ebuild" == pkg_type: ++ self.pkgsettings.setcpv(pkg_key) ++ self.applied_useflags[pkg_key] = self.pkgsettings["USE"].split() ++ + fetch=" " + + if x[0]=="blocks": +@@ -3156,7 +3162,7 @@ + portage.commit_mtimedb() + myresumeopts=portage.mtimedb["resume"]["myopts"][:] + +- for opt in ("--skipfirst", "--ask", "--verbose", "--tree"): ++ for opt in ("--skipfirst", "--ask", "--tree"): + while opt in myresumeopts: + myresumeopts.remove(opt) + + diff --git a/sys-apps/portage/files/digest-portage-2.1_pre6-r2 b/sys-apps/portage/files/digest-portage-2.1_pre6-r3 similarity index 100% rename from sys-apps/portage/files/digest-portage-2.1_pre6-r2 rename to sys-apps/portage/files/digest-portage-2.1_pre6-r3 diff --git a/sys-apps/portage/portage-2.1_pre6-r2.ebuild b/sys-apps/portage/portage-2.1_pre6-r3.ebuild similarity index 92% rename from sys-apps/portage/portage-2.1_pre6-r2.ebuild rename to sys-apps/portage/portage-2.1_pre6-r3.ebuild index e4e0fc53beb2..39cfe71ee9ce 100644 --- a/sys-apps/portage/portage-2.1_pre6-r2.ebuild +++ b/sys-apps/portage/portage-2.1_pre6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r2.ebuild,v 1.1 2006/03/13 02:56:33 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r3.ebuild,v 1.1 2006/03/15 02:03:14 zmedico Exp $ inherit toolchain-funcs @@ -39,7 +39,9 @@ src_unpack() { 1050_r2862_ebuild_unmerge.patch 1060_r2863_bug_125919_find_compat.patch 1070_r2864_bug_125993_mergelist_keyerror.patch - 1080_r2865_bug_125942_postinst_env.patch" + 1080_r2865_bug_125942_postinst_env.patch + 1090_r2892_bug_126111_global_updates_stdout.patch + 1100_r2890_bug_126120_applied_useflags.patch" for patch_name in ${my_patches}; do einfo "Applying ${patch_name} ..." patch -p0 --no-backup-if-mismatch < "${FILESDIR}"/${PV}/${patch_name} >/dev/null || die "Failed to apply patch" @@ -159,9 +161,10 @@ pkg_postinst() { ewarn "If you are using any cache modules (such as the CDB cache" ewarn "module) portage will not work until they have been disabled." echo - einfo "The default cache format has changed beginning with this" - einfo "version. Before using emerge, run \`emerge --metadata\` to" - einfo "restore portage's local cache." + einfo "The default cache format has changed between 2.0.x and 2.1" + einfo "versions. If you have upgraded from 2.0.x, before using" + einfo "emerge, run \`emerge --metadata\` to restore portage's local" + einfo "cache." echo einfo "Flag ordering has changed for \`emerge --pretend --verbose\`." einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf" -- 2.26.2