diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-04-24 08:36:45 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-04-24 08:36:45 +0000 |
| commit | 94c0aeff33b93d0a52289d52d9d89f23eb619e22 (patch) | |
| tree | 76f20602aa2ec64ee1565aa810caa8d9afab6093 /sys-apps | |
| parent | arm/hppa/ia64 stable (diff) | |
| download | historical-94c0aeff33b93d0a52289d52d9d89f23eb619e22.tar.gz historical-94c0aeff33b93d0a52289d52d9d89f23eb619e22.tar.bz2 historical-94c0aeff33b93d0a52289d52d9d89f23eb619e22.zip | |
emerge --info fix
Package-Manager: portage-1.524.2.59-cvs
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 11 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.51.20-r3 (renamed from sys-apps/portage/files/digest-portage-2.0.51.20-r2) | 0 | ||||
| -rw-r--r-- | sys-apps/portage/files/emerge-fixes.patch | 28 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.51.20-r3.ebuild (renamed from sys-apps/portage/portage-2.0.51.20-r2.ebuild) | 3 |
4 files changed, 36 insertions, 6 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 79b00c2badd5..0a730bfde68d 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -6,7 +6,7 @@ MD5 c697b628359c7055961817876804f0a6 metadata.xml 221 MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133 MD5 f9fd4371c2fb44b47a0a5d3cfd4f118c portage-2.0.51.18.ebuild 13211 MD5 985b398e1a2d623efa13c1c1fbe18119 portage-2.0.51.19.ebuild 13211 -MD5 75fcb7498b80d0bb7aaf61f188814245 portage-2.0.51.20-r2.ebuild 6215 +MD5 30ce572e961a37be72e78cae35f2bb50 portage-2.0.51.20-r3.ebuild 6271 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71 MD5 4458663c2aa36fb828981a89ffcaac97 files/digest-portage-2.0.51.18 70 @@ -15,11 +15,12 @@ MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163 MD5 ddcd57a496ee08ec51f06b031d54601e files/portage-fixes.patch 582 MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244 MD5 502ca546fcf8ca5141435a9edee6a57f files/repoman-fixes.patch 417 -MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r2 70 +MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r3 70 +MD5 77b9bad3d53c36ce5ef3ecdf16554d5a files/emerge-fixes.patch 685 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCanRMxvWNPsk/ZP4RAlt2AJ4jc65IhPGELyejaJfW3FHmZc61jQCgvptB -52aNg9eftEuU4CHpcPYv9Rg= -=Iadm +iD8DBQFCa1qyxvWNPsk/ZP4RAnR4AJwKBLdvJ2ONl3Tdosz4WZ1hzH6JDgCfUo0Z +zPM31cB58P5pyQzRcJZF+kw= +=Itfc -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.0.51.20-r2 b/sys-apps/portage/files/digest-portage-2.0.51.20-r3 index 50f1663b40b0..50f1663b40b0 100644 --- a/sys-apps/portage/files/digest-portage-2.0.51.20-r2 +++ b/sys-apps/portage/files/digest-portage-2.0.51.20-r3 diff --git a/sys-apps/portage/files/emerge-fixes.patch b/sys-apps/portage/files/emerge-fixes.patch new file mode 100644 index 000000000000..a275192bcdad --- /dev/null +++ b/sys-apps/portage/files/emerge-fixes.patch @@ -0,0 +1,28 @@ +--- bin/emerge 17 Apr 2005 09:01:55 -0000 1.345.2.24 ++++ bin/emerge 24 Apr 2005 08:20:57 -0000 +@@ -119,10 +119,24 @@ + def sorted_versions(verlist): + ret = [] + for ver in verlist: ++ verparts = ver.split("-") ++ if len(verparts) == 2: ++ verrev = int(verparts[1][1:]) ++ else: ++ verrev = 0 + x = 0 + while x < len(ret): +- if portage.vercmp(ret[x], ver) >= 0: ++ retparts = ret[x].split("-") ++ verdiff = portage.vercmp(retparts[0], verparts[0]) ++ if verdiff > 0: + break ++ elif verdiff == 0: ++ if len(retparts) == 2: ++ retrev = int(retparts[1][1:]) ++ else: ++ retrev = 0 ++ if retrev >= verrev: ++ break + x += 1 + ret.insert(x, ver) + return ret diff --git a/sys-apps/portage/portage-2.0.51.20-r2.ebuild b/sys-apps/portage/portage-2.0.51.20-r3.ebuild index ccb4c5eee2eb..f8f9c2ddf2d5 100644 --- a/sys-apps/portage/portage-2.0.51.20-r2.ebuild +++ b/sys-apps/portage/portage-2.0.51.20-r3.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.51.20-r2.ebuild,v 1.3 2005/04/23 16:13:45 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r3.ebuild,v 1.1 2005/04/24 08:36:45 jstubbs Exp $ inherit toolchain-funcs @@ -32,6 +32,7 @@ python_has_lchown() { src_unpack() { unpack ${A} + patch -d ${S} -p0 -g0 < ${FILESDIR}/emerge-fixes.patch patch -d ${S} -p0 -g0 < ${FILESDIR}/portage-fixes.patch patch -d ${S} -p0 -g0 < ${FILESDIR}/dispatch-conf-fixes.patch patch -d ${S} -p0 -g0 < ${FILESDIR}/repoman-fixes.patch |