diff options
author | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-05 19:13:26 +0000 |
---|---|---|
committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-05 19:13:26 +0000 |
commit | f604f58a84806274124058bde63b2738addb8d7f (patch) | |
tree | c600a1b48defa5cfea79468e39506e00b75ab40a /sys-apps | |
parent | version bump (diff) | |
download | gentoo-2-f604f58a84806274124058bde63b2738addb8d7f.tar.gz gentoo-2-f604f58a84806274124058bde63b2738addb8d7f.tar.bz2 gentoo-2-f604f58a84806274124058bde63b2738addb8d7f.zip |
2.0.53_rc4
(Portage version: 1.524.2.76-cvs)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/portage/Manifest | 15 | ||||
-rw-r--r-- | sys-apps/portage/files/2.0.53_rc4-extras.patch | 68 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.53_rc3 | 1 | ||||
-rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.53_rc4 | 1 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.0.53_rc4.ebuild (renamed from sys-apps/portage/portage-2.0.53_rc3.ebuild) | 6 |
5 files changed, 76 insertions, 15 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index d3a42fba7623..3980884350e2 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,21 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 bee328fe9e36c1f64e2052f82a84caa3 ChangeLog 1231 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579 +MD5 300a16d3815f2bc5de26e422b4743c20 files/2.0.53_rc4-extras.patch 1899 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70 -MD5 fad39ce2ce5c1c89e9f50e7a6e7df330 files/digest-portage-2.0.53_rc3 71 +MD5 e7dd6886b72835785333e5c081009a4a files/digest-portage-2.0.53_rc4 71 MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220 MD5 c292522590607e4bae9337f1097e194f portage-2.0.51.22-r3.ebuild 5708 -MD5 6f738527ea1824f525c161d27cb4028c portage-2.0.53_rc3.ebuild 3617 +MD5 b80d0af30d6026340abed9ad08c7e42d portage-2.0.53_rc4.ebuild 3689 MD5 c7250b47d02fe3891edabf2a687dc0ce portage-2.1.0_alpha20050718.ebuild 2573 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDQ/wrxvWNPsk/ZP4RAhxAAJ9PwOMW5Q395JtKL7tx4Sl1VGcRWACgkzP0 -47cWqTRi1rml9TPZk15g1QI= -=2P8/ ------END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/2.0.53_rc4-extras.patch b/sys-apps/portage/files/2.0.53_rc4-extras.patch new file mode 100644 index 000000000000..940899545089 --- /dev/null +++ b/sys-apps/portage/files/2.0.53_rc4-extras.patch @@ -0,0 +1,68 @@ +--- bin/emerge (revision 2106) ++++ bin/emerge (working copy) +@@ -1827,6 +1827,7 @@ + + self.pkgsettings["EMERGE_FROM"] = x[0][:] + self.pkgsettings.backup_changes("EMERGE_FROM") ++ self.pkgsettings.reset() + + #buildsyspkg: Check if we need to _force_ binary package creation + issyspkg = ("buildsyspkg" in myfeat) \ +--- bin/ebuild (revision 2107) ++++ bin/ebuild (working copy) +@@ -44,52 +44,15 @@ + reload(portage) + + +-if "noauto" in portage.features: +- +- arglist = [] +- cleanse = False +- for arg in pargs: +- if arg == "clean": +- cleanse = True +- else: +- arglist.append((arg, cleanse)) +- cleanse = False +- +-else: +- +- cleanse = ("clean" in pargs) +- while "clean" in pargs: +- pargs.remove("clean") +- +- actionmap_targets = filter(lambda x: x in portage.actionmap_deps, pargs) +- others = filter(lambda x: x not in portage.actionmap_deps, pargs) +- +- def recurse_it(target): +- l = portage.actionmap_deps[target][:] +- if l: +- l.extend(map(recurse_it, l)) +- return l +- +- kills = portage.unique_array(portage.flatten(map(recurse_it, actionmap_targets))) +- actionmap_targets = filter(lambda x: x not in kills, actionmap_targets) +- +- arglist = [] +- for arg in actionmap_targets + others: +- arglist.append((arg, cleanse)) +- cleanse = False +- +-if cleanse: +- arglist.append(("clean", True)) +- +-if len(arglist) > 1 and (("config", False) in arglist or ("config", True) in arglist): ++if len(pargs) > 1 and "config" in pargs: + print "config must be called on it's own, not combined with any other phase" + sys.exit(1) + + +-for arg in arglist: ++for arg in pargs: + try: + tmpsettings = portage.config(clone=portage.settings) +- a = portage.doebuild(ebuild, arg[0], root, tmpsettings, debug=debug, cleanup=arg[1]) ++ a = portage.doebuild(ebuild, arg, root, tmpsettings, debug=debug, cleanup=("noauto" not in portage.features)) + except KeyboardInterrupt: + print "Interrupted." + a = 1 diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc3 b/sys-apps/portage/files/digest-portage-2.0.53_rc3 deleted file mode 100644 index 5247dfab5ac7..000000000000 --- a/sys-apps/portage/files/digest-portage-2.0.53_rc3 +++ /dev/null @@ -1 +0,0 @@ -MD5 241ec6778976180bf406c451205ba4e1 portage-2.0.53_rc3.tar.bz2 235590 diff --git a/sys-apps/portage/files/digest-portage-2.0.53_rc4 b/sys-apps/portage/files/digest-portage-2.0.53_rc4 new file mode 100644 index 000000000000..bf69570128d0 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.0.53_rc4 @@ -0,0 +1 @@ +MD5 69d9cbb422a1c18327eb3294102b36cc portage-2.0.53_rc4.tar.bz2 226290 diff --git a/sys-apps/portage/portage-2.0.53_rc3.ebuild b/sys-apps/portage/portage-2.0.53_rc4.ebuild index b50b1b6eceb4..f5a62e714495 100644 --- a/sys-apps/portage/portage-2.0.53_rc3.ebuild +++ b/sys-apps/portage/portage-2.0.53_rc4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc3.ebuild,v 1.2 2005/10/05 16:13:48 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc4.ebuild,v 1.1 2005/10/05 19:13:26 jstubbs Exp $ inherit toolchain-funcs @@ -21,6 +21,8 @@ S=${WORKDIR}/${PN}-${PV} src_unpack() { unpack ${A} + cd ${S}/bin + patch -s -p1 < ${FILESDIR}/2.0.53_rc4-extras.patch } src_compile() { @@ -87,7 +89,7 @@ src_install() { done dodir /usr/sbin - for x in archive-conf dispatch-conf emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do + for x in archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do dosym ../lib/portage/bin/${x} /usr/sbin/${x} done |